Sorting Departments.

.vscode/settings.json

@@ -6,5 +6,6 @@
             "fileMatch": [ "**/meta.json" ],
             "url": "https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/.github/rsi-schema.json"
         }
-    ]
+    ],
+    "git.ignoreLimitWarning": true
 }

Content.Server/Salvage/SalvageSystem.Magnet.cs

@@ -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;
 

Resources/Locale/en-US/cargo/bounties.ftl

@@ -129,6 +129,6 @@ bounty-description-hi-viz-vest  = The clown stole the AME controller and won't b
 bounty-description-torch = The chef made all the monkeys and kobolds at once, and they rebelled and took over the cargo shuttle. They're demanding supplies and free passage to a jungle planet, and we're giving in to their demands. All they need now is a few torches.
 bounty-description-medkit-box = CentComm is putting on a play set in a hospital, and needs some props. Just send us some empty medkit boxes, and the show will go on!
 bounty-description-cardobard-box = "The Cardborgs Cometh" is a new play premiering tomorrow, and the costuming team is woefully unprepared. Send us some boxes to work with.
-bounty-description-wine = The new cataloger and the Logistics Officer are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (Or cans, if you must) to help make the date go well.
+bounty-description-wine = The new cataloger and the Quartermaster are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (Or cans, if you must) to help make the date go well.
 bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed.
 bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers.

Resources/Locale/en-US/deltav/job/job-description.ftl

@@ -2,4 +2,4 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve
 job-description-chief-justice = Manage the justice department, act as a judge, and ensure everyone recieves fair and just treatment.
 job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed.
 job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes.
-job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs.
+job-description-courier = Deliver mail and other packages from and to Cargo. Avoid dogs.

Resources/Locale/en-US/guidebook/guides.ftl

@@ -17,7 +17,7 @@ guide-entry-rtg = RTG
 guide-entry-controls = Controls
 guide-entry-radio = Radio
 guide-entry-jobs = Jobs
-guide-entry-cargo = Logistics
+guide-entry-cargo = Cargo
 guide-entry-cargo-bounties = Cargo Bounties
 guide-entry-salvage = Salvage
 guide-entry-survival = Survival

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

@@ -12,7 +12,7 @@ chat-radio-medical = Medical
 chat-radio-science = Epistemics
 chat-radio-security = Security
 chat-radio-service = Service
-chat-radio-supply = Logistics
+chat-radio-supply = Cargo
 chat-radio-syndicate = Syndicate
 chat-radio-freelance = Freelance
 

Resources/Locale/en-US/job/job-description.ftl

@@ -35,7 +35,7 @@ job-description-mime = Entertain the crew through non-vocal means, and engage wi
 job-description-musician = Entertain the crew with your unique musical talent, and acquire new instruments to mess around with.
 job-description-passenger = Enjoy your stay aboard the station with no obligations!
 job-description-psychologist = Provide emotional support to traumatized crew.
-job-description-qm = Manage the supplies of the station & the logistics department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
+job-description-qm = Manage the supplies of the station & the Cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
 job-description-rd = Manage the epistemics department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
 job-description-research-assistant = Learn the basics of how to research various artifacts, anomalies and robotics.
 job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news.

Resources/Locale/en-US/job/job-names.ftl

@@ -36,7 +36,7 @@ job-name-botanist = Botanist
 job-name-bartender = Bartender
 job-name-passenger = Passenger
 job-name-salvagespec = Salvage specialist
-job-name-qm = Logistics Officer
+job-name-qm = Quartermaster
 job-name-cargotech = Cargo Technician
 job-name-chef = Chef
 job-name-clown = Clown
@@ -85,7 +85,7 @@ JobMusician = Musician
 JobParamedic = Paramedic
 JobPassenger = Passenger
 JobPsychologist = Psychologist
-JobQuartermaster = Logistics Officer
+JobQuartermaster = QuarterMaster
 JobReporter = Reporter
 JobResearchAssistant = Noviciate
 JobResearchDirector = Mystagogue

Resources/Locale/en-US/job/job-supervisors.ftl

