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..32194efe7c2 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -33,7 +33,7 @@ job-name-botanist = Botanist job-name-bartender = Bartender job-name-passenger = Passenger job-name-salvagespec = Salvage specialist -job-name-qm = Quartermaster +job-name-qm = Head of Logistics job-name-cargotech = Cargo Technician job-name-chef = Chef job-name-clown = Clown @@ -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/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/Locale/en-US/nyanotrasen/job/job-description.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl index dba1922e8d3..69c16e2aaa0 100644 --- a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl +++ b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl @@ -1,4 +1,5 @@ job-description-gladiator = Put on a combat spectacle for the crew. Fight for your freedom, glory, and honor. job-description-guard = Keep track of prisoners and make sure they have their basic needs. +job-description-mail-carrier = Deliver mail and other packages from and to logistics. Avoid dogs. job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC. job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs. diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl index b32b70f8511..f8d780f9179 100644 --- a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl +++ b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl @@ -1,4 +1,8 @@ job-name-gladiator = Gladiator job-name-guard = Prison Guard +job-name-mail-carrier = Courier job-name-martialartist = Martial Artist job-name-prisoner = Prisoner + +# Role timers +JobMailCarrier = Courier 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/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml index 692726f1efe..5854a963658 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..2bdde63854a 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/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 46949662327..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: 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..7217ee3eb11 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -43,7 +43,7 @@ - "You can examine your headset to see which radio channels you have available and how to speak in them." - "As a Salvage Technician, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space." - "As a Salvage Technician, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be 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." diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 7277ebb10a8..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: 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..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: 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..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: 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..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: 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..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: 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..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: 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..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: 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..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: 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..cb8e283859c 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..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: 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..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: 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..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 Cargo department. + 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..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 Cargo department. + 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..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 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..5d948443757 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 diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index 6adee8f1df4..922bd4c4c86 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -31,12 +31,13 @@ - type: entity parent: SalvageHumanCorpse id: MobRandomCargoCorpse - suffix: Dead, 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 - type: entity parent: SalvageHumanCorpse diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml index 08db5857447..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 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..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: 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..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: 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..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: 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..bcd70802769 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 @@ -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 67d9826e220..b0a69a944ae 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: @@ -563,6 +563,7 @@ - JobIconSeniorEngineer - JobIconSeniorResearcher - JobIconPrisonGuard # Nyanotrasen - PrisonGuard, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml + - JobIconMailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - JobIconMartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml - JobIconGladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml - type: ActivatableUI diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 621018d7f70..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: 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..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 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..4198c08b63c 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..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, 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..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: 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..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: 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..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: 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..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: 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..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: 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..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: 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/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/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/Markers/Spawners/jobs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml index 0b387eaadbc..2f2ea2e9797 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/jobs.yml @@ -36,6 +36,19 @@ layers: - state: green - state: nyanoprisonguard + +- type: entity + id: SpawnPointMailCarrier + parent: SpawnPointJobBase + name: courier # Delta V - Mail Carrier to Courier replacement + components: + - type: SpawnPoint + job_id: MailCarrier + - type: Sprite + sprite: DeltaV/Markers/jobs.rsi + layers: + - state: green + - state: nyanomailcarrier - type: entity id: SpawnPointMartialArtist diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml index 47047af2f43..ee8ff3a95e9 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml @@ -36,6 +36,20 @@ - state: nyanoprisonguard - type: PresetIdCard job: PrisonGuard + +- 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 + - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml index d83f03d2ea4..b9056a9239c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml @@ -32,6 +32,34 @@ accentVColor: "#DFDFDF" - type: Icon state: pda-security + +- 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 - type: entity parent: BoxerPDA 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..c934f181c5c --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/tools.yml @@ -0,0 +1,22 @@ +- 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: Item + size: 121 + - type: Storage + capacity: 120 + quickInsert: true +# whitelist: +# components: +# - Mail # Awaiting actual Mail stuff 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" 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..0762ee304b4 --- /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 index a3b43b47169..3219d3a651f 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/play_time_trackers.yml @@ -1,2 +1,6 @@ +- type: playTimeTracker + id: JobMailCarrier + - type: playTimeTracker id: JobPrisoner + \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml index 610346d73d5..105c27590ab 100644 --- a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml +++ b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml @@ -11,6 +11,13 @@ icon: sprite: DeltaV/Interface/Misc/job_icons.rsi state: nyanoPrisonGuard + +- type: statusIcon + parent: JobIcon + id: JobIconMailCarrier + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: nyanoMailCarrier - type: statusIcon parent: JobIcon diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index c5d3ed554ca..c1eef300abc 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 diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index a4db7a9b425..6ccdc1ee65e 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/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. diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index 84367d87754..f3f18816315 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -1,17 +1,20 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers", "size": { "x": 8, "y": 8 }, "states": [ + { + "name": "nyanoGladiator" + }, { "name": "nyanoPrisonGuard" }, { - "name": "nyanoGladiator" + "name": "nyanoMailCarrier" }, { "name": "nyanoMartialArtist" 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 00000000000..1b0acdd2412 Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png differ diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json index 19ff5440e10..4b52c0c4dba 100644 --- a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "green" }, + { + "name": "nyanogladiator" + }, { "name": "nyanoprisonguard" }, @@ -17,10 +20,10 @@ "name": "nyanoprisoner" }, { - "name": "nyanomartialartist" + "name": "nyanomailcarrier" }, { - "name": "nyanogladiator" + "name": "nyanomartialartist" } ] } 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 00000000000..f8f0a8e6c2e Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/nyanomailcarrier.png differ 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 00000000000..5c8b0666f1e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/id_overlay.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/id_overlay.png new file mode 100644 index 00000000000..3f5d310e703 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/id_overlay.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/insert_overlay.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/insert_overlay.png new file mode 100644 index 00000000000..61ba781c1ff Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/insert_overlay.png differ 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 00000000000..286a6c32558 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/light_overlay.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json new file mode 100644 index 00000000000..f34ba246561 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "id_overlay" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "insert_overlay" + }, + { + "name": "light_overlay" + }, + { + "name": "pda-mailcarrier" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-mailcarrier.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-mailcarrier.png new file mode 100644 index 00000000000..36a81030667 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-mailcarrier.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json index 54bc8ab7fe4..f3d5e7e6765 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json @@ -22,15 +22,18 @@ { "name": "silver" }, - { - "name": "nyanoprisoner" - }, { "name": "nyanogladiator" }, { "name": "nyanoprisonguard" }, + { + "name": "nyanoprisoner" + }, + { + "name": "nyanomailcarrier" + }, { "name": "nyanomartialartist" }, diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png new file mode 100644 index 00000000000..ba7a3d4dcdd Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/nyanomailcarrier.png differ 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 00000000000..954a82c984d Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/broken.png differ 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 00000000000..635e482346f Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/normal-unshaded.png differ 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 00000000000..754bbb96c66 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/off.png differ diff --git a/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/panel.png b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/panel.png new file mode 100644 index 00000000000..dcb37dea9df Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/maildrobe.rsi/panel.png differ