Chef ship

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

@@ -0,0 +1 @@
+chat-radio-traffic = Traffic

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

@@ -4,7 +4,6 @@
     children:
     - !type:NestedSelector # DeltaV
       tableId: LockerFillQuarterMasterDeltaV
-    - id: BoxEncryptionKeyCargo
     - id: BoxFolderQmClipboard
     - id: CargoBountyComputerCircuitboard
     - id: CargoRequestComputerCircuitboard

Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_shuttle.yml

@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: TrafficKeyBox
+  icon:
+    sprite: _NF/Objects/Devices/encryption_keys.rsi
+    state: stc_label
+  product: CrateTrafficKey
+  cost: 10000
+  category: cargoproduct-category-name-shuttle
+  group: market

Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml

@@ -16,6 +16,17 @@
     whitelist:
       components:
       - EncryptionKey
+
+- type: entity
+  name: traffic encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyTraffic
+  description: A box of spare encryption keys.
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyTraffic
+        amount: 4
 
 - type: entity
   name: justice encryption key box

Resources/Prototypes/DeltaV/Catalog/Fills/Crates/shuttle.yml

@@ -0,0 +1,9 @@
+- type: entity
+  parent: CratePlastic
+  id: CrateTrafficKey
+  name: traffic key crate
+  description: Contains a box of traffic keys
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxEncryptionKeyTraffic

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

@@ -11,6 +11,7 @@
     - id: ClothingShoesBootsWinterLogisticsOfficer
     - id: MiningShuttleConsoleCircuitboard
     - id: StockTradingCartridge
+    - id: BoxEncryptionKeyTraffic
     - id: LunchboxCommandFilledRandom
       prob: 0.3
 

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

@@ -10,39 +10,7 @@
       - EncryptionKeyService
       - EncryptionKeyCommand
       - EncryptionKeyCommon
-
-- type: entity
-  parent: ClothingHeadsetAlt
-  id: ClothingHeadsetAltService
-  name: head of personnel's over-ear headset
-  components:
-  - type: ContainerFill
-    containers:
-      key_slots:
-      - EncryptionKeyService
-      - EncryptionKeyCommand
-      - EncryptionKeyCommon
-  - type: Sprite
-    sprite: DeltaV/Clothing/Ears/Headsets/service.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/Ears/Headsets/service.rsi
 
-- type: entity
-  parent: ClothingHeadsetAltSyndicate
-  id: ClothingHeadsetAltSyndicateListening
-  name: blood-red over-ear interception headset
-  description: An advanced, modular syndicate interception intercom that fits over the head.
-  components:
-  - type: ContainerFill
-    containers:
-      key_slots:
-      - EncryptionKeySyndie
-      - EncryptionKeyStationMaster
-  - type: Sprite
-    sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
-
 - type: entity
   parent: ClothingHeadset
   id: ClothingHeadsetJustice
@@ -60,25 +28,6 @@
     state: icon
   - type: Clothing
     sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
-
-- type: entity
-  parent: ClothingHeadset
-  id: ClothingHeadsetAltJustice
-  name: chief justice's headset
-  description: The headset used by the chief justice.
-  components:
-  - type: ContainerFill
-    containers:
-      key_slots:
-      - EncryptionKeyJustice
-      - EncryptionKeySecurity
-      - EncryptionKeyCommon
-      - EncryptionKeyCommand
-  - type: Sprite
-    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
-    state: icon_alt
-  - type: Clothing
-    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
 
 - type: entity
   parent: ClothingHeadset
@@ -112,4 +61,18 @@
     sprite: Clothing/Ears/Headsets/security.rsi
   - type: Clothing
     sprite: Clothing/Ears/Headsets/security.rsi
-
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetGreySyndicate
+  name: passenger headset
+  suffix: Recruiter
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyTraffic
+      # - EncryptionKeySyndie # Taken out until remodeling of recruiter is done. 
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: Clothing/Ears/Headsets/base.rsi

Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets_alt.yml

@@ -0,0 +1,66 @@
+- type: entity
+  parent: ClothingHeadsetAlt
+  id: ClothingHeadsetAltService
+  name: head of personnel's over-ear headset
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyService
+      - EncryptionKeyCommand
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/service.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/service.rsi
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetAltJustice
+  name: chief justice's headset
+  description: The headset used by the chief justice.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyJustice
+      - EncryptionKeySecurity
+      - EncryptionKeyCommon
+      - EncryptionKeyCommand
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+    state: icon_alt
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+
+- type: entity
+  parent: ClothingHeadsetAltSyndicate
+  id: ClothingHeadsetAltSyndicateListening
+  name: blood-red over-ear interception headset
+  description: An advanced, modular syndicate interception intercom that fits over the head.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeySyndie
+      - EncryptionKeyStationMaster
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
+
+- type: entity
+  parent: ClothingHeadsetAltSyndicate
+  id: ClothingHeadsetAltSyndicateInterdyne
+  name: blood-red over-ear piloting headset
+  description: An advanced, modular syndicate intercom that fits over the head.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeySyndie
+      - EncryptionKeyTraffic
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi

Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/intercom.yml