@@ -5,7 +5,7 @@ job-supervisors-hos = the head of security
 job-supervisors-ce = the chief engineer
 job-supervisors-cmo = the chief medical officer
 job-supervisors-rd = the mystagogue
-job-supervisors-qm = the logistics officer
+job-supervisors-qm = the quartermaster
 job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
 job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer
 job-supervisors-medicine = medical doctors, chemists, and the chief medical officer

Resources/Locale/en-US/loadouts/categories.ftl

@@ -9,15 +9,15 @@ loadout-category-Head = Head
 loadout-category-Items = Items
 loadout-category-Jobs = Jobs
 loadout-category-JobsAUncategorized = Uncategorized
-loadout-category-JobsCargo = Logistics
+loadout-category-JobsCargo = Cargo
 loadout-category-JobsCommand = Command
 loadout-category-JobsCommandAUncategorized = Uncategorized
 loadout-category-JobsCommandCaptain = Captain
 loadout-category-JobsCommandCE = Chief Engineer
 loadout-category-JobsCommandCMO = Chief Medical Officer
 loadout-category-JobsCommandHOP = Head of Personnel
 loadout-category-JobsCommandHOS = Head of Security
-loadout-category-JobsCommandQM = Logistics Officer
+loadout-category-JobsCommandQM = Quartermaster
 loadout-category-JobsCommandRD = Mystagogue
 loadout-category-JobsEngineering = Engineering
 loadout-category-JobsMedical = Medical

Resources/Locale/en-US/loadouts/itemgroups.ftl

@@ -19,9 +19,9 @@ character-item-group-LoadoutBoxKits = Survival Kits
 character-item-group-LoadoutWritables = Writing Tools
 
 # Cargo
-character-item-group-LoadoutNeckCargo = Logistics Neckwear
-character-item-group-LoadoutOuterCargo = Logistics Outerwear
-character-item-group-LoadoutShoesCargo = Logistics Shoes
+character-item-group-LoadoutNeckCargo = Cargo Neckwear
+character-item-group-LoadoutOuterCargo = Cargo Outerwear
+character-item-group-LoadoutShoesCargo = Cargo Shoes
 
 # Engineering
 character-item-group-LoadoutEyesEngineering = Engineering Eyewear

Resources/Locale/en-US/mail/mail.ftl

@@ -8,10 +8,10 @@ mail-desc-priority = The anti-tamper lock's [color=yellow]yellow priority tape[/
 mail-desc-priority-inactive = The anti-tamper lock's [color=#886600]yellow priority tape[/color] is inactive.
 mail-unlocked = Anti-tamper system unlocked.
 mail-unlocked-by-emag = Anti-tamper system *BZZT*.
-mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to logistics' account.
-mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
-mail-penalty-fragile = INTEGRITY COMPROMISED. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
-mail-penalty-expired = DELIVERY PAST DUE. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
+mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to cargo's account.
+mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. CARGO BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
+mail-penalty-fragile = INTEGRITY COMPROMISED. CARGO BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
+mail-penalty-expired = DELIVERY PAST DUE. CARGO BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
 mail-item-name-unaddressed = mail
 mail-item-name-addressed = mail ({$recipient})
 

Resources/Locale/en-US/nyanotrasen/job/job-description.ftl

@@ -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.

Resources/Locale/en-US/nyanotrasen/job/job-names.ftl

@@ -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 = Mantis

Resources/Locale/en-US/paper/stamp-component.ftl

@@ -10,7 +10,7 @@ stamp-component-stamped-name-denied = DENIED
 stamp-component-stamped-name-approved = APPROVED
 stamp-component-stamped-name-hop = Head of Personnel
 stamp-component-stamped-name-hos = Head of Security
-stamp-component-stamped-name-qm = Logistics Officer
+stamp-component-stamped-name-qm = Quartermaster
 stamp-component-stamped-name-rd = Mystagogue
 stamp-component-stamped-name-warden = Warden
 stamp-component-stamped-name-trader = Trader

Resources/Locale/en-US/parkstation/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

Resources/Locale/en-US/prototypes/access/accesses.ftl

@@ -22,8 +22,8 @@ id-card-access-level-chemistry = Chemistry
 id-card-access-level-paramedic = Paramedic
 id-card-access-level-psychologist = Psychologist
 
