diff --git a/.vscode/settings.json b/.vscode/settings.json index dc6e26cbea..6c707be51c 100644 --- a/.vscode/settings.json +++ b/.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 } diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index 966fb271b4..394b0d257a 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/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. diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index 9e99f5838e..6c7095a118 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/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. diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl index e2090d5af0..ead3fedcb2 100644 --- a/Resources/Locale/en-US/guidebook/guides.ftl +++ b/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 diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl index 3f89dde13a..3b72bf3b31 100644 --- a/Resources/Locale/en-US/headset/headset-component.ftl +++ b/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 diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 801e402eae..31f41d33d1 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/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. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 60ab9b0543..98856073ea 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/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 diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl index 46321f40dd..c0342efa9e 100644 --- a/Resources/Locale/en-US/job/job-supervisors.ftl +++ b/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 diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl index 778d0869b7..5c8e778cf4 100644 --- a/Resources/Locale/en-US/loadouts/categories.ftl +++ b/Resources/Locale/en-US/loadouts/categories.ftl @@ -9,7 +9,7 @@ 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 @@ -17,7 +17,7 @@ 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 diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl index dba4cf72a9..014afe869e 100644 --- a/Resources/Locale/en-US/loadouts/itemgroups.ftl +++ b/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 diff --git a/Resources/Locale/en-US/mail/mail.ftl b/Resources/Locale/en-US/mail/mail.ftl index 5a27737732..6a491e8a91 100644 --- a/Resources/Locale/en-US/mail/mail.ftl +++ b/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}) diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index e4341e7be3..c1e31149e7 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/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 diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl index fcde748213..e5265efa10 100644 --- a/Resources/Locale/en-US/prototypes/access/accesses.ftl +++ b/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 diff --git a/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl index af0a836ce9..6f6ef98b3f 100644 --- a/Resources/Locale/en-US/prototypes/entities/clothing/head/hardsuit-helmets.ftl +++ b/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 diff --git a/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl b/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl index 8232ac352d..f2c028e91c 100644 --- a/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl +++ b/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. \ No newline at end of file + .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. diff --git a/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl b/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl index fd20459b5e..109d8fa1d8 100644 --- a/Resources/Locale/en-US/station-events/events/cargo-gifts.ftl +++ b/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 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml b/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml index a2f8b035b0..868b9ff428 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index b36eab6ba9..b2622b4726 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/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: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/hardsuits.yml b/Resources/Prototypes/Catalog/Fills/Crates/hardsuits.yml index 9d6f46c499..69a9c941e0 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/hardsuits.yml +++ b/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. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 4ca95adff8..afa1277485 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/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 \ No newline at end of file + - id: LunchboxCargoFilledRandom # DeltaV - Lunchboxes! + prob: 0.3 diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index f4941b1d13..7f7ef0be3c 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml b/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml index e2fec5fa00..8284568dc3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml index c7aae33c76..29d9363515 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml @@ -282,8 +282,8 @@ - type: entity parent: LunchboxGeneric - id: LunchboxLogistics - suffix: Logistics + id: LunchboxCargo + suffix: Cargo components: - type: Sprite layers: @@ -295,8 +295,8 @@ - type: entity parent: LunchboxGenericFilledRandom - id: LunchboxLogisticsFilledRandom - suffix: Logistics, Filled, Random + id: LunchboxCargoFilledRandom + suffix: Cargo, Filled, Random components: - type: Sprite layers: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml index bd3975767b..adf1c24670 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml @@ -65,7 +65,7 @@ - type: NavMapBeacon text: station-beacon-forensic-mantis -#Logistics +#Cargo - type: entity parent: DefaultStationBeaconSupply id: DefaultStationBeaconMailroom diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index c5c5318b5d..c0eda8e217 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -1,4 +1,4 @@ -- type: entity # Logistics Officer steal objective. +- type: entity # Quartermaster steal objective. noSpawn: true parent: BaseTraitorStealObjective id: LOLuckyBillStealObjective diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 80a3046b93..ab4e951dd8 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -114,10 +114,8 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretQM - # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer - name: logistics officer's beret - description: A beret with the logistics department's insignia emblazoned on it. For logistics officers that are more inclined towards style. - # End of modified code + name: quartermaster's beret + description: A beret with the Cargo department's insignia emblazoned on it. For Quartermasters that are more inclined towards style. components: - type: Sprite sprite: Clothing/Head/Hats/beret_qm.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 608c0f09c6..a63d93ac61 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -686,10 +686,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQMFormal - # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer - name: logistics officer's formal suit - description: Inspired by the logistics officers of military's past, the perfect outfit for supplying a formal occasion. - # End of modified code + name: quartermaster's formal suit + description: Inspired by the Quartermaster of military's past, the perfect outfit for supplying a formal occasion. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index e54a8569bd..55c9ed4772 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -370,10 +370,10 @@ - MailMetricsCartridge - type: entity - name: LO special PDA unit # DeltaV - Logistics Department replacing Cargo + name: QM special PDA unit parent: BasePDA id: QuartermasterNTPDA - description: PDA for the guy that directs logistics.it says in gold "special unit unique to the best logistics officer in the sector". # DeltaV - Logistics Department replacing Cargo + description: PDA for the guy that directs Cargo. It says in gold "special unit unique to the best Quartermaster in the sector". components: - type: Pda id: QuartermasterIDCard diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index 28d6ddea69..27153e7260 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -351,19 +351,19 @@ - type: entity parent: DefaultStationBeacon id: DefaultStationBeaconSupply - suffix: Logistics #Delta V - Renamed + suffix: Cargo components: - type: NavMapBeacon - defaultText: station-beacon-logistics #Delta V - Renamed + defaultText: station-beacon-cargo color: "#A46106" - type: entity parent: DefaultStationBeaconSupply id: DefaultStationBeaconCargoReception - suffix: Logistics Reception #Delta V - Renamed + suffix: Cargo Reception components: - type: NavMapBeacon - defaultText: station-beacon-logistics-reception #Delta V - Renamed + defaultText: station-beacon-cargo-lobby - type: entity parent: DefaultStationBeaconSupply diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml index 07bdee63cf..4b81b580c0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml @@ -1,7 +1,7 @@ - type: entity id: CargoPallet name: cargo pallet - description: Common fixture of logistics and cargo. Subtle reminder where crates go during transport to avoid bruised shins. + description: Common fixture of Cargo. Subtle reminder where crates go during transport to avoid bruised shins. parent: BaseStructure components: - type: InteractionOutline diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml index 0dd45eb3f5..629e8d14f5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml @@ -68,4 +68,4 @@ jobs: - Quartermaster items: - - ClothingShoesBootsWinterLogisticsOfficer + - ClothingShoesBootsWinterQuartermaster diff --git a/Resources/Prototypes/Loadouts/backpacks.yml b/Resources/Prototypes/Loadouts/backpacks.yml index 5fd812380c..4a1c659830 100644 --- a/Resources/Prototypes/Loadouts/backpacks.yml +++ b/Resources/Prototypes/Loadouts/backpacks.yml @@ -231,7 +231,7 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Cargo - type: loadout id: LoadoutBackpackSalvage @@ -245,7 +245,7 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Engineering - type: loadout id: LoadoutBackpackMerc diff --git a/Resources/Prototypes/Loadouts/duffelbags.yml b/Resources/Prototypes/Loadouts/duffelbags.yml index 89997326f1..3ccdd3c716 100644 --- a/Resources/Prototypes/Loadouts/duffelbags.yml +++ b/Resources/Prototypes/Loadouts/duffelbags.yml @@ -217,7 +217,7 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Cargo - type: loadout id: LoadoutBackpackDuffelSalvage @@ -231,4 +231,4 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Engineering diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml index e5f1442efe..16328675da 100644 --- a/Resources/Prototypes/Loadouts/neck.yml +++ b/Resources/Prototypes/Loadouts/neck.yml @@ -420,7 +420,7 @@ - !type:CharacterDepartmentRequirement departments: - Civilian - - Logistics + - Cargo - !type:CharacterJobRequirement inverted: true jobs: diff --git a/Resources/Prototypes/Loadouts/satchels.yml b/Resources/Prototypes/Loadouts/satchels.yml index 4f21dc7656..a2fdba5e86 100644 --- a/Resources/Prototypes/Loadouts/satchels.yml +++ b/Resources/Prototypes/Loadouts/satchels.yml @@ -230,7 +230,7 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Cargo - type: loadout id: LoadoutBackpackSatchelSalvage @@ -244,4 +244,4 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Engineering diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml index d0ecb60a0a..20fdaa9249 100644 --- a/Resources/Prototypes/Palettes/departmental.yml +++ b/Resources/Prototypes/Palettes/departmental.yml @@ -9,7 +9,7 @@ security: "#DE3A3A96" bar: "#79150096" epistemics: "#D381C996" # DeltaV - Epistemics Department replacing Science - cargo: "#A4610696" # DeltaV - Logistics Department replacing Cargo + cargo: "#A4610696" justice: "#6b2833DD" #DeltaV - Added Justice Department janitor: "#8c347f96" chemistry: "#fa750096" diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml b/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml index e69220fc2a..ad171bd6b3 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml @@ -46,7 +46,7 @@ - Head of Personnel - Chief Engineer - Mystagogue - - Logistics Officer + - Quartermaster - Head of Security - Chief Medical Officer diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 45d41631c2..4e5b053166 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -82,9 +82,9 @@ - - Steal the Logistics Officer's [color=#a4885c]lucky bill[/color]. + - Steal the Quartermaster's [color=#a4885c]lucky bill[/color]. - + - Steal the Head of Personnel's [color=#a4885c]Ian Photobook[/color]. diff --git a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml index a6e95fac41..f6951cb2c5 100644 --- a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml +++ b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml @@ -1,6 +1,6 @@ - # Logistics - The supply department, more commonly known simply as Logistics, is in charge of keeping the station stocked up on necessary resources, such as fuel and raw materials. Though, they are not restricted to simple goods, and can order a wide variety of different items from off-station. The point is, it's Logistics' job to get the rest of the station what they need. + # Cargo + The supply department, more commonly known simply as Cargo, is in charge of keeping the station stocked up on necessary resources, such as fuel and raw materials. Though, they are not restricted to simple goods, and can order a wide variety of different items from off-station. The point is, it's Cargo's job to get the rest of the station what they need. ## Ordering @@ -9,7 +9,7 @@ Every transaction you make will begin at a [color=#a4885c]cargo request computer[/color], from which you can make orders for specific products. Making any order requires [color=#118C4F]spesos[/color], the currency of the station. To make an order, click the "request" button next to whatever you need, type an appropriate reason for why you're ordering it, and hit "approve" when it appears below the request list. ## Piloting - Orders are shipped to the station via the [color=#a4885c]Trade Station[/color], and then transported with the cargo shuttle, a remotely piloted shuttle that logistics uses to transport goods back and forth from the trade station. In order to move the shuttle, you must first find the [color=#a4885c]cargo shuttle computer[/color] either on the station, or the shuttle itself. + Orders are shipped to the station via the [color=#a4885c]Trade Station[/color], and then transported with the cargo shuttle, a remotely piloted shuttle that Cargo uses to transport goods back and forth from the trade station. In order to move the shuttle, you must first find the [color=#a4885c]cargo shuttle computer[/color] either on the station, or the shuttle itself. diff --git a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml index 0b0d50acf8..af858ca6d0 100644 --- a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml +++ b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml @@ -1,6 +1,6 @@ # Cargo Bounties - [textlink="Logistics" link="Cargo"] can always make money selling items whenever they feel like it. However, there are ways to make even more money by being more selective about what and when you're selling. One of these ways is [color=#a4885c]bounties[/color]. + [textlink="Cargo" link="Cargo"] can always make money selling items whenever they feel like it. However, there are ways to make even more money by being more selective about what and when you're selling. One of these ways is [color=#a4885c]bounties[/color]. diff --git a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml index 6b813ef483..b53ca32d89 100644 --- a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml +++ b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml @@ -1,7 +1,7 @@ # Salvage -Salvage is one of Logistics' key sources of income... until atmos comes along with a bajillion dollars worth of frezon. Until then though, your main job will be making them money, and totally not making a shuttle +Salvage is one of Cargo's key sources of income... until atmos comes along with a bajillion dollars worth of frezon. ## How to prepare for a salvage @@ -31,7 +31,7 @@ Internals will be important, given all species need to breathe, and space doesnt -The crusher devices are your first and last line of defense against space fauna and other things that want to bring harm to logistics personnel. While the dagger is just a standard knife, the crusher is has a special property that if you shoot something with it, then follow up with a melee attack, it deals 2x more damage. The protokinetic accelerator is like a recharging weapon that can provide thrust in the scenerio that your jetpack runs dry, or mine for you. +The crusher devices are your first and last line of defense against space fauna and other things that want to bring harm to personnel. While the dagger is just a standard knife, the crusher is has a special property that if you shoot something with it, then follow up with a melee attack, it deals 2x more damage. The protokinetic accelerator is like a recharging weapon that can provide thrust in the scenerio that your jetpack runs dry, or mine for you. diff --git a/Resources/ServerInfo/Guidebook/Chemicals.xml b/Resources/ServerInfo/Guidebook/Chemicals.xml index 0db9ebf054..e157dbb437 100644 --- a/Resources/ServerInfo/Guidebook/Chemicals.xml +++ b/Resources/ServerInfo/Guidebook/Chemicals.xml @@ -1,7 +1,7 @@  # Chemicals -Chemicals are a powerful tool that can cause a variety of effects when consumed. Some can be found in plants, purchased from logistics, or be synthesized through combination with other chemicals. +Chemicals are a powerful tool that can cause a variety of effects when consumed. Some can be found in plants, purchased from cargo, or be synthesized through combination with other chemicals. Knowing different types of chemicals and their effects is important for being able to manage injury and danger. diff --git a/Resources/ServerInfo/Guidebook/Engineering/AME.xml b/Resources/ServerInfo/Guidebook/Engineering/AME.xml index 0a96907203..4b55ce85c5 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/AME.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/AME.xml @@ -21,5 +21,5 @@ ## Upgrading the AME - You can generally only upgrade the AME by installing more cores, which can be done by ordering more AME flatpacks from [color=#a4885c]Logistics[/color]. + You can generally only upgrade the AME by installing more cores, which can be done by ordering more AME flatpacks from [color=#a4885c]Cargo[/color]. diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml index 05d8d3e97c..9c66367576 100644 --- a/Resources/ServerInfo/Guidebook/Glossary.xml +++ b/Resources/ServerInfo/Guidebook/Glossary.xml @@ -26,7 +26,7 @@ The main area of the security department. This is where prisoners are brought an Short for Captain. ## Cargonia -Reference to logistics declaring independance. Against the rules. +Reference to cargo declaring independance. Against the rules. ## CentCom/Central Command An administrative agency which oversees the Nanotrasen space station you inhabit. @@ -61,8 +61,8 @@ Short for Permanent Brig. This is for the most serious crime and means that a pr ## MG Short for Mystagogue, the head of the Epistemics Department. -## LO -Short for Logistics Officer, the head of the Logistics department. +## QM +Short for Quartermaster, the head of the Cargo department. ## Greytide/Greyshirt/Tider/Assistant Typically utilized to refer to a Passenger due to the color of their standard uniform, though this may be used to negatively refer to other crew members (not only passengers) who act unruly or commit various minor crimes. diff --git a/Resources/ServerInfo/Guidebook/Jobs.xml b/Resources/ServerInfo/Guidebook/Jobs.xml index 400e06c594..eb0f2af3b2 100644 --- a/Resources/ServerInfo/Guidebook/Jobs.xml +++ b/Resources/ServerInfo/Guidebook/Jobs.xml @@ -8,8 +8,8 @@ This department includes the janitor, passengers, clown, mime, musician, chef, b It primarily functions as folks who entertain, clean, and serve the rest of the crew, with the exception of passengers who have no particular job beyond getting lost in maintenance. -## Logistics -Logistics consists of the cargo technicians, salvage specialists, and the logistics officer. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market. +## Cargo +Cargo consists of the cargo technicians, salvage specialists, and the quartermaster. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market. For the most part, this means they scrounge around the station and assorted wrecks to find materials to sell and redistribute, and purchase materials other departments request. @@ -34,7 +34,7 @@ Engineering consists of technical assistants, station engineers, atmospheric tec Engineering is readily equipped to go safely into space, and as such they should always attempt to repair uninhabitable parts of the station. ## Command -Command consists of the captain, the head of personnel, the head of security, the chief engineer, the chief medical officer, the mystagogue, and the logistics officer. As a department it is responsible for keeping the station and its departments running efficiently. +Command consists of the captain, the head of personnel, the head of security, the chief engineer, the chief medical officer, the mystagogue, and the quartermaster. As a department it is responsible for keeping the station and its departments running efficiently. Command members should always be relatively competent in their respective departments and attempt to delegate responsibility and direct work. diff --git a/Resources/ServerInfo/Guidebook/Science/Robotics.xml b/Resources/ServerInfo/Guidebook/Science/Robotics.xml index 43e3293785..6929c51821 100644 --- a/Resources/ServerInfo/Guidebook/Science/Robotics.xml +++ b/Resources/ServerInfo/Guidebook/Science/Robotics.xml @@ -51,7 +51,7 @@ To start making a mech, print their harness in the fabricator and insert the limbs, you can [color=#a4885c]examine[/color] it to see how to proceed with construction once all limbs are in place. - Every mech requires some combination of wires, tool usage, and their own unique circuit boards to construct after the chassis has been assembled. Most mechs have two or more unique circuit boards. For example, the [color=#a4885c]Ripley[/color] mech requires a [color=#a4885c]ripley controls module[/color] board and a [color=#a4885c]ripley peripherals module[/color] board. - - Mechs require large amounts of material to create - be sure to ask your fellow scientists and logistics personnel for any materials you're missing! + - Mechs require large amounts of material to create - be sure to ask your fellow scientists and Cargo personnel for any materials you're missing! - The Vim exosuit requires a pair of borg legs and an EVA helmet, regular or syndicate, then a voice trigger and a power cell. ## Equipment diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml index 0e28557dd9..102deb922b 100644 --- a/Resources/ServerInfo/Guidebook/Science/Science.xml +++ b/Resources/ServerInfo/Guidebook/Science/Science.xml @@ -43,6 +43,6 @@ Now [color=green]Tier 3[/color] is where it gets interesting. If you research a -At a lathe, you can choose a server to allow it print whatever recipes you have unlocked. Recipes require various materials (steel, glass, plastic, gold, plasma) which can be acquired at Logistics or Salvage. +At a lathe, you can choose a server to allow it print whatever recipes you have unlocked. Recipes require various materials (steel, glass, plastic, gold, plasma) which can be acquired at Cargo or Salvage. diff --git a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml index bb9c494a0f..dd41ba11bf 100644 --- a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml +++ b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml @@ -42,7 +42,7 @@ Mopping: Fill your cart up with water, then, find some puddles! Wet your mop, an - To drain your cart, drag it (with your cursor) onto a floor drain. This will dump all the fluids inside! Floor drains can usually be found somewhere in medical, the kitchen freezer, and of course, the janitor closet. Trash: Place it in the bag directly, or hold it in your hand. Click -near- trash to scoop -all- nearby junk up, or click on each piece individually. Using the bag on a disposal will empty it. -- Logistics might want some of your trash, it might be worthwhile to check in from time to time! +- Cargo might want some of your trash, it might be worthwhile to check in from time to time! Space Cleaner: This miracle spray can do two things, clean graffiti, and in a pinch, clean up puddles! - You might be able to get more of this from chemistry.