From be5d5209fd68dc5dc8986dc53c691f70f3eabe4e Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 17 Sep 2023 15:08:21 +0200 Subject: [PATCH 01/18] Replace every Cargo with Logistics That's a lot of changes damn Might replace logitech back to cargotech --- Resources/Locale/en-US/guidebook/guides.ftl | 2 +- Resources/Locale/en-US/job/department.ftl | 2 +- Resources/Locale/en-US/job/job-names.ftl | 8 +++--- .../Locale/en-US/job/job-supervisors.ftl | 2 +- .../Locale/en-US/paper/stamp-component.ftl | 2 +- .../en-US/prototypes/access/accesses.ftl | 4 +-- .../catalog/fills/crates/cargo-crates.ftl | 2 +- .../catalog/fills/crates/fun-crates.ftl | 2 +- .../station-events/events/cargo-gifts.ftl | 4 +-- .../Catalog/Fills/Boxes/general.yml | 2 +- Resources/Prototypes/Datasets/tips.yml | 10 +++---- .../Entities/Clothing/Back/backpacks.yml | 4 +-- .../Entities/Clothing/Back/duffel.yml | 4 +-- .../Entities/Clothing/Back/satchel.yml | 4 +-- .../Entities/Clothing/Ears/headsets.yml | 4 +-- .../Entities/Clothing/Ears/headsets_alt.yml | 2 +- .../Entities/Clothing/Head/hoods.yml | 4 +-- .../Entities/Clothing/Head/soft.yml | 20 +++++++------- .../Entities/Clothing/Neck/cloaks.yml | 2 +- .../Entities/Clothing/Neck/mantles.yml | 12 ++++----- .../Entities/Clothing/Neck/medals.yml | 4 +-- .../Clothing/OuterClothing/wintercoats.yml | 4 +-- .../Entities/Clothing/Uniforms/jumpskirts.yml | 8 +++--- .../Entities/Clothing/Uniforms/jumpsuits.yml | 8 +++--- .../Entities/Markers/Spawners/corpses.yml | 2 +- .../Entities/Markers/Spawners/jobs.yml | 6 ++--- .../Entities/Mobs/Corpses/corpses.yml | 2 +- .../Entities/Mobs/NPCs/spacetick.yml | 2 +- .../Entities/Objects/Devices/door_remote.yml | 2 +- .../Objects/Devices/encryption_keys.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 8 +++--- .../Entities/Objects/Fun/figurines.yml | 26 +++++++++---------- .../Objects/Misc/identification_cards.yml | 4 +-- .../Entities/Objects/Misc/paper.yml | 2 +- .../Objects/Weapons/Melee/white_cane.yml | 3 +-- .../Structures/Decoration/banners.yml | 4 +-- .../Structures/Doors/Airlocks/access.yml | 14 +++++----- .../Structures/Doors/Airlocks/airlocks.yml | 6 ++--- .../Structures/Doors/Windoors/windoor.yml | 4 +-- .../Structures/Machines/vending_machines.yml | 4 +-- .../Storage/Closets/Lockers/lockers.yml | 2 +- .../Structures/Storage/Closets/wardrobe.yml | 2 +- .../Structures/Wallmounts/Signs/signs.yml | 4 +-- .../ServerInfo/Guidebook/Cargo/Cargo.xml | 4 +-- .../Guidebook/Cargo/CargoBounties.xml | 2 +- .../ServerInfo/Guidebook/Cargo/Salvage.xml | 4 +-- Resources/ServerInfo/Guidebook/Chemicals.xml | 2 +- Resources/ServerInfo/Guidebook/Jobs.xml | 6 ++--- .../ServerInfo/Guidebook/Science/Robotics.xml | 2 +- .../ServerInfo/Guidebook/Science/Science.xml | 2 +- .../Guidebook/Service/Janitorial.xml | 2 +- 51 files changed, 121 insertions(+), 122 deletions(-) diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl index 4fa42ecede1..a061a4b84e1 100644 --- a/Resources/Locale/en-US/guidebook/guides.ftl +++ b/Resources/Locale/en-US/guidebook/guides.ftl @@ -16,7 +16,7 @@ guide-entry-teg = Thermo-electric Generator (TEG) guide-entry-controls = Controls guide-entry-radio = Radio guide-entry-jobs = Jobs -guide-entry-cargo = Cargo +guide-entry-cargo = Logistics guide-entry-cargo-bounties = Cargo Bounties guide-entry-salvage = Salvage guide-entry-survival = Survival diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index 508a0459cf6..43f4bb1f4e4 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -1,4 +1,4 @@ -department-Cargo = Cargo +department-Cargo = Logistics department-Civilian = Civilian department-Command = Command department-Engineering = Engineering diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index a10cb0d6a68..05bcf702151 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -33,8 +33,8 @@ job-name-botanist = Botanist job-name-bartender = Bartender job-name-passenger = Passenger job-name-salvagespec = Salvage specialist -job-name-qm = Quartermaster -job-name-cargotech = Cargo Technician +job-name-qm = Head of Logistics +job-name-cargotech = Logistics Technician job-name-chef = Chef job-name-clown = Clown job-name-ertleader = ERT Leader @@ -56,7 +56,7 @@ JobBorg = Borg JobBotanist = Botanist JobBoxer = Boxer JobCaptain = Captain -JobCargoTechnician = Cargo Technician +JobCargoTechnician = Logistics Technician JobCentralCommandOfficial = Central Command Official JobChaplain = Chaplain JobChef = Chef @@ -83,7 +83,7 @@ JobMusician = Musician JobParamedic = Paramedic JobPassenger = Passenger JobPsychologist = Psychologist -JobQuartermaster = Quartermaster +JobQuartermaster = Head of Logistics JobReporter = Reporter JobResearchAssistant = Research Assistant JobResearchDirector = Research Director diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl index c8df164576f..5591e8dfa0d 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 research director -job-supervisors-qm = the quartermaster +job-supervisors-qm = the head of logistics job-supervisors-service = chefs, botanists, the bartender, and the head of personnel job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 46179663f83..25930b9dfd1 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -9,7 +9,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 = Quartermaster +stamp-component-stamped-name-qm = Head of Logistics stamp-component-stamped-name-rd = Research Director stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl index e9bf2bcb8bb..3af016aa818 100644 --- a/Resources/Locale/en-US/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl @@ -20,8 +20,8 @@ id-card-access-level-medical = Medical id-card-access-level-chemistry = Chemistry id-card-access-level-paramedic = Paramedic -id-card-access-level-quartermaster = Quartermaster -id-card-access-level-cargo = Cargo +id-card-access-level-quartermaster = Head of Logistics +id-card-access-level-cargo = Logistics id-card-access-level-salvage = Salvage id-card-access-level-bar = Bar diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/cargo-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/cargo-crates.ftl index 1be6a6cf502..a33878362d2 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/cargo-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/cargo-crates.ftl @@ -1,2 +1,2 @@ ent-CrateCargoLuxuryHardsuit = luxury mining hardsuit crate - .desc = Finally, a hardsuit Quartermasters could call their own. Centcomm has heard you, now stop asking. + .desc = Finally, a hardsuit the Head of Logistics could call their own. Centcomm has heard you, now stop asking. diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl index 27bc24853c7..b1dffadc5bf 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl @@ -26,7 +26,7 @@ ent-CrateFunBoardGames = Board game crate .desc = Game nights have been proven to either decrease boredom or increase murderous rage depending on the game. ent-CrateFunATV = ATV crate - .desc = An Absolutely Taxable Vehicle to help cargo with hauling. + .desc = An Absolutely Taxable Vehicle to help logistics with hauling. ent-CrateFunSadTromboneImplants = Sad Trombone Implants .desc = Death's never been so fun before! Implant these to make dying a bit more happy. 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 08fa099d08d..d669fbeff90 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 = Cargo Dept. +cargo-gift-default-dest = Logistics Dept. cargo-gift-dest-bar = bar cargo-gift-dest-eng = Engineering Dept -cargo-gift-dest-supp = Cargo Dept +cargo-gift-dest-supp = Logistics Dept cargo-gift-dest-janitor = Service Dept cargo-gift-dest-med = Medical Dept cargo-gift-dest-sec = Security Dept diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 46949662327..a0dbac6396c 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -300,7 +300,7 @@ - EncryptionKey - type: entity - name: cargo encryption key box + name: logistics encryption key box # DeltaV Logistics Department replacing Cargo parent: BoxEncryptionKeyPassenger id: BoxEncryptionKeyCargo components: diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index 83fc1d7d566..45d44dbe6cb 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -43,12 +43,12 @@ - "You can examine your headset to see which radio channels you have available and how to speak in them." - "As a Salvage Technician, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space." - "As a Salvage Technician, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be weary that it isn't very effective." - - "As a Salvage Technician, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology." + - "As a Salvage Technician, never forget to mine ore! Ore can be sold to logistics for a pretty penny, be used for construction, and also be used by Scientists for fancy technology." - "As a Salvage Technician, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" - - "As a Salvage Technician, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials." - - "As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner." - - "As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to." - - "As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying." + - "As a Salvage Technician, consider cooperating with the Logistics 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." + - "As a Logistics Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner." + - "As a Logistics Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to." + - "As a Logistics Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying." - "As the Bartender, you can use a circular saw on your shotgun to make it easier to store." - "As a Botanist, you can mutate and crossbreed plants together to create more potent produce that also has higher yields." - "As the Clown, spice your gimmicks up! Nobody likes a one-trick pony." diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 7277ebb10a8..ae07febfb5f 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -162,8 +162,8 @@ - type: entity parent: ClothingBackpack id: ClothingBackpackCargo - name: cargo backpack - description: A robust backpack for stealing cargo's loot. + name: logistics backpack # DeltaV Logistics Department replacing Cargo + description: A robust backpack for stealing logistics's loot. # DeltaV Logistics Department replacing Cargo 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 b9cc9ca2663..678a0dd0553 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -139,8 +139,8 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelCargo - name: cargo duffel bag - description: A large duffel bag for stealing cargo's precious loot. + 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 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 e80b0d6f8b2..1f0e9de6ca9 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -139,8 +139,8 @@ - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelCargo - name: cargo satchel - description: A robust satchel for stealing cargo's loot. + name: logistics satchel # DeltaV Logistics Department replacing Cargo + description: A robust satchel for stealing logistics's loot. # DeltaV Logistics Department replacing Cargo 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 cae6a0ea171..e88fb660f88 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -36,7 +36,7 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetCargo - name: cargo headset + name: logistics headset # DeltaV Logistics Department replacing Cargo description: A headset used by supply employees. components: - type: ContainerFill @@ -64,7 +64,7 @@ parent: ClothingHeadsetCargo id: ClothingHeadsetQM name: qm headset - description: A headset used by the quartermaster. + description: A headset used by the head of logistics. # DeltaV Logistics Department replacing Cargo 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 bff46beda2f..4c91141a4dc 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -13,7 +13,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltCargo - name: quartermaster's over-ear headset + name: head of logistics' over-ear headset # DeltaV Logistics Department replacing Cargo components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 38bfcc879dc..f1d0e266a46 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -227,7 +227,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCargo noSpawn: true - name: cargo winter coat hood + name: logistics winter coat hood # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodcargo.rsi @@ -382,7 +382,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterQM noSpawn: true - name: quartermaster's coat hood + name: head of logistics' coat hood # DeltaV Logistics Department replacing Cargo 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 a4ce85c100e..7c2e107cfb8 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -23,8 +23,8 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatCargosoft - name: cargo cap - description: "It's a baseball hat painted in Cargo colours." + name: logistics cap # DeltaV Logistics Department replacing Cargo + description: "It's a baseball hat painted in Logistics colours." # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Head/Soft/cargosoft.rsi @@ -38,8 +38,8 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatCargosoftFlipped - name: cargo cap flipped - description: "It's a baseball hat painted in Cargo colours. Flipped." + name: logistics cap flipped # DeltaV Logistics Department replacing Cargo + description: "It's a baseball hat painted in Logistics colours. Flipped." # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Head/Soft/cargosoft_flipped.rsi @@ -49,8 +49,8 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoft - name: quartermaster's cap - description: "It's a baseball hat painted in the Quartermaster's colors." + name: head of logistics' cap # DeltaV Logistics Department replacing Cargo + description: "It's a baseball hat painted in the Head of Logistics' colors." components: - type: Sprite sprite: Clothing/Head/Soft/qmsoft.rsi @@ -60,14 +60,14 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoftFlipped - name: quartermaster's cap flipped - description: "It's a baseball hat painted in the Quartermaster's colors. Flipped." + name: head of logistics' cap flipped # DeltaV Logistics Department replacing Cargo + description: "It's a baseball hat painted in the Head of Logistics' colors. Flipped." components: - type: Sprite sprite: Clothing/Head/Soft/qmsoft_flipped.rsi - type: Clothing sprite: Clothing/Head/Soft/qmsoft_flipped.rsi - + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatCorpsoft @@ -291,7 +291,7 @@ sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi - type: Clothing sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi - + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatParamedicsoft diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index e893c4b8418..2486561f92b 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -46,7 +46,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakQm - name: quartermaster's cloak + name: head of logistics' cloak # DeltaV Logistics Department replacing Cargo 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 08ea03e8d82..86cecc55cb9 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -19,7 +19,7 @@ sprite: Clothing/Neck/mantles/cemantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/cemantle.rsi - + - type: entity parent: ClothingNeckBase id: ClothingNeckMantleCMO @@ -30,7 +30,7 @@ sprite: Clothing/Neck/mantles/cmomantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/cmomantle.rsi - + - type: entity parent: ClothingNeckBase id: ClothingNeckMantleHOP @@ -41,7 +41,7 @@ sprite: Clothing/Neck/mantles/hopmantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/hopmantle.rsi - + - type: entity parent: ClothingNeckBase id: ClothingNeckMantleHOS @@ -52,14 +52,14 @@ sprite: Clothing/Neck/mantles/hosmantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/hosmantle.rsi - + - type: entity parent: ClothingNeckBase id: ClothingNeckMantleRD name: research director's mantle - 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. + 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 components: - type: Sprite sprite: Clothing/Neck/mantles/rdmantle.rsi - type: Clothing - sprite: Clothing/Neck/mantles/rdmantle.rsi + sprite: Clothing/Neck/mantles/rdmantle.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index 3ac3fb126e9..cb26ea9ed8a 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -24,8 +24,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCargomedal - name: cargo medal - description: Given for the best work in the cargo department. + name: logistics medal # DeltaV Logistics Department replacing Cargo + description: Given for the best work in the logistics department. # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Neck/Medals/cargomedal.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 9bc3d25fc49..b7acbe48bd5 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -85,7 +85,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterCargo - name: cargo winter coat + name: logistics winter coat # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi @@ -322,7 +322,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterQM - name: quartermaster's winter coat + name: head of logistics' winter coat # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 3cd0f85a151..40dab423769 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -23,8 +23,8 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtCargo - name: cargo tech jumpskirt - description: A sturdy jumpskirt, issued to members of the Cargo department. + name: logi tech jumpskirt # DeltaV Logistics Department replacing Cargo + description: A sturdy jumpskirt, issued to members of the Logistics department. # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi @@ -284,7 +284,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtQM - name: quartermaster's jumpskirt + name: head of logistics' jumpskirt # DeltaV Logistics Department replacing Cargo description: 'What can brown do for you?' components: - type: Sprite @@ -295,7 +295,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtQMTurtleneck - name: quartermasters's turtleneck + name: head of logistics' turtleneck # DeltaV Logistics Department replacing Cargo 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 d7625bbde13..ff0ae7a9871 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -74,8 +74,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCargo - name: cargo tech jumpsuit - description: A sturdy jumpsuit, issued to members of the Cargo department. + name: logi tech jumpsuit # DeltaV Logistics Department replacing Cargo + description: A sturdy jumpsuit, issued to members of the Logistics department. # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi @@ -445,7 +445,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQM - name: quartermaster's jumpsuit + name: head of logistics' jumpsuit # DeltaV Logistics Department replacing Cargo description: 'What can brown do for you?' components: - type: Sprite @@ -456,7 +456,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQMTurtleneck - name: quartermasters's turtleneck + name: head of logistics' turtleneck # DeltaV Logistics Department replacing Cargo description: A sharp turtleneck made for the hardy work environment of supply. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml b/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml index 5bd5f76c4a0..47f88ecedbb 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 Cargo Corpse Spawner + name: Random Logistics Corpse Spawner # DeltaV Logistics Department replacing Cargo id: RandomCargoCorpseSpawner parent: SalvageHumanCorpseSpawner components: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 62945a0ed88..29790532af2 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 -# Cargo +# Logistics - type: entity id: SpawnPointQuartermaster parent: SpawnPointJobBase - name: quartermaster + name: head of logistics # DeltaV Logistics Department replacing Cargo components: - type: SpawnPoint job_id: Quartermaster @@ -54,7 +54,7 @@ - type: entity id: SpawnPointCargoTechnician parent: SpawnPointJobBase - name: cargotechnician + name: logisticstechnician # DeltaV Logistics Department replacing Cargo components: - type: SpawnPoint job_id: CargoTechnician diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index c8d2f236fa1..0adf5f2b272 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -30,7 +30,7 @@ - type: entity parent: SalvageHumanCorpse id: MobRandomCargoCorpse - suffix: Dead, Cargo + suffix: Dead, Logistics # DeltaV Logistics Department replacing Cargo components: - type: Loadout prototypes: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml index 08db5857447..2bf56624979 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 cargo leg amputations are due to space tick bites. + 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 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 9ec14f6589f..ef85c255c61 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml @@ -93,7 +93,7 @@ - type: entity parent: DoorRemoteDefault id: DoorRemoteCargo - name: cargo door remote + name: logistics door remote # DeltaV Logistics Department replacing Cargo 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 dcbb5fe1126..aba313cec27 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: cargo encryption key + name: logistics encryption key # DeltaV Logistics Department replacing Cargo 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 f3886170d94..f5323322cb6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -305,10 +305,10 @@ state: pda-chaplain - type: entity - name: quartermaster PDA + name: head of logistics PDA # DeltaV Logistics Department replacing Cargo parent: BasePDA id: QuartermasterPDA - description: PDA for the guy that orders the guns. + description: PDA for the guy that directs logistics. # DeltaV Logistics Department replacing Cargo components: - type: Pda id: QuartermasterIDCard @@ -322,8 +322,8 @@ - type: entity parent: BasePDA id: CargoPDA - name: cargo PDA - description: PDA for the guys that order the pizzas. + name: logistics PDA # DeltaV Logistics Department replacing Cargo + description: PDA for the guys that order the pizzas. # DeltaV Logistics Department replacing Cargo components: - type: Pda id: CargoIDCard diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index 207a2c28ba7..f9ce0e47f61 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -26,7 +26,7 @@ components: - type: Sprite state: hop - + - type: entity parent: BaseFigurine id: ToyFigurinePassenger @@ -35,7 +35,7 @@ components: - type: Sprite state: passenger - + - type: entity parent: BaseFigurine id: ToyFigurineGreytider @@ -148,8 +148,8 @@ - type: entity parent: BaseFigurine id: ToyFigurineCargoTech - name: cargo technican figure - description: A figurine depicting a reptillian Cargo Technican. + name: logistics technican figure # DeltaV Logistics Department replacing Cargo + description: A figurine depicting a reptillian Logistics Technican. # DeltaV Logistics Department replacing Cargo components: - type: Sprite state: cargotech @@ -166,8 +166,8 @@ - type: entity parent: BaseFigurine id: ToyFigurineQuartermaster - name: quartermaster figure - description: A figurine depicting the glorious head of the Cargo department. + name: head of logistics figure # DeltaV Logistics Department replacing Cargo + description: A figurine depicting the glorious head of the Logistics department. # DeltaV Logistics Department replacing Cargo components: - type: Sprite state: qm @@ -315,7 +315,7 @@ components: - type: Sprite state: nukie - + - type: entity parent: BaseFigurine id: ToyFigurineNukieElite @@ -333,7 +333,7 @@ components: - type: Sprite state: nukie_commander - + - type: entity parent: BaseFigurine id: ToyFigurineFootsoldier @@ -342,7 +342,7 @@ components: - type: Sprite state: footsoldier - + - type: entity parent: BaseFigurine id: ToyFigurineWizard @@ -351,7 +351,7 @@ components: - type: Sprite state: wizard - + - type: entity parent: BaseFigurine id: ToyFigurineWizardFake @@ -371,7 +371,7 @@ components: - type: Sprite state: spacedragon - + - type: entity parent: BaseFigurine id: ToyFigurineQueen @@ -407,7 +407,7 @@ components: - type: Sprite state: mouse - + - type: entity parent: BaseFigurine id: ToyFigurineSlime @@ -425,7 +425,7 @@ components: - type: Sprite state: hamlet - + #TODO: Convert these to the new figurine sprite template and rename their sprite name. #Yes, these are humanoids, but they need to be updated first. diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index cca026f7d8a..967f6b8721e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -188,7 +188,7 @@ - type: entity parent: IDCardStandard id: CargoIDCard - name: cargo ID card + name: logistics ID card # DeltaV Logistics Department replacing Cargo components: - type: Sprite layers: @@ -212,7 +212,7 @@ - type: entity parent: IDCardStandard id: QuartermasterIDCard - name: quartermaster ID card + name: head of logistics ID card # DeltaV Logistics Department replacing Cargo components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 621018d7f70..35448247617 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -605,7 +605,7 @@ state: stamp-mime - type: entity - name: quartermaster's rubber stamp + name: head of logistics' rubber stamp # DeltaV Logistics Department replacing Cargo parent: RubberStampBase id: RubberStampQm suffix: DO NOT MAP diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml index f38c714c650..ed6865c801d 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 cargo is the bar. + 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 components: - type: Sprite sprite: Objects/Weapons/Melee/white_cane.rsi @@ -21,4 +21,3 @@ damage: types: Blunt: 3 - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml index cc0c90503d0..909d8305de9 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: cargo banner - description: A banner displaying the colors of the cargo department. Not. Cargonia. + name: logistics banner + description: A banner displaying the colors of the logistics department. Not. Cargonia. # DeltaV Logistics Department replacing 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 7dea7bfb53a..4d8403ca84b 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -74,7 +74,7 @@ - type: entity parent: AirlockExternal id: AirlockExternalCargoLocked - suffix: External, Cargo, Locked + suffix: External, Logistics, Locked # DeltaV Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -146,7 +146,7 @@ - type: entity parent: AirlockCargo id: AirlockCargoLocked - suffix: Cargo, Locked + suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -260,7 +260,7 @@ - type: entity parent: AirlockCommand id: AirlockQuartermasterLocked - suffix: Quartermaster, Locked + suffix: Head of Logistics, Locked # DeltaV Logistics Department replacing Cargo components: - type: AccessReader access: [["Quartermaster"]] @@ -349,7 +349,7 @@ - type: entity parent: AirlockExternalGlass id: AirlockExternalGlassCargoLocked - suffix: External, Glass, Cargo, Locked + suffix: External, Glass, Logistics, Locked # DeltaV Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -429,7 +429,7 @@ - type: entity parent: AirlockCargoGlass id: AirlockCargoGlassLocked - suffix: Cargo, Locked + suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -533,7 +533,7 @@ - type: entity parent: AirlockCommandGlass id: AirlockQuartermasterGlassLocked - suffix: Quartermaster, Locked + suffix: Head of Logistics, Locked # DeltaV Logistics Department replacing Cargo components: - type: AccessReader access: [["Quartermaster"]] @@ -622,7 +622,7 @@ - type: entity parent: AirlockMaint id: AirlockMaintCargoLocked - suffix: Cargo, Locked + suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index e729cbe6f92..e2ee00bce8a 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -27,7 +27,7 @@ - type: entity parent: Airlock id: AirlockCargo - suffix: Cargo + suffix: Logistics # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/cargo.rsi @@ -176,7 +176,7 @@ - type: entity parent: AirlockGlass id: AirlockCargoGlass - suffix: Cargo + suffix: Logistics # DeltaV Logistics Department replacing Cargo components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/cargo.rsi @@ -245,4 +245,4 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi - type: PaintableAirlock - group: Glass \ No newline at end of file + group: Glass diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 75162c022a7..8a1f3b77633 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -32,7 +32,7 @@ - type: entity parent: Windoor id: WindoorCargoLocked - suffix: Cargo, Locked + suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -114,7 +114,7 @@ - type: entity parent: WindoorSecure id: WindoorSecureCargoLocked - suffix: Cargo, Locked + suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 11dfd862b0f..d3297714c1c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1539,8 +1539,8 @@ - type: entity parent: VendingMachine id: VendingMachineCargoDrobe - name: CargoDrobe - description: A highly advanced vending machine for buying cargo related clothing for free. + 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 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 144ef91c89e..32905e1b25b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -22,7 +22,7 @@ - type: entity id: LockerQuarterMaster parent: LockerBase - name: quartermaster's locker + name: head of logistics' locker # DeltaV Logistics Department replacing Cargo 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 01e8749d9f9..6196564d6e0 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: cargo wardrobe + name: logistics wardrobe # DeltaV Logistics Department replacing Cargo - 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 2bdae980d0a..53bf2fc18dc 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -327,8 +327,8 @@ - type: entity parent: BaseSign id: SignCargo - name: cargo sign - description: A sign indicating the cargo area. + name: logistics sign # DeltaV Logistics Department replacing Cargo + description: A sign indicating the logistics area. # DeltaV Logistics Department replacing Cargo components: - type: Sprite state: cargo diff --git a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml index 9c8e89ac2a5..1c2c1375b93 100644 --- a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml +++ b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml @@ -1,6 +1,6 @@ - # 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. + # 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. ## Ordering diff --git a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml index af858ca6d08..0b0d50acf85 100644 --- a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml +++ b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml @@ -1,6 +1,6 @@ # Cargo Bounties - [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]. + [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]. diff --git a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml index 684eca10d55..41cc2af424e 100644 --- a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml +++ b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml @@ -1,7 +1,7 @@ # Salvage -Salvage is one of Cargo's 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 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 ## How to prepare for a salvage @@ -32,7 +32,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 cargo harm. While the dagger is just a standard knife, the glaive 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 logistics personnel. While the dagger is just a standard knife, the glaive 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 e157dbb4378..0db9ebf054f 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 cargo, 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 logistics, 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/Jobs.xml b/Resources/ServerInfo/Guidebook/Jobs.xml index 613a9f194b2..2729efedf7f 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. -## Cargo -Cargo consists of the cargo technicians, salvage technicians, and the quartermaster. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market. +## Logistics +Logistics consists of the cargo technicians, salvage technicians, and the head of logistics. 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 research director, and the quartermaster. 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 research director, and the head of logistics. 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 6f58b047a6e..5c1a1c68373 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 cargo personnel for any materials you're missing! + - Mechs require large amounts of material to create - be sure to ask your fellow scientists and logistics 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 a32112877fb..8a0c9f09f1e 100644 --- a/Resources/ServerInfo/Guidebook/Science/Science.xml +++ b/Resources/ServerInfo/Guidebook/Science/Science.xml @@ -41,6 +41,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 Cargo 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 Logistics or Salvage. diff --git a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml index e715fe919f7..e225c16b326 100644 --- a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml +++ b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml @@ -43,7 +43,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. -- Cargo might want some of your trash, it might be worthwhile to check in from time to time! +- Logistics 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. From 0df18d452db9e328c12cfac2425679321ff138a5 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 17 Sep 2023 17:21:39 +0200 Subject: [PATCH 02/18] logitech -> cargotech the funny was reverted --- Resources/Locale/en-US/job/job-names.ftl | 4 ++-- Resources/Prototypes/Datasets/tips.yml | 8 ++++---- .../Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml | 2 +- .../Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- Resources/Prototypes/Entities/Objects/Fun/figurines.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 05bcf702151..32194efe7c2 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -34,7 +34,7 @@ job-name-bartender = Bartender job-name-passenger = Passenger job-name-salvagespec = Salvage specialist job-name-qm = Head of Logistics -job-name-cargotech = Logistics Technician +job-name-cargotech = Cargo Technician job-name-chef = Chef job-name-clown = Clown job-name-ertleader = ERT Leader @@ -56,7 +56,7 @@ JobBorg = Borg JobBotanist = Botanist JobBoxer = Boxer JobCaptain = Captain -JobCargoTechnician = Logistics Technician +JobCargoTechnician = Cargo Technician JobCentralCommandOfficial = Central Command Official JobChaplain = Chaplain JobChef = Chef diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index 45d44dbe6cb..7217ee3eb11 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -45,10 +45,10 @@ - "As a Salvage Technician, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be weary that it isn't very effective." - "As a Salvage Technician, never forget to mine ore! Ore can be sold to logistics for a pretty penny, be used for construction, and also be used by Scientists for fancy technology." - "As a Salvage Technician, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" - - "As a Salvage Technician, consider cooperating with the Logistics 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." - - "As a Logistics Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner." - - "As a Logistics Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to." - - "As a Logistics Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying." + - "As a Salvage Technician, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials." + - "As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner." + - "As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to." + - "As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying." - "As the Bartender, you can use a circular saw on your shotgun to make it easier to store." - "As a Botanist, you can mutate and crossbreed plants together to create more potent produce that also has higher yields." - "As the Clown, spice your gimmicks up! Nobody likes a one-trick pony." diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 40dab423769..0260f66e8ef 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -23,7 +23,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtCargo - name: logi tech jumpskirt # DeltaV Logistics Department replacing Cargo + name: cargo tech jumpskirt description: A sturdy jumpskirt, issued to members of the Logistics department. # DeltaV Logistics Department replacing Cargo components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index ff0ae7a9871..97cd0f00171 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -74,7 +74,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCargo - name: logi tech jumpsuit # DeltaV Logistics Department replacing Cargo + name: cargo tech jumpsuit description: A sturdy jumpsuit, issued to members of the Logistics department. # DeltaV Logistics Department replacing Cargo components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index f9ce0e47f61..876b1b486f3 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -148,8 +148,8 @@ - type: entity parent: BaseFigurine id: ToyFigurineCargoTech - name: logistics technican figure # DeltaV Logistics Department replacing Cargo - description: A figurine depicting a reptillian Logistics Technican. # DeltaV Logistics Department replacing Cargo + name: cargo technican figure + description: A figurine depicting a reptillian Cargo Technican. components: - type: Sprite state: cargotech From 4e117e5ae55d94922b8d4b8a59a115bc6fa1b1f0 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 17 Sep 2023 19:14:03 +0200 Subject: [PATCH 03/18] Courier They do things --- .../en-US/nyanotrasen/job/job-description.ftl | 1 + .../en-US/nyanotrasen/job/job-names.ftl | 4 + .../Entities/Mobs/Corpses/corpses.yml | 1 + .../Objects/Misc/identification_cards.yml | 1 + .../Entities/Markers/Spawners/jobs.yml | 12 +++ .../Devices/Misc/identification_cards.yml | 12 +++ .../Entities/Objects/Devices/pda.yml | 27 +++++++ .../Roles/Jobs/Cargo/mail_carrier.yml | 26 +++++++ .../Nyanotrasen/Roles/play_time_trackers.yml | 2 + .../Nyanotrasen/StatusEffects/job.yml | 6 ++ .../Prototypes/Roles/Jobs/departments.yml | 1 + .../Interface/Misc/job_icons.rsi/meta.json | 14 ++++ .../Misc/job_icons.rsi/nyanoMailCarrier.png | Bin 0 -> 4915 bytes .../DeltaV/Markers/jobs.rsi/green.png | Bin 0 -> 309 bytes .../DeltaV/Markers/jobs.rsi/meta.json | 17 +++++ .../Markers/jobs.rsi/nyanomailcarrier.png | Bin 0 -> 577 bytes .../Objects/Devices/pda.rsi/equipped-BELT.png | Bin 0 -> 130 bytes .../Objects/Devices/pda.rsi/id_overlay.png | Bin 0 -> 90 bytes .../Devices/pda.rsi/insert_overlay.png | Bin 0 -> 117 bytes .../Objects/Devices/pda.rsi/light_overlay.png | Bin 0 -> 763 bytes .../DeltaV/Objects/Devices/pda.rsi/meta.json | 27 +++++++ .../Devices/pda.rsi/pda-mailcarrier.png | Bin 0 -> 6165 bytes .../Misc/id_cards.rsi/blue-inhand-left.png | Bin 0 -> 256 bytes .../Misc/id_cards.rsi/blue-inhand-right.png | Bin 0 -> 356 bytes .../Objects/Misc/id_cards.rsi/centcom.png | Bin 0 -> 409 bytes .../Misc/id_cards.rsi/default-inhand-left.png | Bin 0 -> 177 bytes .../id_cards.rsi/default-inhand-right.png | Bin 0 -> 179 bytes .../Objects/Misc/id_cards.rsi/default.png | Bin 0 -> 355 bytes .../Misc/id_cards.rsi/gold-inhand-left.png | Bin 0 -> 177 bytes .../Misc/id_cards.rsi/gold-inhand-right.png | Bin 0 -> 180 bytes .../DeltaV/Objects/Misc/id_cards.rsi/gold.png | Bin 0 -> 473 bytes .../Objects/Misc/id_cards.rsi/meta.json | 69 ++++++++++++++++++ .../Misc/id_cards.rsi/nyanomailcarrier.png | Bin 0 -> 5145 bytes .../Misc/id_cards.rsi/orange-inhand-left.png | Bin 0 -> 283 bytes .../Misc/id_cards.rsi/orange-inhand-right.png | Bin 0 -> 284 bytes .../Objects/Misc/id_cards.rsi/orange.png | Bin 0 -> 375 bytes .../Misc/id_cards.rsi/silver-inhand-left.png | Bin 0 -> 173 bytes .../Misc/id_cards.rsi/silver-inhand-right.png | Bin 0 -> 175 bytes .../Objects/Misc/id_cards.rsi/silver.png | Bin 0 -> 462 bytes 39 files changed, 220 insertions(+) create mode 100644 Resources/Locale/en-US/nyanotrasen/job/job-description.ftl create mode 100644 Resources/Locale/en-US/nyanotrasen/job/job-names.ftl create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml create mode 100644 Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/green.png create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomailcarrier.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/equipped-BELT.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/id_overlay.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/insert_overlay.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/light_overlay.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-mailcarrier.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/centcom.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver.png diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl new file mode 100644 index 00000000000..3216f848a1a --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl @@ -0,0 +1 @@ +job-description-mail-carrier = Deliver mail and other packages from and to logistics. Avoid dogs. diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl new file mode 100644 index 00000000000..f699e4c207e --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl @@ -0,0 +1,4 @@ +job-name-mail-carrier = Courier + +# Role timers +JobMailCarrier = Courier diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index 0adf5f2b272..ceca3c24008 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -36,6 +36,7 @@ prototypes: - CargoTechGear - SalvageSpecialistGear + - MailCarrierGear # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - type: entity parent: SalvageHumanCorpse diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 967f6b8721e..0e39cc10355 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -562,6 +562,7 @@ - JobIconSeniorOfficer - JobIconSeniorEngineer - JobIconSeniorResearcher + - JobIconMailCarrier # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - type: ActivatableUI key: enum.AgentIDCardUiKey.Key inHandsOnly: true diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..fe86ee8037b --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,12 @@ +- type: entity + id: SpawnPointMailCarrier + parent: SpawnPointJobBase + name: courier + components: + - type: SpawnPoint + job_id: MailCarrier + - type: Sprite + sprite: DeltaV/Markers/jobs.rsi + layers: + - state: green + - state: nyanomailcarrier diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml new file mode 100644 index 00000000000..b531d765392 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml @@ -0,0 +1,12 @@ +- type: entity + parent: IDCardStandard + id: MailCarrierIDCard + name: courier ID card # DeltaV Mail Carrier to Courier replacement + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/id_cards.rsi + layers: + - state: default + - state: nyanomailcarrier + - type: PresetIdCard + job: MailCarrier diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml new file mode 100644 index 00000000000..c36e5c61932 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml @@ -0,0 +1,27 @@ +- type: entity + parent: BasePDA + id: MailCarrierPDA + name: courier PDA # DeltaV Mail Carrier to Courier replacement + description: Smells like unopened letters. + components: + - type: Sprite + sprite: DeltaV/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false + - type: Pda + id: MailCarrierIDCard + state: pda-mailcarrier + - type: PdaBorderColor + borderColor: "#e39751" + accentVColor: "#050c4d" + - type: Icon + sprite: DeltaV/Objects/Devices/pda.rsi + state: pda-mailcarrier diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml new file mode 100644 index 00000000000..8315109a544 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml @@ -0,0 +1,26 @@ +- type: job + id: MailCarrier + name: job-name-mail-carrier + description: job-description-mail-carrier + startingGear: MailCarrierGear + playTimeTracker: JobMailCarrier + icon: "JobIconMailCarrier" + supervisors: job-supervisors-qm + access: + - Cargo + - Maintenance +# - Mail + +- type: startingGear + id: MailCarrierGear + equipment: + head: ClothingHeadMailCarrier + jumpsuit: ClothingUniformMailCarrier + back: ClothingBackpackFilled + shoes: ClothingShoesColorBlack + id: MailCarrierPDA + ears: ClothingHeadsetCargo + belt: MailBag + innerclothingskirt: ClothingUniformSkirtMailCarrier + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml b/Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml new file mode 100644 index 00000000000..cd3b7838c5f --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml @@ -0,0 +1,2 @@ +- type: playTimeTracker + id: JobMailCarrier diff --git a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml new file mode 100644 index 00000000000..1351972e1ab --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml @@ -0,0 +1,6 @@ +- type: statusIcon + parent: JobIcon + id: JobIconMailCarrier + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: nyanoMailCarrier diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index be61540c395..e73e160901c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -6,6 +6,7 @@ - CargoTechnician - Quartermaster - SalvageSpecialist + - MailCarrier # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - type: department id: Civilian diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json new file mode 100644 index 00000000000..45b09fc993c --- /dev/null +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e", + "size": { + "x": 8, + "y": 8 + }, + "states": [ + { + "name": "nyanoMailCarrier" + } + ] +} diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png new file mode 100644 index 0000000000000000000000000000000000000000..1b0acdd24122a7e5153c13c0a007ea6020cdf373 GIT binary patch literal 4915 zcmeHLYg7~079OMu0zT0Sh#G_9Gs)zgNfQJTlu#oWQVKS3nM@{efILV7iHKK(f{2LF zTCC5aP}GYQ!3S91FF>sVw_Yt)(bg9huPCA@_~=PM#dZ6~wQm2JwUU{0&bPn4_jmT$ z$z(;?yg5T$yj&m%8X^f6%fQvy_WsBbd~zlh*FcbCb&5RFEJH0MgHf+05^$1vkpU;+ zRzeLy*30D)QB^mmx;?)%?Y48_$rSI4+53-qFC8h`AD@_XK^-%3^KjYLQNLVx*;D=V zEbEv5DX8?TX}ywFCw8BV4&V2z;k9?HB@s%X0tapLm&!PUDayzHuv z*_&NVmPTMFXtx({pakv*5o5A5A>HsZ;MdyK%` z#%0jCW7|YS2G%!`7x*p}l3Gp>*H zJUuA)*p*gv(CnIulFPzlYm;BO#f)~lTyQH(k+lT7f5IyhcsOR1R{nB+%>7{B z;*9+jRv*32`gQ2K;()6geiC*h*De@Wv89U13H>ejk5b-}U6PRxmVc2LqSXyGC6@Rs zu6{H@!e7_;vF4tlxbR8B3-qQ2B^ zU)~vTA!FPY-(U;*o-}Y#2W8TU=hJGh4;Wq=^3+De&#er6Fp8b zFyMjH$)?kirl64L)MDkpqJ&9|q2$k|lkj5-Ib zFJ|n{MI<4|EvZ+1j&>dJXy~ZuF?DW7RysHoSPMN%r3V89hlsHoyH@z@oLYAB&PmKS zI{#@wTTY#Rqbt=_z*LroKRP)=S=m?{GIsaY9V0?V%=t{ZEp_6J$}@{r?vD7O>bCHi z>j`8DzOHT0pn{|1LQ=q&>C;1|o|v7RylIr{H2&(Ir%s9^Vrr&hGHje#G+;S^Y7L<0LXcpV)qrC0xS6EH zHH1z`Za;8@Od?c5^5<+REH#Mmg+y?Q5f4w9C&yCaF+@e4<>w->@&SPsH=`u0HbH0N zTZN#50$x72w@uT?Bs;_$FC<4w!$=~%5ht;zEGkS1vJ%M*vY!h{U{tC3GV$y_3NR9q z7n;omK8()U!jE5X$?~88+x6oPX(X{&59ambSg~KYH9r~Oy;0uK++e`Us{;t;H!xy z!%g}mBZdbh<2tiXe+m`$#@>)*Ot7b;!f1E`t_4sN@JfHjD`mI>+#AaKur_(`Nq)y=?g?*6YNCCgUo*BVgCNge^pM8XTPOzJhu^PyEGZaao9($5CPwCdOe?Sf~;O zn}yOT2#jzrC5EciDE=FZ3 zoWbP7Y(C5cLp}_XX?+RPY^VBl#sb>^XdOt%p}IcE^%gxd3wWFTAMH#smOgWfk^THwj+rNN6p&$q4r*p(m_P}w$U@+Ja z9A$zaS9jan0b0M&157%ZCDI_L+aHa09Ozh4-S8Mp`AEb8a_37}tV|}04dZY)>BDof njt9Es9MAF(3>zMjwg!UaJ&wPQ`BgOuz#&P{Jn;{KvFU#TktJQ_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/green.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/green.png new file mode 100644 index 0000000000000000000000000000000000000000..0becfdb0c54a42a943da2d51056a0bc22c451f37 GIT binary patch literal 309 zcmV-50m}Y~P)h6Uc+1&8LKWkAox;{xRy4*DB2-C)TMDJVqc7zy8u)O;^v^-f|X$gP>woL%N zk1*Rih5*BBnCu;009zr-H82&xT3)jaOa$=O_6&qNlzPi+6ha+JBjq&$(H}|!70wHx z4yBp$>VY^#zagUL*RW`A+J>yTRr4l(ZkS*m)?E2>`tx`LmfB@-I0Zg>00000NkvXX Hu0mjfW+Qp! literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json new file mode 100644 index 00000000000..65365adfd0b --- /dev/null +++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "green" + }, + { + "name": "nyanomailcarrier" + } + ] +} diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomailcarrier.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomailcarrier.png new file mode 100644 index 0000000000000000000000000000000000000000..f8f0a8e6c2ecf9463359a5ac0997e1315611db0c GIT binary patch literal 577 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XssnsNTy@>&-rYRK)6-K+OY6>^J9Tw+vu4dYbm)+tlK$x# z_0`qYK!vihvNNVk@lD+lY@%dj9L&qh>+kR15}n>TOfk?~iu?(&`e z?98h2G<)?aGSX#hTu+}o84?oW;Z=S%!}j={3pbYcSo$85H_X~on+DV<7_+hkXu4)e zkY6y6OB7%T`l8Uzz`&^P>Eaktacj$^+eIx3JZujnRx~Vs6?Qjx`|e!N4}a%xxVWvl zy4vfQ_y=Tr*p?B4b_ z}y<`KU2$!_lkgYesX=GHTp-VMDP5*i!p?r6(%+|Qw0 mrp=0N-n2ja&ixchU{KO&VddDq_zf_e89ZJ6T-G@yGywqmA`1Bc literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..5c8b0666f1e3113a14e613673f2a061060a1c6a7 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=o}Mm_Ar*7pUNq!lP~c%c@aq5n z7|sQXaTVE0V|J#%x>Lu2 OTn0~9KbLh*2~7Y?(Iv0| literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/light_overlay.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/light_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..286a6c32558c5afda2a6acf326230dd34fdc13a2 GIT binary patch literal 763 zcmV=f+5pjwRttMKC|^U0g2r{Lek--gBTxks?Kk z6e&_bFaV%$^9M9%odYhE{_Rr%*h|hafxZ9}?d-%r>G!QwH45Rt;teOfKKANZqu4m^ zwK`60l|r+3rLJdBgk$O%jJLn$S48F;OaUB#BSWvaR@1?{YsyPpbvB!#r6ijs3pKt3 ztsy+Wqv0hI6(<=P8Kb#pSIy7w;D79AuL&2#7>e4fD_I9Mq7p7oaWO(o|(=OeHBcJUXaE`^v5-wdzae z*^Y)xu8q73kypA$9`1fXy7qlZKHa88O_k1v!)T6i@*%_Oodo+}%=4%}9roTa+BbSu z)PO8`*MTg-U=Yi1PcxOro4Dc68ncJ3Fs9dWU=u&+<uuN|8V4XPap= t6Z}RUvWUx<`b` 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 IYlD;j4Rq3*a{vGU literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/blue-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9adcd4b6a3c02f8ac0b92c94b19bf4054a69e1f9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=$30yfLn`LHy|t0I*@34uG5*vW z2jNp1xoHXfUTLRTbP9|o%rcTxe(TzIgvG`^;@5t*i#9*!m6+TB>IH!}W<1Wp+g6<8 z7B$TYdFLtl%z544jJqb<$@Mnoi&!EVZ$Gque>8q}R>b+2%XU`gxo~b`%3AyMSJjQ5 zMdtPE{zml8**!6iQT|+e&9vDiCsy1MsQa(Hk1=p3#B?BeLgnhehFkXzd)N2aSW-L^Y)fu-ys8m*2LLG z{Ei!^WJI5v@THnLs&BKd`GWJZ)2viQWSXvJaCs}NeKN7ogTe~DWM4fzs`^A literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/centcom.png new file mode 100644 index 0000000000000000000000000000000000000000..ff1e293183ccdff0b1765165f8ee810017345b1b GIT binary patch literal 409 zcmV;K0cQS*P)Px$Q%OWYR9J;$U>F6XU=)mWz=%tNOU?E_H7)vf>o8WkSa4bHUpa?rmTzoN!6}E; zRa|Pe|Ak%iP{iKuo`j(eT@5y1W1IMv^1$g+(whFfcHz;{D4I-GM2OHw5rG0vXtt=)n^kj1L2ZLVzR( zAX|*gh9xv)i(!CJ8XzhPgkAH9%7#bIT*7dK(yA2<3=FVrjOhrX(*QAf9@!B#CVC7< z&Rimx2JjX{Fhi&T-tL}6dO-xU{KL^j3~Z7bBw6_D`3(jE>p03n02zEZx`-qP2w2CV z@NtCzP6uEsddUUf@17v7HiRmsYIQscM!_f;1-JkJK)s5YY?9$Q00000NkvXXu0mjf DNqDA$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f7848f63f6a3f7bd57aa4fd8430f34fe515f8f04 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=6`n4RAr*7p-ZJDpV8Fw2z(}(} z$nbp5(;%OhA}nvcJB!#4{Q5pY)s7FSmf^wbRj-WCcYC$QCUJ&dy?s~7@%G(cSG*;j zu7CcfzRmY+uSBA7{(&z~+t=O)DF=cRw|?Eu`Tc2Sb<0cLQu7I$uH1Dvb?qtRgW2MO Wy`l3x=dP{=sq%F7b6Mw<&;$UHibqTU literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..82b5598806de72b5cd2ed0cb65cee99adbb58df8 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Rh}-6Ar*7p-rC69V8Fw2AmW3y++4=+d%hUb*TI&yrtXKQRQ{ YXFb^-I$!GNix(h8p00i_>zopr0QOu&O#lD@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/default.png new file mode 100644 index 0000000000000000000000000000000000000000..95b3d54c270091387e888743faf2d53d147acbfd GIT binary patch literal 355 zcmV-p0i6DcP)Px$9Z5t%R9J=Wm9cGvFcgOWL>VNqSimg{q+x_BXhf<0) z@xnDt({wkl>w0q!5d|60T0SielL0c$O?EDNy6^ZxpI6?(hi zW7yW8_nOPHWEW2;%~+usE1X*Ctp|OABRonViUA=60Khr-JzvJnSOEae?HRz!sahymb5?>HQjdrpfuUY^A002ovPDHLkV1hb- Bj{X1u literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..65957acdfbb523756cec56aa66ec24a8b978a6d8 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=6`n4RAr*7p-ZJDpV8Fw2z(BJ> z$neM{t@(K`MOfZ?cNVc9`1O5)Y9238EyIshtA3sNyeKGfdW2Kx*XLOi7o5NP>x#F; z)APSy)VKMb?UhIr&Oh+wY5UsyAmu=C;?}R*Iln)xtZsR!TWUUG)0Mjpr>;F^d@x&F Wl_OAIA@SEkkSb4CKbLh*2~7YahDeM6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..96cdf6d4251b28a129cdf4d9e55b4154a4c92b0b GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=)t)YnAr*7p-rC69;=se=Q0~NN z@<=H2)o(@XMcyYS+|26BwG0Ph)B3g>+XPP9?#-EMd0zS0E7g=|7X3f+ zk6D)d&rN9Q=ojwWAh%6B2QO8mvv4FO#ovCLIwZ; literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/gold.png new file mode 100644 index 0000000000000000000000000000000000000000..bb20387315c97603a5faa585abfdaecbf3d727a0 GIT binary patch literal 473 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 a1~kO4gk_z>m$_?!Oa@O^KbLh*2~7Y>Q((IQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/orange.png new file mode 100644 index 0000000000000000000000000000000000000000..1641a8d0622650443725063db4240fa3a79b42d5 GIT binary patch literal 375 zcmV--0f_#IP)2AOZTBTc zO5^|SF>NrOF^`N8pa!5Q1c4 z8Xz{$qlX4XA@Ki2&wo;)0htZsQxpO(=P$xr5a9!`C?XUBSStuSamN3v3-t&V#l%J# zs6eY)c!}ZA%m2g|#UM?{z{f$4BnKet2U!lP4T%l`dRE7bqy2(W2aGyk#5({WzyO_; Vllsg6tu_Dv002ovPDHLkV1m2PjpzUX literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8197fa122f95cbb42ab79beb779adc493b31ad4a GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=C7v#hAr*7p-rC5^qR7MIaH_cT zdbjlNp6(S7>Qn`cStEAyd3=xnDr7hi9%@=XPkbs@^%0>}S!Lxa8Rh5KPTz3q|2)J0 zl4hpnNv*zn7;jIHUsuNrQqI7j@cLE$=GUi}zZ2Y6e&w#islak(&G6~$4f%23Dx$=W SzW??Pq{`FP&t;ucLK6Vkia%=r literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/silver-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..430322e892c2973bae407383ab33ad4b91dc1aa7 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Wu7jMAr*7p-rC4}z<`6rq5pWt z&DNurET_&cnb?#xWjEu6&$>N~K!prPx$h)G02R9J=Wm9c8VKp4mWDcya5lCuxs12_wUhzJ!rlrF)L;^0^)-TMd*K~b_u z2f>1f2!gZF)xm7_Vi!C41lPfy#CVr@!L9e3E_dJY|KIoBmjg5!&40&`EmW#Cc1fY} zXeiXWmWg}4_Qk}l`jd1`XaE2LN{_y$v-wF(saQx9Hwl5)Ys0F8iLxLy5EZ{AH^TWi z6DA=i2Z?f(B%Bs5o?{K zW?fd#06%$B4S{{BrnC7$oR0xuX}DM#Zu$(IQv!YwJ6-Q+{+v6I*oFb6C>0B_ZOBcA z@h0DRGJIJUL#0;I@57@k%Y9NR)bDFVaA%JWYwYpiUP&;H{`)}fHT(;{=yR;mXf!f@0WgiXOq!Q^WdHyG07*qoM6N<$ Ef_D4NUH||9 literal 0 HcmV?d00001 From b2976bd43ada9dba69ead075eb04e20423a86380 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 17 Sep 2023 22:17:07 +0200 Subject: [PATCH 04/18] mail bag and maildrobe --- .../advertisements/vending/maildrobe.ftl | 2 ++ .../Vending/Advertisements/maildrobe.yml | 5 ++++ .../Fills/Vending/Inventories/maildrobe.yml | 9 ++++++ .../Entities/Objects/Specific/Mail/tools.yml | 18 +++++++++++ .../Structures/Machines/vending_machines.yml | 30 +++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 Resources/Locale/en-US/nyanotrasen/advertisements/vending/maildrobe.ftl create mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml diff --git a/Resources/Locale/en-US/nyanotrasen/advertisements/vending/maildrobe.ftl b/Resources/Locale/en-US/nyanotrasen/advertisements/vending/maildrobe.ftl new file mode 100644 index 00000000000..298c7e0383e --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/advertisements/vending/maildrobe.ftl @@ -0,0 +1,2 @@ +advertisement-maildrobe-1 = Outrun any dog with our psuedo-suede duracarbon mail shorts! Limited supply! +advertisement-maildrobe-2 = Blue looks good on you! diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml new file mode 100644 index 00000000000..ae0df3d17c1 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Advertisements/maildrobe.yml @@ -0,0 +1,5 @@ +- type: advertisementsPack + id: MailDrobeAds + advertisements: + - advertisement-maildrobe-1 + - advertisement-maildrobe-2 \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml new file mode 100644 index 00000000000..579c57ced4e --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml @@ -0,0 +1,9 @@ +- type: vendingMachineInventory + id: MailDrobeInventory + startingInventory: + ClothingUniformMailCarrier: 2 + ClothingUniformSkirtMailCarrier: 2 + ClothingHeadMailCarrier: 2 + MailBag: 2 + ClothingHeadsetCargo: 2 + ClothingOuterWinterCoatMail: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml new file mode 100644 index 00000000000..8df5658a485 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml @@ -0,0 +1,18 @@ +- type: entity + name: mail bag + id: MailBag + parent: BaseStorageItem + description: Here's the mail, it never fails... + components: + - type: Sprite + sprite: Nyanotrasen/Clothing/Belt/mailbag.rsi + state: icon + - type: Clothing + sprite: Nyanotrasen/Clothing/Belt/mailbag.rsi + quickEquip: false + slots: [belt] + - type: Storage + capacity: 120 + whitelist: + components: + - Mail diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml new file mode 100644 index 00000000000..bff25bb9740 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml @@ -0,0 +1,30 @@ +- type: entity + parent: VendingMachine + id: VendingMachineMailDrobe + name: MailDrobe + description: Neither solar flares nor meteors nor plasma fire nor void of space stays these couriers from the swift completion of their appointed rounds. + components: + - type: VendingMachine + pack: MailDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for examples + - type: Advertise + pack: MailDrobeAds + - type: Sprite + sprite: Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: AccessReader + access: [["Mail"]] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#4b93ad" From 7166b8da407bc56e19eceaa180f0c8686c808dc8 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Sun, 17 Sep 2023 22:22:26 +0200 Subject: [PATCH 05/18] Mail access --- Resources/Prototypes/Access/cargo.yml | 1 + Resources/Prototypes/Access/misc.yml | 1 + Resources/Prototypes/Nyanotrasen/Access/cargo.yml | 3 +++ .../Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml | 6 +++--- .../Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml | 2 +- Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 3 ++- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/Nyanotrasen/Access/cargo.yml diff --git a/Resources/Prototypes/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml index 692726f1efe..afbac4e5d23 100644 --- a/Resources/Prototypes/Access/cargo.yml +++ b/Resources/Prototypes/Access/cargo.yml @@ -16,3 +16,4 @@ - Quartermaster - Salvage - Cargo + - Mail # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 54db7ca0437..be16a3ec6f3 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -30,3 +30,4 @@ - Chapel - Hydroponics - Atmospherics + - Mail # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml diff --git a/Resources/Prototypes/Nyanotrasen/Access/cargo.yml b/Resources/Prototypes/Nyanotrasen/Access/cargo.yml new file mode 100644 index 00000000000..6c334209159 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Access/cargo.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: Mail + name: Mail diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml index 8df5658a485..7fa75cfe11f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml @@ -13,6 +13,6 @@ slots: [belt] - type: Storage capacity: 120 - whitelist: - components: - - Mail +# whitelist: +# components: +# - Mail # Awaiting actual Mail stuff diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml index 8315109a544..0762ee304b4 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml @@ -9,7 +9,7 @@ access: - Cargo - Maintenance -# - Mail + - Mail - type: startingGear id: MailCarrierGear diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index c5d3ed554ca..9434aa29816 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -14,7 +14,7 @@ department: Cargo time: 36000 #10 hours - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 144000 #40 hrs weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" @@ -23,6 +23,7 @@ access: - Cargo - Salvage + - Mail # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - Quartermaster - Maintenance - External From e026ed05bd1adc3d1ca4ed4a9b85b79b53e442b1 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 18 Sep 2023 22:50:56 +0200 Subject: [PATCH 06/18] Update comments --- Resources/Prototypes/Access/cargo.yml | 2 +- Resources/Prototypes/Access/misc.yml | 2 +- .../Prototypes/Catalog/Fills/Boxes/general.yml | 2 +- .../Entities/Clothing/Back/backpacks.yml | 4 ++-- .../Prototypes/Entities/Clothing/Back/duffel.yml | 4 ++-- .../Prototypes/Entities/Clothing/Back/satchel.yml | 4 ++-- .../Prototypes/Entities/Clothing/Ears/headsets.yml | 2 +- .../Entities/Clothing/Ears/headsets_alt.yml | 2 +- .../Prototypes/Entities/Clothing/Head/hoods.yml | 4 ++-- .../Prototypes/Entities/Clothing/Head/soft.yml | 12 ++++++------ .../Prototypes/Entities/Clothing/Neck/cloaks.yml | 2 +- .../Prototypes/Entities/Clothing/Neck/mantles.yml | 2 +- .../Prototypes/Entities/Clothing/Neck/medals.yml | 4 ++-- .../Clothing/OuterClothing/wintercoats.yml | 4 ++-- .../Entities/Clothing/Uniforms/jumpskirts.yml | 6 +++--- .../Entities/Clothing/Uniforms/jumpsuits.yml | 6 +++--- .../Entities/Markers/Spawners/corpses.yml | 2 +- .../Prototypes/Entities/Markers/Spawners/jobs.yml | 4 ++-- .../Prototypes/Entities/Mobs/Corpses/corpses.yml | 4 ++-- .../Prototypes/Entities/Mobs/NPCs/spacetick.yml | 2 +- .../Entities/Objects/Devices/door_remote.yml | 2 +- .../Entities/Objects/Devices/encryption_keys.yml | 2 +- .../Prototypes/Entities/Objects/Devices/pda.yml | 8 ++++---- .../Prototypes/Entities/Objects/Fun/figurines.yml | 4 ++-- .../Entities/Objects/Misc/identification_cards.yml | 6 +++--- .../Prototypes/Entities/Objects/Misc/paper.yml | 2 +- .../Entities/Objects/Weapons/Melee/white_cane.yml | 2 +- .../Entities/Structures/Decoration/banners.yml | 2 +- .../Entities/Structures/Doors/Airlocks/access.yml | 14 +++++++------- .../Structures/Doors/Airlocks/airlocks.yml | 4 ++-- .../Entities/Structures/Doors/Windoors/windoor.yml | 4 ++-- .../Structures/Machines/vending_machines.yml | 4 ++-- .../Structures/Storage/Closets/Lockers/lockers.yml | 2 +- .../Structures/Storage/Closets/wardrobe.yml | 2 +- .../Entities/Structures/Wallmounts/Signs/signs.yml | 4 ++-- .../Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 2 +- Resources/Prototypes/Roles/Jobs/departments.yml | 2 +- 37 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Resources/Prototypes/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml index afbac4e5d23..5854a963658 100644 --- a/Resources/Prototypes/Access/cargo.yml +++ b/Resources/Prototypes/Access/cargo.yml @@ -16,4 +16,4 @@ - Quartermaster - Salvage - Cargo - - Mail # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml + - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index be16a3ec6f3..2bdde63854a 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -30,4 +30,4 @@ - Chapel - Hydroponics - Atmospherics - - Mail # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml + - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index a0dbac6396c..c011493cfc1 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -300,7 +300,7 @@ - EncryptionKey - type: entity - name: logistics encryption key box # DeltaV Logistics Department replacing Cargo + name: logistics encryption key box # DeltaV - Logistics Department replacing Cargo parent: BoxEncryptionKeyPassenger id: BoxEncryptionKeyCargo components: diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index ae07febfb5f..e8c61238ba1 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -162,8 +162,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: logistics backpack # DeltaV - Logistics Department replacing Cargo + description: A robust backpack for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo 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 678a0dd0553..99a23978a6e 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -139,8 +139,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: logistics duffel bag # DeltaV - Logistics Department replacing Cargo + description: A large duffel bag for stealing logistics's precious loot. # DeltaV - Logistics Department replacing Cargo 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 1f0e9de6ca9..5b72fae5d8d 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -139,8 +139,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: logistics satchel # DeltaV - Logistics Department replacing Cargo + description: A robust satchel for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo 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 e88fb660f88..e1a997f2359 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -36,7 +36,7 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetCargo - name: logistics headset # DeltaV Logistics Department replacing Cargo + name: logistics headset # - Department replacing Cargo description: A headset used by supply employees. components: - type: ContainerFill diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 4c91141a4dc..2f7a33fbd2e 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -13,7 +13,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltCargo - name: head of logistics' over-ear headset # DeltaV Logistics Department replacing Cargo + name: head of logistics' over-ear headset # DeltaV - Logistics Department replacing Cargo components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index f1d0e266a46..290949a1bdf 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -227,7 +227,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCargo noSpawn: true - name: logistics winter coat hood # DeltaV Logistics Department replacing Cargo + name: logistics winter coat hood # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodcargo.rsi @@ -382,7 +382,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterQM noSpawn: true - name: head of logistics' coat hood # DeltaV Logistics Department replacing Cargo + name: head of logistics' coat hood # DeltaV - Logistics Department replacing Cargo 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 7c2e107cfb8..30664d00b30 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -23,8 +23,8 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatCargosoft - name: logistics cap # DeltaV Logistics Department replacing Cargo - description: "It's a baseball hat painted in Logistics colours." # DeltaV Logistics Department replacing Cargo + name: logistics cap # DeltaV - Logistics Department replacing Cargo + description: "It's a baseball hat painted in Logistics colours." # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Head/Soft/cargosoft.rsi @@ -38,8 +38,8 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatCargosoftFlipped - name: logistics cap flipped # DeltaV Logistics Department replacing Cargo - description: "It's a baseball hat painted in Logistics colours. Flipped." # DeltaV Logistics Department replacing Cargo + name: logistics cap flipped # DeltaV - Logistics Department replacing Cargo + description: "It's a baseball hat painted in Logistics colours. Flipped." # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Head/Soft/cargosoft_flipped.rsi @@ -49,7 +49,7 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoft - name: head of logistics' cap # DeltaV Logistics Department replacing Cargo + name: head of logistics' cap # DeltaV - Logistics Department replacing Cargo description: "It's a baseball hat painted in the Head of Logistics' colors." components: - type: Sprite @@ -60,7 +60,7 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoftFlipped - name: head of logistics' cap flipped # DeltaV Logistics Department replacing Cargo + name: head of logistics' cap flipped # DeltaV - Logistics Department replacing Cargo description: "It's a baseball hat painted in the Head of Logistics' colors. Flipped." components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 2486561f92b..f1296f657e1 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -46,7 +46,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakQm - name: head of logistics' cloak # DeltaV Logistics Department replacing Cargo + name: head of logistics' cloak # DeltaV - Logistics Department replacing Cargo 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 86cecc55cb9..cb8e283859c 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: research director's mantle - 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 logistics; this mantle will keep you comfy. # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Neck/mantles/rdmantle.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index cb26ea9ed8a..36398ac3c21 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -24,8 +24,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCargomedal - name: logistics medal # DeltaV Logistics Department replacing Cargo - description: Given for the best work in the logistics department. # DeltaV Logistics Department replacing Cargo + name: logistics medal # DeltaV - Logistics Department replacing Cargo + description: Given for the best work in the logistics department. # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Neck/Medals/cargomedal.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index b7acbe48bd5..45d2f17d7c5 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -85,7 +85,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterCargo - name: logistics winter coat # DeltaV Logistics Department replacing Cargo + name: logistics winter coat # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi @@ -322,7 +322,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterQM - name: head of logistics' winter coat # DeltaV Logistics Department replacing Cargo + name: head of logistics' winter coat # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 0260f66e8ef..9a52bb24eff 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -24,7 +24,7 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtCargo name: cargo tech jumpskirt - description: A sturdy jumpskirt, issued to members of the Logistics department. # DeltaV Logistics Department replacing Cargo + description: A sturdy jumpskirt, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi @@ -284,7 +284,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtQM - name: head of logistics' jumpskirt # DeltaV Logistics Department replacing Cargo + name: head of logistics' jumpskirt # DeltaV - Logistics Department replacing Cargo description: 'What can brown do for you?' components: - type: Sprite @@ -295,7 +295,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtQMTurtleneck - name: head of logistics' turtleneck # DeltaV Logistics Department replacing Cargo + name: head of logistics' turtleneck # DeltaV - Logistics Department replacing Cargo 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 97cd0f00171..35added3a62 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -75,7 +75,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 Logistics department. # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi @@ -445,7 +445,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQM - name: head of logistics' jumpsuit # DeltaV Logistics Department replacing Cargo + name: head of logistics' jumpsuit # DeltaV - Logistics Department replacing Cargo description: 'What can brown do for you?' components: - type: Sprite @@ -456,7 +456,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQMTurtleneck - name: head of logistics' turtleneck # DeltaV Logistics Department replacing Cargo + name: head of logistics' turtleneck # DeltaV - Logistics Department replacing Cargo description: A sharp turtleneck made for the hardy work environment of supply. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml b/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml index 47f88ecedbb..a630cbed10b 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 Logistics Corpse Spawner # DeltaV - Logistics Department replacing Cargo id: RandomCargoCorpseSpawner parent: SalvageHumanCorpseSpawner components: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 29790532af2..6fd9ffea9b9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -41,7 +41,7 @@ - type: entity id: SpawnPointQuartermaster parent: SpawnPointJobBase - name: head of logistics # DeltaV Logistics Department replacing Cargo + name: head of logistics # DeltaV - Logistics Department replacing Cargo components: - type: SpawnPoint job_id: Quartermaster @@ -54,7 +54,7 @@ - type: entity id: SpawnPointCargoTechnician parent: SpawnPointJobBase - name: logisticstechnician # DeltaV Logistics Department replacing Cargo + name: logisticstechnician # DeltaV - Logistics Department replacing Cargo components: - type: SpawnPoint job_id: CargoTechnician diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index ceca3c24008..05bc5710214 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -30,13 +30,13 @@ - type: entity parent: SalvageHumanCorpse id: MobRandomCargoCorpse - suffix: Dead, Logistics # DeltaV Logistics Department replacing Cargo + suffix: Dead, Logistics # DeltaV - Logistics Department replacing Cargo components: - type: Loadout prototypes: - CargoTechGear - SalvageSpecialistGear - - MailCarrierGear # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml + - MailCarrierGear # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - type: entity parent: SalvageHumanCorpse diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml index 2bf56624979..3285f653f01 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 logistics leg amputations are due to space tick bites. # DeltaV - Logistics Department replacing Cargo 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 ef85c255c61..83ef7f846f4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml @@ -93,7 +93,7 @@ - type: entity parent: DoorRemoteDefault id: DoorRemoteCargo - name: logistics door remote # DeltaV Logistics Department replacing Cargo + name: logistics door remote # DeltaV - Logistics Department replacing Cargo 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 aba313cec27..b8f710e3156 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: logistics encryption key # DeltaV - Logistics Department replacing Cargo 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 f5323322cb6..af92babab53 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -305,10 +305,10 @@ state: pda-chaplain - type: entity - name: head of logistics PDA # DeltaV Logistics Department replacing Cargo + name: head of logistics PDA # DeltaV - Logistics Department replacing Cargo parent: BasePDA id: QuartermasterPDA - description: PDA for the guy that directs logistics. # DeltaV Logistics Department replacing Cargo + description: PDA for the guy that directs logistics. # DeltaV - Logistics Department replacing Cargo components: - type: Pda id: QuartermasterIDCard @@ -322,8 +322,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: logistics PDA # DeltaV - Logistics Department replacing Cargo + description: PDA for the guys that order the pizzas. # DeltaV - Logistics Department replacing Cargo components: - type: Pda id: CargoIDCard diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index 876b1b486f3..bcd70802769 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -166,8 +166,8 @@ - type: entity parent: BaseFigurine id: ToyFigurineQuartermaster - name: head of logistics figure # DeltaV Logistics Department replacing Cargo - description: A figurine depicting the glorious head of the Logistics department. # DeltaV Logistics Department replacing Cargo + name: head of logistics figure # DeltaV - Logistics Department replacing Cargo + description: A figurine depicting the glorious head of the Logistics department. # DeltaV - Logistics Department replacing Cargo components: - type: Sprite state: qm diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 0e39cc10355..e8b33628663 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -188,7 +188,7 @@ - type: entity parent: IDCardStandard id: CargoIDCard - name: logistics ID card # DeltaV Logistics Department replacing Cargo + name: logistics ID card # DeltaV - Logistics Department replacing Cargo components: - type: Sprite layers: @@ -212,7 +212,7 @@ - type: entity parent: IDCardStandard id: QuartermasterIDCard - name: head of logistics ID card # DeltaV Logistics Department replacing Cargo + name: head of logistics ID card # DeltaV - Logistics Department replacing Cargo components: - type: Sprite layers: @@ -562,7 +562,7 @@ - JobIconSeniorOfficer - JobIconSeniorEngineer - JobIconSeniorResearcher - - JobIconMailCarrier # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml + - JobIconMailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - type: ActivatableUI key: enum.AgentIDCardUiKey.Key inHandsOnly: true diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 35448247617..14d0df85e13 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -605,7 +605,7 @@ state: stamp-mime - type: entity - name: head of logistics' rubber stamp # DeltaV Logistics Department replacing Cargo + name: head of logistics' rubber stamp # DeltaV - Logistics Department replacing Cargo parent: RubberStampBase id: RubberStampQm suffix: DO NOT MAP diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml index ed6865c801d..5b554c2bb91 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 logistics is the bar. # DeltaV - Logistics Department replacing Cargo 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 909d8305de9..4198c08b63c 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml @@ -41,7 +41,7 @@ id: BannerCargo parent: BannerBase name: logistics banner - description: A banner displaying the colors of the logistics department. Not. Cargonia. # DeltaV Logistics Department replacing Cargo + description: A banner displaying the colors of the logistics department. Not. Cargonia. # DeltaV - Logistics Department replacing 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 4d8403ca84b..5031e216c44 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -74,7 +74,7 @@ - type: entity parent: AirlockExternal id: AirlockExternalCargoLocked - suffix: External, Logistics, Locked # DeltaV Logistics Department replacing Cargo + suffix: External, Logistics, Locked # DeltaV - Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -146,7 +146,7 @@ - type: entity parent: AirlockCargo id: AirlockCargoLocked - suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo + suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -260,7 +260,7 @@ - type: entity parent: AirlockCommand id: AirlockQuartermasterLocked - suffix: Head of Logistics, Locked # DeltaV Logistics Department replacing Cargo + suffix: Head of Logistics, Locked # DeltaV - Logistics Department replacing Cargo components: - type: AccessReader access: [["Quartermaster"]] @@ -349,7 +349,7 @@ - type: entity parent: AirlockExternalGlass id: AirlockExternalGlassCargoLocked - suffix: External, Glass, Logistics, Locked # DeltaV Logistics Department replacing Cargo + suffix: External, Glass, Logistics, Locked # DeltaV - Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -429,7 +429,7 @@ - type: entity parent: AirlockCargoGlass id: AirlockCargoGlassLocked - suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo + suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -533,7 +533,7 @@ - type: entity parent: AirlockCommandGlass id: AirlockQuartermasterGlassLocked - suffix: Head of Logistics, Locked # DeltaV Logistics Department replacing Cargo + suffix: Head of Logistics, Locked # DeltaV - Logistics Department replacing Cargo components: - type: AccessReader access: [["Quartermaster"]] @@ -622,7 +622,7 @@ - type: entity parent: AirlockMaint id: AirlockMaintCargoLocked - suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo + suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index e2ee00bce8a..0adcc502937 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -27,7 +27,7 @@ - type: entity parent: Airlock id: AirlockCargo - suffix: Logistics # DeltaV Logistics Department replacing Cargo + suffix: Logistics # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/cargo.rsi @@ -176,7 +176,7 @@ - type: entity parent: AirlockGlass id: AirlockCargoGlass - suffix: Logistics # DeltaV Logistics Department replacing Cargo + suffix: Logistics # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/cargo.rsi diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 8a1f3b77633..dfa7dece81f 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -32,7 +32,7 @@ - type: entity parent: Windoor id: WindoorCargoLocked - suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo + suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] @@ -114,7 +114,7 @@ - type: entity parent: WindoorSecure id: WindoorSecureCargoLocked - suffix: Logistics, Locked # DeltaV Logistics Department replacing Cargo + suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo components: - type: AccessReader access: [["Cargo"]] diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index d3297714c1c..6de6ebafbc3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1539,8 +1539,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: LogiDrobe # DeltaV - Logistics Department replacing Cargo + description: A highly advanced vending machine for buying logistics related clothing for free. # DeltaV - Logistics Department replacing Cargo 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 32905e1b25b..798a5422158 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -22,7 +22,7 @@ - type: entity id: LockerQuarterMaster parent: LockerBase - name: head of logistics' locker # DeltaV Logistics Department replacing Cargo + name: head of logistics' locker # DeltaV - Logistics Department replacing Cargo 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 6196564d6e0..a7765c51ec9 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: logistics wardrobe # DeltaV - Logistics Department replacing Cargo - 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 53bf2fc18dc..deea2559a16 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -327,8 +327,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: logistics sign # DeltaV - Logistics Department replacing Cargo + description: A sign indicating the logistics area. # DeltaV - Logistics Department replacing Cargo components: - type: Sprite state: cargo diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 9434aa29816..c1eef300abc 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -23,7 +23,7 @@ access: - Cargo - Salvage - - Mail # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml + - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - Quartermaster - Maintenance - External diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index e73e160901c..23054913f65 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -6,7 +6,7 @@ - CargoTechnician - Quartermaster - SalvageSpecialist - - MailCarrier # Nyanotrasen MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml + - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - type: department id: Civilian From 5fa2786e53429bd7d3c50134627666e7de02a2e7 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 18 Sep 2023 22:57:26 +0200 Subject: [PATCH 07/18] Forgot about them --- Resources/Prototypes/Entities/Clothing/Ears/headsets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index e1a997f2359..a01d16a636c 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -36,7 +36,7 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetCargo - name: logistics headset # - Department replacing Cargo + name: logistics headset # DeltaV - Logistics Department replacing Cargo description: A headset used by supply employees. components: - type: ContainerFill @@ -64,7 +64,7 @@ parent: ClothingHeadsetCargo id: ClothingHeadsetQM name: qm headset - description: A headset used by the head of logistics. # DeltaV Logistics Department replacing Cargo + description: A headset used by the head of logistics. # DeltaV - Logistics Department replacing Cargo components: - type: ContainerFill containers: From d2a289e57c435be09b74abbb30c9e2b5c9113f21 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 19 Sep 2023 17:04:40 +0200 Subject: [PATCH 08/18] MailDrobe textures --- .../VendingMachines/maildrobe.rsi/broken.png | Bin 0 -> 1273 bytes .../VendingMachines/maildrobe.rsi/meta.json | 31 ++++++++++++++++++ .../maildrobe.rsi/normal-unshaded.png | Bin 0 -> 8381 bytes .../VendingMachines/maildrobe.rsi/off.png | Bin 0 -> 992 bytes .../VendingMachines/maildrobe.rsi/panel.png | Bin 0 -> 681 bytes 5 files changed, 31 insertions(+) create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/broken.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/meta.json create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/off.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/panel.png diff --git a/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/broken.png b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..954a82c984d26f089bb0346f2c081ba1001826ac GIT binary patch literal 1273 zcmVEX>4Tx04R}tkv&MmP!xqvQ>CI+hh`9Q$WWauh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRnoci*4YujVWU_$1;vW|%hd2Jy_M zZE)Tv7FkhNiO-40O}ZfQBi9v|-#8bVEbvUxOeg1wMPjMY!Ab|SqNx#26Ngnzr+gvf zvdVdjvsSLM);;+PgE@UA#dTUEh+zqFBp^XS6(y8mBSO1QiiISdM?L(*O@D%13b{&P z_CX>@2HM@dakSAh-}0008eNklW!pgm)i5v2b~mG8mLIGcz;PA6px=NTbo9 zUavF#>?NCw0HC!VSoGeFy8z72&%xqW_+M*Hr_-U`Ztt2``xl$#Zp3tCc}Mi`!uvq2 zOwi_0&2(gUExzBv9!K^P?Adx8w0P+T&V08lcOz!!=l*EopcoqDf<~jk+S(f1+uIBe z4~KXCzk4w#w%KgbZnw+3z&QtiF@|$jmNKf&QH9SFi2g1wL5_0YFg{XsyYzj6Ba7A0J04MUo^KW3blJ zYPIM-ALHTUucWVzAIyf%Ii!>*r6`I50BbE;Yw|n~#p5_8%Q65)PoMgoeY`pwT5HL& z3?T&0xlq(I2N)Y017Pd@2VUMkMttGh!4D#13`vq8rNlWG6zPRm#&1)l3Rr82<2V%V zFCND+X_|)E$`$Bkrj!C8%d+sCrYTa&(1et-S_QP$6h*OvsdJ7rO+#aTtBf%?=c-qr zUv6)=-s$&qV2n8&7kG>Lp;Jl)>9y8D4Qp++3i!eD4)Css<2b0|UE)!>0^R|>s4->- zbHDcEyZNwQ-;gb-M3_oP6ngQyq%_ESocWm#|tz{T>ruq&+S6)J!l|jLQgJIQE7dB{>2|3{5!u_frP-HNtW*Q*8#(J6IfsE- jnfu^jqV~5F@V~%MbtQMuH_y>%00000NkvXXu0mjfmSaT+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/meta.json b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/meta.json new file mode 100644 index 00000000000..6064e8eee3f --- /dev/null +++ b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Hyenh#6078", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.5, + 0.1, + 1.5, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/normal-unshaded.png b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..635e482346f5e84b374fba8dfdf72a1af9a92646 GIT binary patch literal 8381 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/off.png b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..754bbb96c660c1a98b42a9c5fa1dfdcaff42cc27 GIT binary patch literal 992 zcmV<610Vc}P)EX>4Tx04R}tkv&MmP!xqvQ>CI+hh`9Q$WWauh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRnoci*4YujVWU_$1;vW|%hd2Jy_M zZE)Tv7FkhNiO-40O}ZfQBi9v|-#8bVEbvUxOeg1wMPjMY!Ab|SqNx#26Ngnzr+gvf zvdVdjvsSLM);;+PgE@UA#dTUEh+zqFBp^XS6(y8mBSO1QiiISdM?L(*O@D%13b{&P z_CX>@2HM@dakSAh-}0005ENkly-UMD7{-5!RKZakY$(;CItVv7s1yY! z2UG0asiM-otBRk0K*2GHAFECk9o!V9AleF{4w^wrNOW-&w2Kb4MM|sJ8ZAhk>2mje zJon_@ySIr7NF)+(#c_PopueY^>$`gr(*a~q%_km@HY?hD)H~1X{jY)HIFpE)!qpE5n_IZ__mK`Fs`ai)%B305>QvCYq+9 zs%mWnve_&Eu~>|u*&X`Z3MF;E5tZ82(Ckj33?EuKUyG7TrAjetQeYya(g8d^LI*Gr z+La3EyE9cFll-%tadXSbdK*)t&p)ezdf~VNwZc`vRlrriRbXsjgt38ta5 z$}X8qI;((X+bCWymlqe(yO&i=ia`1*L;5Q7_h;a%X7bkwRBNOE9o_-cK&pjKWvnRx O0000EX>4Tx04R}tkv&MmP!xqvQ>CI+hh`9Q$WWauh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRnoci*4YujVWU_$1;vW|%hd2Jy_M zZE)Tv7FkhNiO-40O}ZfQBi9v|-#8bVEbvUxOeg1wMPjMY!Ab|SqNx#26Ngnzr+gvf zvdVdjvsSLM);;+PgE@UA#dTUEh+zqFBp^XS6(y8mBSO1QiiISdM?L(*O@D%13b{&P z_CX>@2HM@dakSAh-}0001hNklR9;3>ax)=;XB6)+Q2%S5Z7%_?AKxWivMa1NL@ z;V*;A$8LsMXN~Fa09{>OhWqtG3{Fl?1Cz368XNx~@a#1x95D(;!H@s|M4cKEMOT3J P00000NkvXXu0mjf?`akP literal 0 HcmV?d00001 From cc0c15925b98ec1232e0d95e63f4509d7e355355 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 19 Sep 2023 17:25:13 +0200 Subject: [PATCH 09/18] Mailbag fix attempt 1 :clueless: --- .../Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml index 7fa75cfe11f..c934f181c5c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml @@ -10,9 +10,13 @@ - type: Clothing sprite: Nyanotrasen/Clothing/Belt/mailbag.rsi quickEquip: false - slots: [belt] + slots: + - belt + - type: Item + size: 121 - type: Storage capacity: 120 + quickInsert: true # whitelist: # components: # - Mail # Awaiting actual Mail stuff From fa4feb6675160075369675a63299974cf4efb6f0 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:46:54 -0500 Subject: [PATCH 10/18] Update headsets_alt.yml grammar check Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 2f7a33fbd2e..aec26e93907 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -13,7 +13,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltCargo - name: head of logistics' over-ear headset # DeltaV - Logistics Department replacing Cargo + name: head of logistics's over-ear headset # DeltaV - Logistics Department replacing Cargo components: - type: ContainerFill containers: From 1d5665abac5b223bf235934548ec3530c1d07fce Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:47:44 -0500 Subject: [PATCH 11/18] Update hoods.yml grammar check Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Head/hoods.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 290949a1bdf..ab9926be8f2 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -382,7 +382,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterQM noSpawn: true - name: head of logistics' coat hood # DeltaV - Logistics Department replacing Cargo + name: head of logistics's coat hood # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodqm.rsi From a6142b7b29ae1bd6e4c8274d99eb12b953c5abfb Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:48:56 -0500 Subject: [PATCH 12/18] Update soft.yml grammar check Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Head/soft.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index 30664d00b30..19eef0c9692 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -49,7 +49,7 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoft - name: head of logistics' cap # DeltaV - Logistics Department replacing Cargo + name: head of logistics's cap # DeltaV - Logistics Department replacing Cargo description: "It's a baseball hat painted in the Head of Logistics' colors." components: - type: Sprite @@ -60,7 +60,7 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoftFlipped - name: head of logistics' cap flipped # DeltaV - Logistics Department replacing Cargo + name: head of logistics's cap flipped # DeltaV - Logistics Department replacing Cargo description: "It's a baseball hat painted in the Head of Logistics' colors. Flipped." components: - type: Sprite From 9d95d51a63555ac7486c44b2184ed475352d4cf9 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:49:22 -0500 Subject: [PATCH 13/18] Update cloaks.yml what do you think Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index f1296f657e1..f7edc5db657 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -46,7 +46,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakQm - name: head of logistics' cloak # DeltaV - Logistics Department replacing Cargo + name: head of logistics's cloak # DeltaV - Logistics Department replacing Cargo description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills. components: - type: Sprite From fb500f20ca127fa958869793356fc422c51d25b1 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:53:58 -0500 Subject: [PATCH 14/18] Revert "Update cloaks.yml" This reverts commit 9d95d51a63555ac7486c44b2184ed475352d4cf9. --- Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index f7edc5db657..f1296f657e1 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -46,7 +46,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakQm - name: head of logistics's cloak # DeltaV - Logistics Department replacing Cargo + name: head of logistics' cloak # DeltaV - Logistics Department replacing Cargo description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills. components: - type: Sprite From 6bdb680902732d310fe56ce8736191aa10aaafc6 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:54:16 -0500 Subject: [PATCH 15/18] Revert "Update soft.yml" This reverts commit a6142b7b29ae1bd6e4c8274d99eb12b953c5abfb. --- Resources/Prototypes/Entities/Clothing/Head/soft.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index 19eef0c9692..30664d00b30 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -49,7 +49,7 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoft - name: head of logistics's cap # DeltaV - Logistics Department replacing Cargo + name: head of logistics' cap # DeltaV - Logistics Department replacing Cargo description: "It's a baseball hat painted in the Head of Logistics' colors." components: - type: Sprite @@ -60,7 +60,7 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoftFlipped - name: head of logistics's cap flipped # DeltaV - Logistics Department replacing Cargo + name: head of logistics' cap flipped # DeltaV - Logistics Department replacing Cargo description: "It's a baseball hat painted in the Head of Logistics' colors. Flipped." components: - type: Sprite From 7d1ba139bbd04aa65154b5d7217b7349e58921ed Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:54:23 -0500 Subject: [PATCH 16/18] Revert "Update hoods.yml" This reverts commit 1d5665abac5b223bf235934548ec3530c1d07fce. --- Resources/Prototypes/Entities/Clothing/Head/hoods.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index ab9926be8f2..290949a1bdf 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -382,7 +382,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterQM noSpawn: true - name: head of logistics's coat hood # DeltaV - Logistics Department replacing Cargo + name: head of logistics' coat hood # DeltaV - Logistics Department replacing Cargo components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodqm.rsi From bd18f007db3b0d149ab07685fb9b18e1fc09decf Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:54:28 -0500 Subject: [PATCH 17/18] Revert "Update headsets_alt.yml" This reverts commit fa4feb6675160075369675a63299974cf4efb6f0. --- Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index aec26e93907..2f7a33fbd2e 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -13,7 +13,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltCargo - name: head of logistics's over-ear headset # DeltaV - Logistics Department replacing Cargo + name: head of logistics' over-ear headset # DeltaV - Logistics Department replacing Cargo components: - type: ContainerFill containers: From 6737cc075e429535ab4d393b6a0b4420568ff1fa Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Wed, 20 Sep 2023 23:19:07 -0500 Subject: [PATCH 18/18] Update jobs.yml small reversion Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/Prototypes/Entities/Markers/Spawners/jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 6fd9ffea9b9..5d948443757 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -54,7 +54,7 @@ - type: entity id: SpawnPointCargoTechnician parent: SpawnPointJobBase - name: logisticstechnician # DeltaV - Logistics Department replacing Cargo + name: cargotechnician components: - type: SpawnPoint job_id: CargoTechnician