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/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs index 4b7291298b..48ead35c5b 100644 --- a/Content.Server/Salvage/SalvageSystem.Magnet.cs +++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs @@ -14,7 +14,7 @@ namespace Content.Server.Salvage; public sealed partial class SalvageSystem { [ValidatePrototypeId] - private const string MagnetChannel = "Supply"; + private const string MagnetChannel = "Engineering"; // ParkStation-EngineeringSalvage - Why is this hardcoded? private EntityQuery _salvMobQuery; 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/nyanotrasen/job/job-description.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl index 3b9bc86e6f..a2e0ecb761 100644 --- a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl +++ b/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. diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl index 8660d21461..6b167f0c83 100644 --- a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl +++ b/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 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/parkstation/Prototypes/job/job-supervisors.ftl b/Resources/Locale/en-US/parkstation/Prototypes/job/job-supervisors.ftl index 626e29013e..612718cd3a 100644 --- a/Resources/Locale/en-US/parkstation/Prototypes/job/job-supervisors.ftl +++ b/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 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/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml index dfcfcd10f7..23eec71746 100644 --- a/Resources/Prototypes/Access/cargo.yml +++ b/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 diff --git a/Resources/Prototypes/Access/engineering.yml b/Resources/Prototypes/Access/engineering.yml index 94901fdf7a..5baf6e781d 100644 --- a/Resources/Prototypes/Access/engineering.yml +++ b/Resources/Prototypes/Access/engineering.yml @@ -16,6 +16,7 @@ - ChiefEngineer - Engineering - Atmospherics + - Salvage - type: accessGroup id: FireFight 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/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 59a9e8d005..a479e11c61 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/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: 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/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index f94dd2638b..2eaf49c49f 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/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." diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml index 6ca3338e8d..a24136bc0b 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml +++ b/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: diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index bdb5ad85d9..d139db4019 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml index e4e1d31f89..9d99bcb5cc 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml +++ b/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 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/Entities/Objects/Misc/first_bill.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml index b7d5d99d00..9e3571c4c5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml @@ -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: quartermaster's lucky bill + description: The first bill ever earned by a Quartermaster from trading. A small chip is embedded in it. components: - type: Sprite sprite: DeltaV/Objects/Misc/first_bill.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml index 3b5329e230..bb7d7518db 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml index 53022ce236..55555157f7 100644 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml @@ -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 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/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 4af443113a..1612cb50ff 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -176,8 +176,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 diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 969d9a6fde..94b564f753 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -151,8 +151,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 diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 0aa6fc5730..0ea91a88ed 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -153,8 +153,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 diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 04a22a4f7b..f8b0356a32 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -40,7 +40,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 @@ -67,8 +67,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: diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index ca66723b2a..c799a06bd8 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -15,7 +15,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: 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/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 0bca209d51..481fe1851b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -264,7 +264,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 @@ -419,7 +419,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 diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index 22c9c622ea..39ebb89f02 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -64,8 +64,8 @@ - type: entity parent: ClothingHeadHeadHatBaseFlippable 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 @@ -82,8 +82,8 @@ - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCargosoft] id: ClothingHeadHatCargosoftFlipped - name: logistics cap # 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: Tag tags: @@ -96,8 +96,8 @@ - type: entity parent: ClothingHeadHeadHatBaseFlippable 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 @@ -109,7 +109,7 @@ - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatQMsoft] id: ClothingHeadHatQMsoftFlipped - name: logistics officer's cap + name: quartermaster's cap flipped components: - type: DropOnSlip chance: 20 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index f31b38c20c..2e99f7a411 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index efdec875e6..9f756a815a 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index e633c6c52d..c91ba8e907 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -42,8 +42,8 @@ - type: entity parent: ClothingNeckMedalBase 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 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index bb4aedcb5d..fbd61f0f09 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -491,7 +491,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 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 73dc6c8c7f..e784aee822 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -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 @@ -360,7 +360,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 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index fdc49dc061..af32fa5818 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 18266dc498..5b5865d8de 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -37,7 +37,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 @@ -331,7 +331,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 @@ -342,7 +342,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 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index d2339764f8..a63d93ac61 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -109,7 +109,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitCargo name: cargo tech jumpsuit - description: A sturdy jumpsuit, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo + description: A sturdy jumpsuit, issued to members of the Cargo department. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi @@ -664,7 +664,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQM - name: logistics officer's jumpsuit # DeltaV - Logistics Department replacing Cargo + name: quartermaster's jumpsuit description: 'What can brown do for you?' components: - type: Sprite @@ -675,7 +675,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQMTurtleneck - 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 @@ -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/Markers/Spawners/corpses.yml b/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml index 3d337b3976..079ed687a9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml @@ -38,7 +38,7 @@ - MobRandomEngineerCorpse - type: entity - name: Random Logistics Corpse Spawner # DeltaV - Logistics Department replacing Cargo + name: Random Cargo Corpse Spawner id: RandomCargoCorpseSpawner parent: SalvageHumanCorpseSpawner components: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 25514e3162..c4c93771d8 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -36,12 +36,12 @@ - type: SpawnPoint spawn_type: LateJoin -# Logistics +# Cargo - type: entity id: SpawnPointQuartermaster parent: SpawnPointJobBase - name: logistics officer # DeltaV - Logistics Department replacing Cargo + name: quartermaster components: - type: SpawnPoint job_id: Quartermaster diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index 89ab3376c6..7ec0d31755 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -31,7 +31,7 @@ - type: entity parent: SalvageHumanCorpse id: MobRandomCargoCorpse - suffix: Dead, Logistics # DeltaV - Logistics Department replacing Cargo + suffix: Dead, Cargo components: - type: Loadout prototypes: diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index e0dc4a0ad4..9b020a0387 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -82,7 +82,7 @@ - Common - Science - type: AccessReader - access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]] + access: [["Engineering"], ["Salvage"], ["Command"], ["Research"]] # Parkstation-EngineeringSalvagers - type: Inventory templateId: borgTall diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml index dfc679cd91..0a2b4f80bb 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml @@ -2,7 +2,7 @@ name: space tick id: MobTick parent: SimpleSpaceMobBase - description: It's a space tick, watch out for its nasty bite. CentCom reports that 90 percent of logistics leg amputations are due to space tick bites. # DeltaV - Logistics Department replacing Cargo + description: It's a space tick, watch out for its nasty bite. CentCom reports that 90 percent of cargo leg amputations are due to space tick bites. components: - type: InputMover - type: MobMover diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml index 736f73d915..e63c7f2e03 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml @@ -97,7 +97,7 @@ - type: entity parent: DoorRemoteDefault id: DoorRemoteCargo - name: logistics door remote # DeltaV - Logistics Department replacing Cargo + name: cargo door remote components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 49ef98d769..4f71164c41 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -29,7 +29,7 @@ - type: entity parent: EncryptionKey id: EncryptionKeyCargo - name: logistics encryption key # DeltaV - Logistics Department replacing Cargo + name: cargo encryption key description: An encryption key used by supply employees. components: - type: EncryptionKey diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index e32271f4cd..55c9ed4772 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -349,10 +349,10 @@ state: pda-chaplain - type: entity - name: logistics officer PDA # DeltaV - Logistics Department replacing Cargo + name: quartermaster PDA parent: BasePDA id: QuartermasterPDA - description: PDA for the guy that directs logistics. # DeltaV - Logistics Department replacing Cargo + description: PDA for the guy that directs Cargo. components: - type: Pda id: QuartermasterIDCard @@ -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 @@ -393,8 +393,8 @@ - type: entity parent: BasePDA id: CargoPDA - name: logistics PDA # DeltaV - Logistics Department replacing Cargo - description: PDA for the guys that order the pizzas. # DeltaV - Logistics Department replacing Cargo + name: cargo PDA + description: PDA for the guys that order the pizzas. components: - type: Pda id: CargoIDCard diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index 28d6ddea69..af05f86e5a 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-bay - type: entity parent: DefaultStationBeaconSupply diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index d8932bc0e5..a964bdd436 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -168,8 +168,8 @@ - type: entity parent: BaseFigurine id: ToyFigurineQuartermaster - name: logistics officer figure # DeltaV - Logistics Department replacing Cargo - description: A figurine depicting the glorious head of the Logistics department. # DeltaV - Logistics Department replacing Cargo + name: quartermaster figure + description: A figurine depicting the glorious leader of Cargo. components: - type: Sprite state: qm diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 0b9f00be65..4d717c6d39 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -251,7 +251,7 @@ - type: entity id: BedsheetQM parent: BedsheetBase - name: LO's bedsheet # DeltaV - Logistics Department replacing Cargo + name: QM's bedsheet components: - type: Sprite state: sheetqm diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 621fb4557d..8115f54281 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -247,7 +247,7 @@ - type: entity parent: IDCardStandard id: CargoIDCard - name: logistics ID card # DeltaV - Logistics Department replacing Cargo + name: cargo ID card components: - type: Sprite layers: @@ -279,7 +279,7 @@ - type: entity parent: IDCardStandard id: QuartermasterIDCard - name: logistics officer ID card # DeltaV - Logistics Department replacing Cargo + name: quartermaster ID card components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index e88ed48fe5..c31085381d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -159,7 +159,7 @@ state: stamp-mime - type: entity - name: logistics officer's rubber stamp # DeltaV - Logistics Department replacing Cargo + name: quartermaster's rubber stamp parent: RubberStampBase id: RubberStampQm suffix: DO NOT MAP 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/Entities/Objects/Weapons/Melee/white_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml index 123de813cb..e79f1776e6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml @@ -2,7 +2,7 @@ parent: BaseItem id: WhiteCane name: white cane - description: This isn't for you. It's for the people who can't figure out you're blind when you ask if logistics is the bar. # DeltaV - Logistics Department replacing Cargo + description: This isn't for you. It's for the people who can't figure out you're blind when you ask if Cargo is the bar. components: - type: Sprite sprite: Objects/Weapons/Melee/white_cane.rsi diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml index be286c6309..e1e55e91bd 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml @@ -40,8 +40,8 @@ - type: entity id: BannerCargo parent: BannerBase - name: logistics banner - description: A banner displaying the colors of the logistics department. Not. Cargonia. # DeltaV - Logistics Department replacing Cargo + name: cargo banner + description: A banner displaying the colors of Cargo. components: - type: Sprite sprite: Structures/Decoration/banner.rsi diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index c55b9d9554..e833b51730 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -94,7 +94,7 @@ - type: entity parent: AirlockExternal id: AirlockExternalCargoLocked - suffix: External, Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: External, Cargo, Locked components: - type: ContainerFill containers: @@ -184,7 +184,7 @@ - type: entity parent: AirlockCargo id: AirlockCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: ContainerFill containers: @@ -346,7 +346,7 @@ - type: entity parent: AirlockCommand id: AirlockQuartermasterLocked - suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo Technician, Locked components: - type: ContainerFill containers: @@ -469,7 +469,7 @@ - type: entity parent: AirlockExternalGlass id: AirlockExternalGlassCargoLocked - suffix: External, Glass, Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: External, Glass, Cargo, Locked components: - type: ContainerFill containers: @@ -568,7 +568,7 @@ - type: entity parent: AirlockCargoGlass id: AirlockCargoGlassLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: ContainerFill containers: @@ -720,7 +720,7 @@ - type: entity parent: AirlockCommandGlass id: AirlockQuartermasterGlassLocked - suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo Technician, Locked components: - type: ContainerFill containers: @@ -829,7 +829,7 @@ - type: entity parent: AirlockMaint id: AirlockMaintCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index c47ae7c215..eb66383401 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -31,12 +31,12 @@ - type: entity parent: Airlock id: AirlockCargo - suffix: Logistics # DeltaV - Logistics Department replacing Cargo + suffix: Cargo components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/cargo.rsi - type: PaintableAirlock - department: Logistics + department: Civilian - type: Wires layoutId: AirlockCargo @@ -185,12 +185,12 @@ - type: entity parent: AirlockGlass id: AirlockCargoGlass - suffix: Logistics # DeltaV - Logistics Department replacing Cargo + suffix: Cargo components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/cargo.rsi - type: PaintableAirlock - department: Logistics + department: Civilian - type: Wires layoutId: AirlockCargo diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 801bd091d0..6625c0fb3c 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -64,7 +64,7 @@ - type: entity parent: Windoor id: WindoorCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: ContainerFill containers: @@ -201,7 +201,7 @@ - type: entity parent: WindoorSecure id: WindoorSecureCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml index 2cb30277d2..81acdfad31 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml @@ -4,7 +4,7 @@ stylePaths: atmospherics: Structures/Doors/Airlocks/Standard/atmospherics.rsi basic: Structures/Doors/Airlocks/Standard/basic.rsi - cargo: Structures/Doors/Airlocks/Standard/cargo.rsi + # cargo: Structures/Doors/Airlocks/Standard/cargo.rsi command: Structures/Doors/Airlocks/Standard/command.rsi engineering: Structures/Doors/Airlocks/Standard/engineering.rsi freezer: Structures/Doors/Airlocks/Standard/freezer.rsi @@ -23,7 +23,7 @@ basic: Structures/Doors/Airlocks/Glass/basic.rsi command: Structures/Doors/Airlocks/Glass/command.rsi science: Structures/Doors/Airlocks/Glass/science.rsi - cargo: Structures/Doors/Airlocks/Glass/cargo.rsi + # cargo: Structures/Doors/Airlocks/Glass/cargo.rsi engineering: Structures/Doors/Airlocks/Glass/engineering.rsi maintenance: Structures/Doors/Airlocks/Glass/maint.rsi medical: Structures/Doors/Airlocks/Glass/medical.rsi @@ -67,7 +67,7 @@ departments: atmospherics: Engineering basic: Civilian - cargo: Logistics + # cargo: Cargo command: Command engineering: Engineering freezer: Civilian diff --git a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml index 6a2f6c810c..012a5ac9eb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml @@ -37,7 +37,7 @@ - type: IntrinsicRadioReceiver - type: ActiveRadio channels: - - Supply + - Engineering # Parkstation-EngineeringSalvagers - type: SalvageMagnet - type: ApcPowerReceiver powerLoad: 2500 # TODO change this to a HV power draw that really hits the grid hard WHEN active diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index c79cfa2641..4238cfe0d3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1799,8 +1799,8 @@ - type: entity parent: VendingMachine id: VendingMachineCargoDrobe - name: LogiDrobe # DeltaV - Logistics Department replacing Cargo - description: A highly advanced vending machine for buying logistics related clothing for free. # DeltaV - Logistics Department replacing Cargo + name: CargoDrobe + description: A highly advanced vending machine for buying cargo related clothing for free. components: - type: VendingMachine pack: CargoDrobeInventory diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index c1efc5a63f..ae897d7c3a 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -48,7 +48,7 @@ - type: entity id: LockerQuarterMaster parent: LockerBaseSecure - name: logistics officer's locker # DeltaV - Logistics Department replacing Cargo + name: quartermaster's locker components: - type: Appearance - type: EntityStorageVisuals diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml index 71635d43ad..9e5849949f 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml @@ -180,7 +180,7 @@ - type: entity id: WardrobeCargo parent: WardrobePrison - name: logistics wardrobe # DeltaV - Logistics Department replacing Cargo + name: cargo wardrobe - type: entity id: WardrobeSalvage diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index ceb9f94b58..ab090f94ec 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -364,8 +364,8 @@ - type: entity parent: BaseSign id: SignCargo - name: logistics sign # DeltaV - Logistics Department replacing Cargo - description: A sign indicating the logistics area. # DeltaV - Logistics Department replacing Cargo + name: cargo sign + description: A sign indicating the cargo area. components: - type: Sprite state: cargo 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..67c2772613 100644 --- a/Resources/Prototypes/Loadouts/backpacks.yml +++ b/Resources/Prototypes/Loadouts/backpacks.yml @@ -231,7 +231,7 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Civilian - 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..87857f2b0f 100644 --- a/Resources/Prototypes/Loadouts/duffelbags.yml +++ b/Resources/Prototypes/Loadouts/duffelbags.yml @@ -217,7 +217,7 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Civilian - 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..586ce9bd1b 100644 --- a/Resources/Prototypes/Loadouts/neck.yml +++ b/Resources/Prototypes/Loadouts/neck.yml @@ -420,7 +420,6 @@ - !type:CharacterDepartmentRequirement departments: - Civilian - - Logistics - !type:CharacterJobRequirement inverted: true jobs: diff --git a/Resources/Prototypes/Loadouts/satchels.yml b/Resources/Prototypes/Loadouts/satchels.yml index 4f21dc7656..f25e0f3376 100644 --- a/Resources/Prototypes/Loadouts/satchels.yml +++ b/Resources/Prototypes/Loadouts/satchels.yml @@ -230,7 +230,7 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Civilian - type: loadout id: LoadoutBackpackSatchelSalvage @@ -244,4 +244,4 @@ group: LoadoutBackpacks - !type:CharacterDepartmentRequirement departments: - - Logistics + - Engineering diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml index f7086081c5..d2acd9160d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml @@ -114,7 +114,7 @@ parent: PosterBase id: PosterLegitPizzaHope name: "Pizza Hope" - description: "In the darkest of times there is only one hope, PIZZA! Harass your local Logistics Officer to order an emergency crate of pizza now!" # DeltaV - Logistics Department replacing Cargo + description: "In the darkest of times there is only one hope, PIZZA! Harass your local Cargo Technician to order an emergency crate of pizza now!" components: - type: Sprite sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml index e48d44ccff..01bcb885cc 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml @@ -10,6 +10,7 @@ - Cargo - Maintenance - Mail + - Service # Parkstation-CargoService - type: startingGear id: MailCarrierGear diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 8debdbe6ec..990ceb424d 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -3,7 +3,6 @@ name: job-name-mantis description: job-description-mantis playTimeTracker: JobForensicMantis - setPreference: false # Parkstation-Playtime requirements: - !type:CharacterOverallTimeRequirement min: 18000 @@ -60,7 +59,7 @@ gloves: ClothingHandsGlovesColorWhite outerClothing: ClothingOuterCoatMantis belt: ClothingBeltMantis - # pocket2: ForensicScanner # DeltaV - Mantis is no longer a Detective + pocket2: ForensicScanner innerClothingSkirt: ClothingUniformSkirtMantis satchel: ClothingBackpackSatchelMantisFilled duffelbag: ClothingBackpackDuffelMantisFilled diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index b82178a936..82d380f8fd 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -14,7 +14,7 @@ canBeAntag: false icon: "JobIconPrisonGuard" supervisors: job-supervisors-warden - setPreference: true + setPreference: false # Parkstation- # whitelistRequired: true access: - Security diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index be716b1bfc..d8c8935e32 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -23,7 +23,7 @@ CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 SecretDocumentsStealObjective: 0.5 - LOLuckyBillStealObjective: 0.5 # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml + # LOLuckyBillStealObjective: 0.5 # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml HoPBookIanDossierStealObjective: 1 # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml HoSGunStealObjective: 0.5 StealSupermatterSliverObjective: 0.5 diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml index ab8ac25a4a..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 - logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo + cargo: "#A4610696" justice: "#6b2833DD" #DeltaV - Added Justice Department janitor: "#8c347f96" chemistry: "#fa750096" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index f79a30e5fd..9d2af82ff9 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -6,12 +6,12 @@ antagAdvantage: 2 # DeltaV - Reduced TC: External Access startingGear: CargoTechGear icon: "JobIconCargoTechnician" - supervisors: job-supervisors-qm + supervisors: job-supervisors-css access: - Cargo - Maintenance - extendedAccess: - - Salvage + # extendedAccess: # Parkstation-CargoService + # - Salvage # Parkstation-CargoService - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index e3033faf7a..6b423852a2 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -4,6 +4,7 @@ description: job-description-qm playTimeTracker: JobQuartermaster antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff + setPreference: false # Parkstation-CargoService requirements: # - !type:RoleTimeRequirement #DeltaV # role: JobCargoTechnician @@ -15,7 +16,7 @@ tracker: JobMailCarrier min: 7200 # 2 hours - !type:CharacterDepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo + department: Civilian min: 43200 #DeltaV 12 hours - !type:CharacterOverallTimeRequirement min: 144000 #40 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 91edf2de47..53fcc28b5c 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -6,15 +6,15 @@ antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Free hardsuit and weapons requirements: - !type:CharacterDepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo + department: Engineering min: 21600 #DeltaV 6 hrs # - !type:CharacterOverallTimeRequirement #DeltaV # min: 36000 #10 hrs icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear - supervisors: job-supervisors-qm + supervisors: job-supervisors-ce # Parkstation-EngineeringSalvagers access: - - Cargo + - Engineering # ParkStation-EngineeringSalvagers - Salvage - Maintenance - External @@ -26,6 +26,6 @@ back: ClothingBackpackSalvageFilled shoes: ClothingShoesBootsSalvage id: SalvagePDA - ears: ClothingHeadsetCargo + ears: ClothingHeadsetEngineering # Parkstation-EngineeringSalvagers satchel: ClothingBackpackSatchelSalvageFilled duffelbag: ClothingBackpackDuffelSalvageFilled diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 219684cc7d..929dd05c89 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -4,9 +4,6 @@ description: job-description-captain playTimeTracker: JobCaptain requirements: - - !type:CharacterDepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo - min: 18000 # DeltaV - 5 hours - !type:CharacterDepartmentTimeRequirement department: Engineering min: 18000 # DeltaV - 5 hours diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 534a890703..2e6ca36a1f 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -5,7 +5,6 @@ playTimeTracker: JobHeadOfPersonnel antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - # Parkstation-Playtime - !type:CharacterDepartmentTimeRequirement department: Engineering min: 3600 # 1 hour @@ -21,7 +20,7 @@ startingGear: HoPGear icon: "JobIconHeadOfPersonnel" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - Command @@ -51,13 +50,15 @@ - Cargo # - Atmospherics # - Medical - - Boxer # DeltaV - Add Boxer access - - Clown # DeltaV - Add Clown access - - Library # DeltaV - Add Library access - - Mime # DeltaV - Add Mime access - - Musician # DeltaV - Add Musician access - - Reporter # DeltaV - Add Reporter access - - Zookeeper # DeltaV - Add Zookeeper access + # Parkstation-Oligarchy Start + # - Boxer # DeltaV - Add Boxer access + # - Clown # DeltaV - Add Clown access + # - Library # DeltaV - Add Library access + # - Mime # DeltaV - Add Mime access + # - Musician # DeltaV - Add Musician access + # - Reporter # DeltaV - Add Reporter access + # - Zookeeper # DeltaV - Add Zookeeper access + # Parkstation-Oligarchy End special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 03879fbc46..3230277b16 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -20,7 +20,7 @@ startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 9a262d0c43..e62a0de264 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -25,7 +25,7 @@ startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - Medical diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index c9b48c75c5..a2126f58ad 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -30,7 +30,7 @@ startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - Research diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 8331806d4b..bba217abe8 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -18,7 +18,7 @@ startingGear: HoSGear icon: "JobIconHeadOfSecurity" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - HeadOfSecurity diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 18c6e912fe..6dfdec3574 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -1,12 +1,14 @@ -- type: department - id: Logistics # DeltaV - Logistics Department replacing Cargo - description: department-Cargo-description - color: "#A46106" - roles: - - CargoTechnician - - Quartermaster - - SalvageSpecialist - - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml +# Parkstation-CargoService Start +# - type: department +# id: Cargo +# description: department-Cargo-description +# color: "#A46106" +# roles: +# - CargoTechnician +# - Quartermaster +# - SalvageSpecialist +# - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml +# Parkstation-CargoService End - type: department id: Civilian @@ -21,8 +23,10 @@ # - Chaplain # DeltaV - Move Chaplain into Epistemics - Chef - Clown - - HeadOfPersonnel + # - HeadOfPersonnel # Parkstation-CSS - ChiefServiceSupervisor # Parkstation-CSS + - CargoTechnician # Parkstation-CargoService + - MailCarrier # Parkstation-CargoService - Janitor # - Lawyer # DeltaV - Move Lawyer into Justice - Mime @@ -41,7 +45,7 @@ description: department-Command-description color: "#334E6D" roles: - - Captain + # - Captain # Parkstation-Oligarchy - CentralCommandOfficial - ChiefServiceSupervisor # Parkstation-CSS - ChiefEngineer @@ -49,7 +53,7 @@ - HeadOfPersonnel - HeadOfSecurity - ResearchDirector - - Quartermaster + # - Quartermaster # Parkstation-CargoService primary: false weight: 100 @@ -63,6 +67,7 @@ - SeniorEngineer - StationEngineer - TechnicalAssistant + - SalvageSpecialist # Parkstation-EngineeringSalvagers - type: department id: Medical @@ -107,18 +112,20 @@ - Librarian - Roboticist -- type: department - id: Specific - description: department-Specific-description - color: "#9FED58" - weight: 10 - roles: - - Boxer - - Reporter - - Zookeeper - - Psychologist - - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml - - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml - - Prisoner # Nyanotrasen - Prisoner, see Resrouces/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml - - Brigmedic # DeltaV - Corpsman, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml - primary: false +# Parkstation-Oligarchy Start +#- type: department +# id: Specific +# description: department-Specific-description +# color: "#9FED58" +# weight: 10 +# roles: +# - Boxer +# - Reporter +# - Zookeeper +# - Psychologist +# - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml +# - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml +# - Prisoner # Nyanotrasen - Prisoner, see Resrouces/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +# - Brigmedic # DeltaV - Corpsman, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +# primary: false +# Parkstation-Oligarchy End 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. diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png index 1b0acdd241..48e9214ae2 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png b/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png index 7645fe9aad..c90568a350 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png differ diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging.png deleted file mode 100644 index eccd51a0ec..0000000000 Binary files a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging.png and /dev/null differ