@@ -0,0 +1,27 @@
+- type: entity
+  id: IntercomJustice
+  parent: BaseIntercomSecure
+  suffix: Justice
+  description: An intercom. It's been reinforced with metal.
+  components:
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyJustice
+
+- type: entity
+  id: IntercomTraffic
+  parent: BaseIntercomSecure
+  suffix: Traffic
+  description: An intercom. It's been reinforced with metal.
+  components:
+  - type: ContainerFill
+    containers:
+      board:
+      - IntercomElectronics
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyTraffic

Resources/Prototypes/DeltaV/Roles/Antags/recruiter.yml

@@ -21,6 +21,6 @@
     outerClothing: ClothingOuterCoatTrench
     shoes: ClothingShoesLeather
     id: PassengerPDA
-    ears: ClothingHeadsetGrey
+    ears: ClothingHeadsetGreySyndicate
     pocket1: PenRecruiter
     pocket2: RubberStampSyndicate

Resources/Prototypes/DeltaV/Roles/Antags/synthesis_specialist.yml

@@ -22,7 +22,7 @@
     outerClothing: ClothingOuterCoatLabChem
     shoes: ClothingShoesEnclosedChem
     id: SyndiPDA
-    ears: ClothingHeadsetAltSyndicate
+    ears: ClothingHeadsetAltSyndicateInterdyne # Gives them Traffic Coms (Todo: Add common coms upon ship & role rework)
     pocket1: HandLabeler
     pocket2: RubberStampSyndicate
     mask: ClothingMaskNeckGaiter

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

@@ -73,6 +73,7 @@
       key_slots:
       - EncryptionKeyCargo
       - EncryptionKeyCommand
+      - EncryptionKeyTraffic # DeltaV - "STOP CRASHING INTO MY CARGO SHUTTLE FOR F### SAKE"
       - EncryptionKeyCommon
 
 - type: entity

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

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: ClothingHeadset
   id: ClothingHeadsetAlt
@@ -20,6 +20,7 @@
       key_slots:
       - EncryptionKeyCargo
       - EncryptionKeyCommand
+      - EncryptionKeyTraffic # DeltaV
       - EncryptionKeyCommon
   - type: Sprite
     sprite: Clothing/Ears/Headsets/cargo.rsi

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

@@ -73,7 +73,8 @@
     - Security
     - Service
     - Supply
-    - Prison #DeltaV
+    - Traffic # DeltaV
+    - Prison # DeltaV
     defaultChannel: Command
   - type: Sprite
     layers:

Resources/Prototypes/Shuttles/shuttle_incoming_event.yml

@@ -5,7 +5,7 @@
 
 - type: preloadedGrid
   id: TravelingCuisine
-  path: /Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml
+  path: /Maps/Shuttles/_NF/piecrust_edited.yml # DeltaV - Better Chef Shuttle
   copies: 2
 
 - type: preloadedGrid

Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml

@@ -0,0 +1,15 @@
+- type: entity
+  id: ClothingBeltPilotFilled
+  parent: ClothingBeltPilot
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CrowbarRed
+      - id: Wrench
+      - id: Screwdriver
+      - id: Multitool
+      - id: HandHeldMassScanner
+      - id: RemoteSignaller
+      - id: InflatableWallStack5
+      - id: InflatableDoorStack1

Resources/Prototypes/_NF/Catalog/Fills/Lockers/pilot.yml

@@ -0,0 +1,17 @@
+- type: entity
+  id: LockerPilotFilled
+  suffix: Filled
+  parent: LockerPilot
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingBeltPilotFilled
+      - id: ClothingHeadsetAltPilot
+      - id: ClothingEyesGlassesPilot
+      - id: ClothingNeckScarfPilot
+      - id: ClothingMaskPilot
+      - id: ClothingHandsGlovesPilot # DeltaV Addition to add full pilot outfit to locker
+      - id: ClothingShoesBootsPilot # DeltaV Addition
+      - id: ClothingUniformJumpsuitPilot # DeltaV Addition
+      - id: ClothingHeadHatPilot # DeltaV Addition
+      - id: ClothingBackpackPilot # DeltaV Addition

Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml

@@ -0,0 +1,13 @@
+#Pilot hardsuit
+- type: entity
+  id: SuitStoragePilot
+  parent: SuitStorageBase
+  suffix: Pilot
+  components:
+  - type: StorageFill
+    contents:
+        - id: OxygenTankFilled # DeltaV - Changed Air Tank to O2 Tank
+        - id: ClothingOuterHardsuitPilot
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled
+  - type: AccessReader

Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml

@@ -0,0 +1,8 @@
+- type: entity
+  parent: NFClothingBackpack
+  id: ClothingBackpackPilot
+  name: pilot backpack
+  description: A backpack for a True Ace.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Backpacks/pilot.rsi