Simple-Station · DEATHB4DEFEAT · Nov 18, 2024 · Jan 18, 2024 · Jan 25, 2024 · Jan 25, 2024
@@ -14,7 +14,7 @@ namespace Content.Server.Salvage;
 public sealed partial class SalvageSystem
 {
     [ValidatePrototypeId<RadioChannelPrototype>]
-    private const string MagnetChannel = "Supply";
+    private const string MagnetChannel = "Engineering"; // ParkStation-EngineeringSalvage - Why is this hardcoded?
 
     private EntityQuery<SalvageMobRestrictionsComponent> _salvMobQuery;
 

@@ -1,6 +1,6 @@
 job-description-gladiator = Put on a combat spectacle for the crew. Fight for your freedom, glory, and honor. Currently available on Arena.
 job-description-guard = Keep track of prisoners and make sure they have their basic needs.
-job-description-mail-carrier = Deliver mail and other packages from and to logistics. Avoid dogs.
+job-description-mail-carrier = Deliver mail and other packages to and from Cargo. Avoid dogs.
 job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC. Currently available on Shōkō.
 job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs.
 job-description-mantis = Solve mysteries from the nature of the universe to the meaning of life. Be the main person to deal with Psionic beings.
@@ -1,6 +1,6 @@
 job-name-gladiator = Gladiator
 job-name-guard = Prison Guard
-job-name-mail-carrier = Courier
+job-name-mail-carrier = Mail Carrier
 job-name-martialartist =  Martial Artist
 job-name-prisoner = Prisoner
 job-name-mantis = Psionic Mantis

diff --git a/Resources/Locale/en-US/simplestation14/Prototypes/job/job-supervisors.ftl b/Resources/Locale/en-US/simplestation14/Prototypes/job/job-supervisors.ftl
@@ -1 +1,2 @@
 job-supervisors-css = the chief service supervisor
+job-supervisors-cc = central command, and discussion among the board of heads
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -5,7 +5,7 @@
     state: catwalk_preview
   product: CargoPallet
   cost: 250
-  category: Logistics # DeltaV - Logistics Department replacing Cargo
+  category: Cargo
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: orebox
   product: OreBox
   cost: 500
-  category: Logistics # DeltaV - Logistics Department replacing Cargo
+  category: Cargo
   group: market
 
 - type: cargoProduct
@@ -25,5 +25,5 @@
     state: icon
   product: CrateCargoLuxuryHardsuit
   cost: 15000
-  category: Logistics # DeltaV - Logistics Department replacing Cargo
+  category: Cargo
   group: market
@@ -295,7 +295,7 @@
       - EncryptionKey
 
 - type: entity
-  name: logistics encryption key box # DeltaV - Logistics Department replacing Cargo
+  name: cargo encryption key box
   parent: BoxEncryptionKeyPassenger
   id: BoxEncryptionKeyCargo
   components:

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -20,7 +20,7 @@
       - id: SpaceCashLuckyBill # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml
       - id: BoxPDACargo # Delta-V
       - id: QuartermasterIDCard # Delta-V
-      - id: ClothingShoesBootsWinterLogisticsOfficer #Delta V: Add departmental winter boots
+      - id: ClothingShoesBootsWinterCargoOfficer #Delta V: Add departmental winter boots
 
 - type: entity
   id: LockerCaptainFilledHardsuit

@@ -50,7 +50,7 @@
   - "You can examine your headset to see which radio channels you have available and how to speak in them."
   - "As a Salvage Technician, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space."
   - "As a Salvage Technician, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective."
-  - "As a Salvage Technician, never forget to mine ore! Ore can be sold to logistics for a pretty penny, be used for construction, and also be used by Scientists for fancy technology."
+  - "As a Salvage Technician, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology."
   - "As a Salvage Technician, try asking epistemics for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!"
   - "As a Salvage Technician, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator."
   - "As a Salvage Technician, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials."

@@ -57,14 +57,15 @@
   - type: StorageFill
     contents:
       - id: EngineerPDA
-        amount: 3
+        amount: 2
       - id: AtmosPDA
+      - id: SalvagePDA # Parkstation-EngineeringSalvagers
 
 - type: entity
-  name: logistics PDA box
+  name: cargo PDA box
   parent: BoxPDA
   id: BoxPDACargo
-  description: A box of spare PDA microcomputers for the logistics department.
+  description: A box of spare PDA microcomputers for the cargo department.
   components:
   - type: StorageFill
     contents:

@@ -174,7 +174,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretLogi
-  name: logistics beret
+  name: cargo beret
   description: For the intellectual and studious accountant. Definitely not a revolutionary symbol.
   components:
   - type: Sprite

@@ -160,8 +160,8 @@
 
 - type: entity
   parent: ClothingShoesBaseWinterBoots
-  id: ClothingShoesBootsWinterLogisticsOfficer
-  name: LO's winter boots
+  id: ClothingShoesBootsWinterCargoOfficer
+  name: QM's winter boots
   components:
   - type: Sprite
     sprite: DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi

@@ -1,8 +1,8 @@
 - type: entity
   parent: BaseItem
   id: SpaceCashLuckyBill
-  name: logistics officer's lucky bill
-  description: The first bill ever earned by the Logistics Officer from trading. A small chip is embedded in it.
+  name: Cargo technician's lucky bill
+  description: The first bill ever earned by the Cargo Technician from trading. A small chip is embedded in it.
   components:
     - type: Sprite
       sprite: DeltaV/Objects/Misc/first_bill.rsi

@@ -1,8 +1,8 @@
 - type: entity
   parent: BaseSignDirectional
-  id: SignDirectionalLogistics
-  name: logistics sign
-  description:  A direction sign, pointing out which way the Logistics department is.
+  id: SignDirectionalCargo
+  name: cargo sign
+  description:  A direction sign, pointing out which way the Cargo department is.
   components:
   - type: Sprite
     sprite: DeltaV/Structures/Wallmounts/signs.rsi

@@ -1,6 +1,6 @@
 - type: stealTargetGroup
   id: SpaceCashLuckyBill
-  name: logistics officer's lucky bill
+  name: quartermaster's lucky bill
   sprite:
     sprite: DeltaV/Objects/Misc/first_bill.rsi
     state: icon

@@ -166,8 +166,8 @@
 - type: entity
   parent: ClothingBackpack
   id: ClothingBackpackCargo
-  name: logistics backpack # DeltaV - Logistics Department replacing Cargo
-  description: A robust backpack for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo
+  name: cargo backpack
+  description: A robust backpack for stealing cargo's loot.
   components:
     - type: Sprite
       sprite: Clothing/Back/Backpacks/cargo.rsi

@@ -142,8 +142,8 @@
 - type: entity
   parent: ClothingBackpackDuffel
   id: ClothingBackpackDuffelCargo
-  name: logistics duffel bag # DeltaV - Logistics Department replacing Cargo
-  description: A large duffel bag for stealing logistics's precious loot. # DeltaV - Logistics Department replacing Cargo
+  name: cargo duffel bag
+  description: A large duffel bag for stealing cargo's precious loot.
   components:
     - type: Sprite
       sprite: Clothing/Back/Duffels/cargo.rsi

@@ -144,8 +144,8 @@
 - type: entity
   parent: ClothingBackpackSatchel
   id: ClothingBackpackSatchelCargo
-  name: logistics satchel # DeltaV - Logistics Department replacing Cargo
-  description: A robust satchel for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo
+  name: cargo satchel
+  description: A robust satchel for stealing cargo's loot.
   components:
     - type: Sprite
       sprite: Clothing/Back/Satchels/cargo.rsi

@@ -38,7 +38,7 @@
 - type: entity
   parent: ClothingHeadset
   id: ClothingHeadsetCargo
-  name: logistics headset # DeltaV - Logistics Department replacing Cargo
+  name: cargo headset
   description: A headset used by supply employees.
   components:
   - type: ContainerFill
@@ -65,8 +65,8 @@
 - type: entity
   parent: ClothingHeadsetCargo
   id: ClothingHeadsetQM
-  name: logistics officer's headset # DeltaV - Logistics Department replacing Cargo
-  description: A headset used by the logistics officer. # DeltaV - Logistics Department replacing Cargo
+  name: quartermaster's headset
+  description: A headset used by the Quartermaster.
   components:
   - type: ContainerFill
     containers:

@@ -13,7 +13,7 @@
 - type: entity
   parent: ClothingHeadsetAlt
   id: ClothingHeadsetAltCargo
-  name: logistics officer's over-ear headset # DeltaV - Logistics Department replacing Cargo
+  name: cargo technician's over-ear headset
   components:
   - type: ContainerFill
     containers:

@@ -239,7 +239,7 @@
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterCargo
   noSpawn: true
-  name: logistics winter coat hood # DeltaV - Logistics Department replacing Cargo
+  name: cargo winter coat hood
   components:
   - type: Sprite
     sprite: Clothing/Head/Hoods/Coat/hoodcargo.rsi
@@ -394,7 +394,7 @@
   parent: ClothingHeadHatHoodWinterBase
   id: ClothingHeadHatHoodWinterQM
   noSpawn: true
-  name: logistics officer's coat hood # DeltaV - Logistics Department replacing Cargo
+  name: quartermaster's coat hood
   components:
   - type: Sprite
     sprite: Clothing/Head/Hoods/Coat/hoodqm.rsi

@@ -23,8 +23,8 @@
 - type: entity
   parent: ClothingHeadBaseButcherable
   id: ClothingHeadHatCargosoft
-  name: logistics cap # DeltaV - Logistics Department replacing Cargo
-  description: "It's a baseball hat painted in Logistics colours." # DeltaV - Logistics Department replacing Cargo
+  name: cargo cap
+  description: "It's a baseball hat painted in Cargo colors."
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/cargosoft.rsi
@@ -39,8 +39,8 @@
 - type: entity
   parent: ClothingHeadBaseButcherable
   id: ClothingHeadHatCargosoftFlipped
-  name: logistics cap flipped # DeltaV - Logistics Department replacing Cargo
-  description: "It's a baseball hat painted in Logistics colours. Flipped." # DeltaV - Logistics Department replacing Cargo
+  name: cargo cap flipped
+  description: "It's a baseball hat painted in Cargo colors. Flipped."
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
@@ -50,8 +50,8 @@
 - type: entity
   parent: ClothingHeadBaseButcherable
   id: ClothingHeadHatQMsoft
-  name: logistics officer's cap # DeltaV - Logistics Department replacing Cargo
-  description: "It's a baseball hat painted in the Logistics Officer's colors."
+  name: quartermaster's cap
+  description: "It's a baseball hat painted in the Quartermaster's colors."
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/qmsoft.rsi
@@ -61,8 +61,8 @@
 - type: entity
   parent: ClothingHeadBaseButcherable
   id: ClothingHeadHatQMsoftFlipped
-  name: logistics officer's cap flipped # DeltaV - Logistics Department replacing Cargo
-  description: "It's a baseball hat painted in the Logistics Officer's colors. Flipped."
+  name: quartermaster's cap flipped
+  description: "It's a baseball hat painted in the Quartermaster's colors. Flipped."
   components:
   - type: Sprite
     sprite: Clothing/Head/Soft/qmsoft_flipped.rsi

@@ -67,7 +67,7 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakQm
-  name: logistics officer's cloak # DeltaV - Logistics Department replacing Cargo
+  name: quartermaster's cloak
   description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills.
   components:
   - type: Sprite

@@ -57,7 +57,7 @@
   parent: ClothingNeckBase
   id: ClothingNeckMantleRD
   name: mystagogue's mantle # DeltaV - Epistemics Department replacing Science
-  description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from logistics; this mantle will keep you comfy. # DeltaV - Logistics Department replacing Cargo
+  description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from cargo; this mantle will keep you comfy.
   components:
   - type: Sprite
     sprite: Clothing/Neck/mantles/rdmantle.rsi
@@ -67,7 +67,7 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckMantleQM
-  name: logistics officer's mantle # DeltaV - Logistics Department replacing Cargo
+  name: quartermaster's mantle
   description: For the master of goods and materials to rule over the department, a befitting mantle to show off superiority!
   components:
   - type: Sprite

@@ -26,8 +26,8 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCargomedal
-  name: logistics medal # DeltaV - Logistics Department replacing Cargo
-  description: Whether it's for superior accountancy, courageous salvage work, or just being a friendly technician - this medal is to be assigned only for the best work in the logistics department. # DeltaV - Logistics Department replacing Cargo. Updated description for flavour
+  name: cargo medal
+  description: Whether it's for superior accountancy, courageous salvage work, or just being a friendly technician - this medal is to be assigned only for the best work in the cargo department.
   components:
   - type: Sprite
     sprite: DeltaV/Clothing/Neck/Medals/cargomedal.rsi # DeltaV - resprite

@@ -446,7 +446,7 @@
   parent: ClothingOuterHardsuitBase
   id: ClothingOuterHardsuitLuxury #DO NOT MAP - https://github.com/space-wizards/space-station-14/pull/19738#issuecomment-1703486738
   name: luxury mining hardsuit
-  description: A refurbished mining hardsuit, fashioned after the Logistics Officer's colors. Graphene lining provides less protection, but is much easier to move. # DeltaV - Logistics Department replacing Cargo
+  description: A refurbished mining hardsuit, fashioned after the Cargo Technician's colors. Graphene lining provides less protection, but is much easier to move.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi

@@ -95,7 +95,7 @@
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
   id: ClothingOuterWinterCargo
-  name: logistics winter coat # DeltaV - Logistics Department replacing Cargo
+  name: cargo winter coat
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi
@@ -345,7 +345,7 @@
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
   id: ClothingOuterWinterQM
-  name: logistics officer's winter coat # DeltaV - Logistics Department replacing Cargo
+  name: quartermaster's winter coat
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi

@@ -105,7 +105,7 @@
 - type: entity
   parent: ClothingShoesBaseWinterBoots
   id: ClothingShoesBootsWinterCargo
-  name: logistics winter boots #Delta V: Rename Logistics
+  name: cargo winter boots
   components:
   - type: Sprite
     sprite: Clothing/Shoes/Boots/winterbootscargo.rsi

@@ -24,7 +24,7 @@
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtCargo
   name: cargo tech jumpskirt
-  description: A sturdy jumpskirt, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo
+  description: A sturdy jumpskirt, issued to members of the Cargo department.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi
@@ -285,7 +285,7 @@
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtQM
-  name: logistics officer's jumpskirt # DeltaV - Logistics Department replacing Cargo
+  name: quartermaster's jumpskirt
   description: 'What can brown do for you?'
   components:
   - type: Sprite
@@ -296,7 +296,7 @@
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtQMTurtleneck
-  name: logistics officer's turtleneck # DeltaV - Logistics Department replacing Cargo
+  name: quartermaster's turtleneck
   description: A sharp turtleneck made for the hardy work environment of supply.
   components:
     - type: Sprite
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		job-supervisors-css = the chief service supervisor
		job-supervisors-cc = central command, and discussion among the board of heads