Port department handhelds, emergency channel and encryption key resprites

Resources/Locale/en-US/_Funkystation/headset/headset-component.ftl

@@ -1,2 +1,3 @@
+chat-radio-emergency = Emergency
 chat-radio-logistics = Logistics
 chat-radio-ia = Internal Affairs

Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml

@@ -10,6 +10,8 @@
         children:
         - id: CrowbarRed
         - id: RadioHandheld
+        - id: RadioHandheldEmergency #funkystation
+          prob: 0.5
         - id: WelderMini
         - id: FireExtinguisherMini
         - id: SuitSealantCanister # Funky

Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

@@ -15,7 +15,7 @@
     - id: ClothingBeltUtilityFilled
     - id: SurvivalKnife
     - id: HandheldGPSBasic
-    - id: RadioHandheld
+    - id: RadioHandheldCargo #funkystation
     - id: AppraisalTool
     - id: FireExtinguisher
     - id: Flare

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -14,6 +14,8 @@
     - id: ClothingHandsKnuckleDustersQM
     - id: PlushieLizardJobQuartermaster
       prob: 0.02
+    - id: RadioHandheldCargo #funkystation
+    - id: RadioHandheldCommand #funkystation
 
 - type: entity
   id: LockerQuarterMasterFilled
@@ -52,6 +54,7 @@
         max: 15
     - id: PlushieLizardJobCaptain
       prob: 0.02
+    - id: RadioHandheldCommand #funkystation
 
 # No laser table + Laser table
 - type: entityTable
@@ -168,6 +171,8 @@
     - id: MetalFoamGrenade
     - id: PlushieLizardJobChiefengineer
       prob: 0.02
+    - id: RadioHandheldEngineering #funkystation
+    - id: RadioHandheldCommand #funkystation
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable
@@ -225,6 +230,8 @@
     - id: BoxCMOCircuitboards
     - id: PlushieLizardJobChiefmedicalofficer
       prob: 0.02
+    - id: RadioHandheldMedical #funkystation
+    - id: RadioHandheldCommand #funkystation
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable
@@ -277,6 +284,8 @@
     - id: RubberStampRd
     - id: PlushieLizardJobResearchdirector
       prob: 0.02
+    - id: RadioHandheldScience #funkystation
+    - id: RadioHandheldCommand #funkystation
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable
@@ -338,6 +347,7 @@
     - id: DrinkHosFlask
     - id: PlushieLizardJobHeadofsecurity
       prob: 0.02
+    - id: RadioHandheldCommand #funkystation, no sec radio since they start with one
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable
@@ -385,6 +395,8 @@
     - id: SpaceCash1000
     - id: BeachBall
     - id: BikeHorn
+    - id: RadioHandheldCommand #funkystation
+    - id: RadioHandheldEmergency #funkystation
 
 - type: entity
   id: LockerFreezerVaultFilled

Resources/Prototypes/Catalog/Fills/Lockers/medical.yml

@@ -123,6 +123,7 @@
     - id: JetInjector
     - id: HandheldHealthAnalyzer
     - id: BoxBodyBag
+    - id: ClothingHeadsetParamedic #funkystation
     - !type:GroupSelector
       children:
       - id: RollerBedSpawnFolded

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -59,6 +59,8 @@
       prob: 0.5
     - id: MedkitOxygenFilled
       prob: 0.2
+    - id: RadioHandheldEmergency #funkystation
+      prob: 0.15
     - id: WeaponFlareGun
       prob: 0.1
     - id: BoxMRE
@@ -92,6 +94,8 @@
     children:
     - id: ClothingMaskBreath
     - id: ClothingOuterSuitEmergency
+    - id: RadioHandheldEmergency #funkystation
+      prob: 0.15
     - id: BoxMRE
       prob: 0.1
     - id: ToolboxEmergencyFilled

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -46,6 +46,7 @@
     - id: Binoculars
     - id: PlushieLizardJobWarden
       prob: 0.02
+    - id: ClothingHeadsetWarden #funkystation
 
 - type: entityTable
   id: FillLockerWardenHarduit

Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml

@@ -13,5 +13,6 @@
     ClothingOuterSuitFire: 2
     ClothingOuterWinterAtmos: 2
     ClothingNeckScarfStripedLightBlue: 3
+    RadioHandheldEngineering: 2 #funkystation
   contrabandInventory:
     ToyFigurineAtmosTech: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml

@@ -20,6 +20,12 @@
     EncryptionKeyScience: 2
     EncryptionKeySecurity: 1
     EncryptionKeyService: 3
+    RadioHandheldCargo: 1 #funkystation
+    RadioHandheldEngineering: 1 #funkystation
+    RadioHandheldMedical: 1 #funkystation
+    RadioHandheldEmergency: 2 #funkystation
+    RadioHandheldScience: 1 #funkystation
+    RadioHandheldService: 2 #funkystation
   contrabandInventory:
     BalloonNT: 2
     LuxuryPen: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml

@@ -23,5 +23,6 @@
 #    ClothingOuterWinterChem: 1
 #    ClothingHandsGlovesLatex: 1 funky - chemists aren't doctors
     ClothingShoesColorWhite: 1
+    RadioHandheldMedical: 2 #funkystation
   contrabandInventory:
     ToyFigurineChemist: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml

@@ -14,6 +14,7 @@
     ClothingUniformJumpskirtLibrarian: 3
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
+    RadioHandheldService: 2 #funkystation
   contrabandInventory:
     ToyFigurineLibrarian: 1
 

Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml

@@ -18,5 +18,6 @@
     Welder: 1
     Screwdriver: 2
     Crowbar: 2