-id-card-access-level-quartermaster = Logistics Officer
-id-card-access-level-cargo = Logistics
+id-card-access-level-quartermaster = Quartermaster
+id-card-access-level-cargo = Cargo
 id-card-access-level-salvage = Salvage
 
 id-card-access-level-bar = Bar

Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl

@@ -52,7 +52,7 @@ ent-ClothingHeadHelmetHardsuitCombatAdvanced = FPA-99 helmet
 ent-ClothingHeadHelmetHardsuitCombatHoS = FPA-99s helmet
     .desc = { ent-ClothingHeadHelmetHardsuitCombatAdvanced.desc }
 ent-ClothingHeadHelmetHardsuitLuxury = HpI-20c helmet
-    .desc = A modified helmet for the Minos hardsuit, fashioned after the Logistics Officer's colors. It's been modified for greater mobility at the expense of physical trauma protection.
+    .desc = A modified helmet for the Minos hardsuit, fashioned after the Quartermaster's colors. It's been modified for greater mobility at the expense of physical trauma protection.
 ent-ClothingHeadHelmetHardsuitSyndie = CSA-51a helmet
     .desc = An armored helmet deployed over a Shanlin tacsuit. This one has been painted blood red.
 ent-ClothingHeadHelmetHardsuitSyndieReverseEngineered = CSA-51a helmet

Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl

@@ -69,7 +69,7 @@ ent-ClothingOuterHardsuitCombatHoS = FPA-99s - "Dayicin Mk.II" tacsuit
     .desc = A top-of-the-line tactical combat hardsuit produced by Five-Points-Armory, painted with the colors of station security.
     The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels somewhat light.
 ent-ClothingOuterHardsuitLuxury = HpI-20c - "Minos" hardsuit
-    .desc = A modified mining hardsuit from Hephaestus Industries, fashioned after the Logistics Officer's colors.
+    .desc = A modified mining hardsuit from Hephaestus Industries, fashioned after the Quartermaster's colors.
     The labels indicate that it provides slight protection against most forms of damage. It feels incredibly light.
 ent-ClothingOuterHardsuitSyndie = CSA-51a - "Shanlin" tacsuit
     .desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
@@ -133,4 +133,4 @@ ent-ClothingOuterHardsuitClown = clown vacsuit
 ent-ClothingOuterHardsuitMime = mime vacsuit
     .desc = A custom-made mime vacsuit. On closer inspection, it appears to be a normal vacsuit with suspenders and paint applied on top.
 ent-ClothingOuterHardsuitSanta = DNK-31 "Jolly" hardsuit
-    .desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes.
+    .desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes.

Resources/Locale/en-US/station-events/events/cargo-gifts.ftl

@@ -1,11 +1,11 @@
 cargo-gifts-event-announcement = Congratulations! { $sender } has decided to send { $description } to the station { $dest }. Look for it in your next cargo shipment.
 cargo-gift-default-description = A bundle of gifts
 cargo-gift-default-sender = NanoTrasen
-cargo-gift-default-dest = Logistics Dept.
+cargo-gift-default-dest = Cargo Dept.
 
 cargo-gift-dest-bar = bar
 cargo-gift-dest-eng = Engineering Dept
-cargo-gift-dest-supp = Logistics Dept
+cargo-gift-dest-supp = Cargo Dept
 cargo-gift-dest-janitor = Service Dept
 cargo-gift-dest-med = Medical Dept
 cargo-gift-dest-sec = Security Dept

Resources/Prototypes/Access/cargo.yml

@@ -14,7 +14,6 @@
   id: Cargo
   tags:
   - Quartermaster
-  - Salvage
   - Cargo
   - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
   - Orders # Delta V - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml

Resources/Prototypes/Access/engineering.yml

@@ -16,6 +16,7 @@
   - ChiefEngineer
   - Engineering
   - Atmospherics
+  - Salvage
 
 - type: accessGroup
   id: FireFight

Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml

@@ -19,23 +19,23 @@
   category: cargoproduct-category-name-hardsuits
   group: market
 
-# Logistics
+# Cargo
 - type: cargoProduct
-  id: LogisticsKritiHardsuit
+  id: CargoKritiHardsuit
   icon:
     sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi
     state: icon