+    RadioHandheldScience: 2 #funkystation
   contrabandInventory:
-    FoodBurgerRobot: 1  
+    FoodBurgerRobot: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml

@@ -7,7 +7,7 @@
     Flare: 4
     FlashlightLantern: 2
     HandheldGPSBasic: 2
-    RadioHandheld: 2
+    RadioHandheldCargo: 2 #funkystation
     WeaponGrapplingGun: 4
     WeaponProtoKineticAccelerator: 4
   contrabandInventory:

Resources/Prototypes/Entities/Clothing/Ears/headsets.yml

@@ -255,6 +255,7 @@
       key_slots:
       - EncryptionKeyMedical
       - EncryptionKeySecurity
+      - EncryptionKeyEmergency
       - EncryptionKeyCommon
   - type: Sprite
     sprite: Clothing/Ears/Headsets/brigmedic.rsi

Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml

@@ -7,9 +7,9 @@
   components:
   - type: EncryptionKey
   - type: Item
-    sprite: Objects/Devices/encryption_keys.rsi
+    sprite: _Funkystation/Objects/Devices/encryption_keys.rsi #funkystation
   - type: Sprite
-    sprite: Objects/Devices/encryption_keys.rsi
+    sprite: _Funkystation/Objects/Devices/encryption_keys.rsi #funkystation
   # Funky changes start
   - type: StaticPrice
     price: 10
@@ -36,8 +36,8 @@
 - type: entity
   parent: [ EncryptionKey, BaseCargoContraband ]
   id: EncryptionKeyCargo
-  name: cargo encryption key
-  description: An encryption key used by supply employees.
+  name: logistics encryption key #funky supply -> logistics rename
+  description: An encryption key used by logistics employees. #funky supply -> logistics rename
   components:
   - type: EncryptionKey
     channels:
@@ -87,6 +87,7 @@
     - Security
     - Service
     - Supply
+    - Emergency #funkystation
     - InternalAffairs #funky
     defaultChannel: Command
   - type: Sprite
@@ -293,7 +294,7 @@
   - type: Sprite
     layers:
     - state: crypt_red
-    - state: ai_label
+    - state: label-sinary #funkystation
   - type: StaticPrice
     price: 1000
 

Resources/Prototypes/Entities/Objects/Devices/radio.yml

@@ -13,11 +13,19 @@
   - type: Speech
     speechVerb: Robotic
   - type: Sprite
-    sprite: Objects/Devices/communication.rsi
+    sprite: _Funkystation/Objects/Devices/radio.rsi #funky start
     layers:
-    - state: walkietalkie
-    - state: walkietalkie-on
-    state: walkietalkie
+    - state: base
+    - state: active
+      visible: false
+      shader: unshaded
+      map: [ "enum.ToggleableVisuals.Layer" ]
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false } #funky end
   - type: Item
     sprite: Objects/Devices/communication.rsi
     heldPrefix: walkietalkie
@@ -37,8 +45,21 @@
   - type: RadioSpeaker
     channels:
     - Security
-  - type: Sprite
-    sprite: Objects/Devices/securityhandy.rsi
+  - type: Sprite #funky start
+    sprite: _Funkystation/Objects/Devices/radio.rsi
+    layers:
+    - state: base
+    - state: cap-security
+    - state: active
+      visible: false
+      shader: unshaded
+      map: [ "enum.ToggleableVisuals.Layer" ]
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false } #funky end
   - type: Item
     sprite: Objects/Devices/securityhandy.rsi
     heldPrefix: walkietalkie

Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml

@@ -24,7 +24,7 @@
   id: ParamedicGear
   equipment:
     id: ParamedicPDA
-    ears: ClothingHeadsetMedical
+    ears: ClothingHeadsetParamedic #funkystation
 
 - type: chameleonOutfit
   id: ParamedicChameleonOutfit

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -33,7 +33,7 @@
   equipment:
     eyes: ClothingEyesGlassesSecurity
     id: WardenPDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetWarden # funkystation
     pocket1: WeaponPistolMk58
   storage:
     back:

Resources/Prototypes/_Funkystation/Entities/Clothing/Ears/headsets.yml

@@ -1,3 +1,30 @@
+- type: entity
+  parent: ClothingHeadsetMedical
+  id: ClothingHeadsetParamedic
+  name: paramedic headset
+  description: A headset for paramedics that receives emergency frequencies in addition to regular medical radio.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyMedical
+      - EncryptionKeyEmergency
+      - EncryptionKeyCommon
+
+
+- type: entity
+  parent: ClothingHeadsetAltSecurity
+  id: ClothingHeadsetWarden
+  name: dispatch headset
+  description: A headset for wardens or desk-working officers that receives emergency frequencies in addition to regular security radio.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeySecurity
+      - EncryptionKeyEmergency
+      - EncryptionKeyCommon
+
 - type: entity
   parent: ClothingHeadset
   id: ClothingHeadsetInternalAffairs

Resources/Prototypes/_Funkystation/Entities/Objects/Devices/encryption_keys.yml

@@ -1,3 +1,18 @@
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyEmergency
+  name: emergency encryption key
+  description: An encryption key used by paramedics, brigmedics, and security dispatchers.
+  components:
+  - type: EncryptionKey
+    channels:
+    - Emergency
+    defaultChannel: Emergency
+  - type: Sprite
+    layers:
+    - state: crypt_gray # upstream name
+    - state: label-emergency
+
 - type: entity
   parent: EncryptionKeyCommon
   id: EncryptionKeyIA
@@ -11,5 +26,4 @@
   - type: Sprite
     layers:
     - state: crypt_gray
-    - state: common_label
-
+    - state: common_label