-  product: CrateLogisticsKritiHardsuit
+  product: CrateCargoKritiHardsuit
   cost: 1250
   category: cargoproduct-category-name-hardsuits
   group: market
 
 - type: cargoProduct
-  id: LogisticsLavrionHardsuit
+  id: CargoLavrionHardsuit
   icon:
     sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
     state: icon
-  product: CrateLogisticsLavrionHardsuit
+  product: CrateCargoLavrionHardsuit
   cost: 3500
   category: cargoproduct-category-name-hardsuits
   group: market

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

@@ -279,7 +279,7 @@
       - EncryptionKey
 
 - type: entity
-  name: logistics encryption key box # DeltaV - Logistics Department replacing Cargo
+  name: cargo encryption key box
   parent: BoxEncryptionKeyPassenger
   id: BoxEncryptionKeyCargo
   components:

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

@@ -2,9 +2,7 @@
   id: CrateCargoLuxuryHardsuit
   parent: CratePirate
   name: luxury mining hardsuit crate
-  # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
-  description: Finally, a hardsuit the Logistics Officer could call their own. Centcomm has heard you, now stop asking.
-  # End of modified code
+  description: Finally, a hardsuit the Quartermaster could call their own. Centcomm has heard you, now stop asking.
   components:
   - type: StorageFill
     contents:

Resources/Prototypes/Catalog/Fills/Crates/hardsuits.yml

@@ -19,9 +19,9 @@
     contents:
     - id: ClothingOuterHardsuitAtmos
 
-# Logistics
+# Cargo
 - type: entity
-  id: CrateLogisticsKritiHardsuit
+  id: CrateCargoKritiHardsuit
   parent: CrateGenericSteel
   name: kriti hardsuit crate
   description: Contains a single HpI-20s "Kriti" hardsuit.
@@ -31,7 +31,7 @@
     - id: ClothingOuterHardsuitSpatio
 
 - type: entity
-  id: CrateLogisticsLavrionHardsuit
+  id: CrateCargoLavrionHardsuit
   parent: CrateGenericSteel
   name: lavrion hardsuit crate
   description: Contains a single HpI-20a "Lavrion" hardsuit.

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

@@ -26,7 +26,7 @@
         prob: 0.3
       - id: ClothingNeckSalvager # DeltaV - salvage cloak
         prob: 0.2
-      - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
+      - id: LunchboxCargoFilledRandom # DeltaV - Lunchboxes!
         prob: 0.3
 
 - type: entity
@@ -56,5 +56,5 @@
         prob: 0.3
       - id: ClothingNeckSalvager # DeltaV - salvage cloak
         prob: 0.2
-      - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
-        prob: 0.3
+      - id: LunchboxCargoFilledRandom # DeltaV - Lunchboxes!
+        prob: 0.3

Resources/Prototypes/Datasets/ion_storm.yml

@@ -345,9 +345,7 @@
   - NON-CREW
   - PARAMEDICS
   - PASSENGERS
-  # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
-  - LOGISTICS OFFICERS
-  # End of modified code
+  - CARGO TECHNICIANS
   # DeltaV - Epistemics Department - Replace Research Director with Mystagogue
   - MYSTAGOGUES
   # End of modified code

Resources/Prototypes/Datasets/tips.yml

@@ -48,7 +48,7 @@
   - "You can examine your headset to see which radio channels you have available and how to speak in them."
   - "As a Salvage Specialist, 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 Specialist, 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 Specialist, 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 Specialist, 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 Specialist, try asking epistemics for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!"
   - "As a Salvage Specialist, 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 Specialist, 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."

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

@@ -64,14 +64,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:

Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml

@@ -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

Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml

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

Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml

@@ -107,14 +107,14 @@
   - type: WarpPoint
     location: Epistemics
 
-#Logistics
+#Cargo
 - type: entity
-  id: WarpPointLogistics
+  id: WarpPointCargo
   parent: WarpPoint
-  suffix: Logistics
+  suffix: Cargo
   components:
   - type: WarpPoint
-    location: Logistics
+    location: Cargo
 
 - type: entity
   id: WarpPointSalvage