From 51778afe6f701c0f1a2ba62db983e8cd40b264df Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Fri, 24 Mar 2023 18:54:47 +1000 Subject: [PATCH] TG Vending Machines + Tweaks (#14703) * d d * engivend misalignment * sustenance vendor * Revert "sustenance vendor" This reverts commit 2f4fb47df4529e93b7fc69da1b7a10e8a7c9f2c2. * shamblers juice * pwrgame * most food/drink machines * robotech deluxe, centdrobe and some restock boxes * copyright + salv vend * tweaks * restock box + more tweaks * yaml linter fail * divide vendor contents * divide contents 2 --- .../{ => vending}/chemdrobe.ftl | 0 .../catalog/cargo/cargo-vending.ftl | 3 + .../catalog/fills/crates/vending-crates.ftl | 3 + .../reagents/meta/consumable/drink/soda.ftl | 6 +- .../Catalog/Cargo/cargo_vending.yml | 10 + .../Catalog/Fills/Crates/vending.yml | 8 + .../VendingMachines/Inventories/centdrobe.yml | 16 + .../VendingMachines/Inventories/cola.yml | 8 +- .../VendingMachines/Inventories/pwrgame.yml | 10 + .../VendingMachines/Inventories/robotics.yml | 27 +- .../Inventories/shamblersjuice.yml | 9 + .../VendingMachines/Inventories/soda.yml | 9 + .../VendingMachines/Inventories/spaceup.yml | 10 + .../VendingMachines/Inventories/starkist.yml | 9 + .../Markers/Spawners/Random/vending.yml | 16 +- .../Markers/Spawners/Random/vendingdrinks.yml | 24 ++ .../Markers/Spawners/Random/vendingsnacks.yml | 22 ++ .../Objects/Consumable/Drinks/drinks_cans.yml | 38 ++ .../Service/vending_machine_restock.yml | 60 +++- .../Structures/Machines/vending_machines.yml | 325 +++++++++++++++++- .../Reagents/Consumable/Drink/soda.yml | 9 + .../Consumable/Drinks/pwrgame.rsi/icon.png | Bin 0 -> 545 bytes .../Drinks/pwrgame.rsi/icon_open.png | Bin 0 -> 546 bytes .../Drinks/pwrgame.rsi/inhand-left.png | Bin 0 -> 287 bytes .../Drinks/pwrgame.rsi/inhand-right.png | Bin 0 -> 291 bytes .../Consumable/Drinks/pwrgame.rsi/meta.json | 53 +++ .../Drinks/shamblersjuice.rsi/icon.png | Bin 0 -> 521 bytes .../Drinks/shamblersjuice.rsi/icon_open.png | Bin 0 -> 524 bytes .../Drinks/shamblersjuice.rsi/inhand-left.png | Bin 0 -> 281 bytes .../shamblersjuice.rsi/inhand-right.png | Bin 0 -> 284 bytes .../Drinks/shamblersjuice.rsi/meta.json | 53 +++ .../vending_machine_restock.rsi/meta.json | 5 +- .../refill_robotics.png | Bin 0 -> 272 bytes .../VendingMachines/centdrobe.rsi/broken.png | Bin 0 -> 407 bytes .../VendingMachines/centdrobe.rsi/meta.json | 33 ++ .../centdrobe.rsi/normal-unshaded.png | Bin 0 -> 2084 bytes .../VendingMachines/centdrobe.rsi/off.png | Bin 0 -> 319 bytes .../VendingMachines/centdrobe.rsi/panel.png | Bin 0 -> 190 bytes .../VendingMachines/cola-red.rsi/broken.png | Bin 0 -> 443 bytes .../cola-red.rsi/deny-unshaded.png | Bin 0 -> 904 bytes .../cola-red.rsi/eject-unshaded.png | Bin 0 -> 975 bytes .../VendingMachines/cola-red.rsi/meta.json | 56 +++ .../cola-red.rsi/normal-unshaded.png | Bin 0 -> 1067 bytes .../VendingMachines/cola-red.rsi/normal.png | Bin 0 -> 392 bytes .../VendingMachines/cola-red.rsi/off.png | Bin 0 -> 387 bytes .../VendingMachines/cola-red.rsi/panel.png | Bin 0 -> 244 bytes .../VendingMachines/mining.rsi/broken.png | Bin 860 -> 516 bytes .../VendingMachines/pwrgame.rsi/broken.png | Bin 0 -> 450 bytes .../pwrgame.rsi/deny-unshaded.png | Bin 0 -> 597 bytes .../pwrgame.rsi/eject-unshaded.png | Bin 0 -> 648 bytes .../VendingMachines/pwrgame.rsi/meta.json | 56 +++ .../pwrgame.rsi/normal-unshaded.png | Bin 0 -> 646 bytes .../VendingMachines/pwrgame.rsi/normal.png | Bin 0 -> 394 bytes .../VendingMachines/pwrgame.rsi/off.png | Bin 0 -> 389 bytes .../VendingMachines/pwrgame.rsi/panel.png | Bin 0 -> 244 bytes .../VendingMachines/random.rsi/any.png | Bin 0 -> 2019 bytes .../VendingMachines/random.rsi/drink.png | Bin 0 -> 2179 bytes .../VendingMachines/random.rsi/meta.json | 20 ++ .../VendingMachines/random.rsi/snack.png | Bin 0 -> 1916 bytes .../VendingMachines/robotics.rsi/broken.png | Bin 0 -> 505 bytes .../robotics.rsi/deny-unshaded.png | Bin 0 -> 481 bytes .../robotics.rsi/eject-unshaded.png | Bin 0 -> 580 bytes .../VendingMachines/robotics.rsi/meta.json | 56 +++ .../robotics.rsi/normal-unshaded.png | Bin 0 -> 610 bytes .../VendingMachines/robotics.rsi/normal.png | Bin 0 -> 449 bytes .../VendingMachines/robotics.rsi/off.png | Bin 0 -> 427 bytes .../VendingMachines/robotics.rsi/panel.png | Bin 0 -> 217 bytes .../shamblersjuice.rsi/broken.png | Bin 0 -> 462 bytes .../shamblersjuice.rsi/deny-unshaded.png | Bin 0 -> 450 bytes .../shamblersjuice.rsi/eject-unshaded.png | Bin 0 -> 559 bytes .../shamblersjuice.rsi/meta.json | 56 +++ .../shamblersjuice.rsi/normal-unshaded.png | Bin 0 -> 548 bytes .../shamblersjuice.rsi/normal.png | Bin 0 -> 397 bytes .../shamblersjuice.rsi/off.png | Bin 0 -> 385 bytes .../shamblersjuice.rsi/panel.png | Bin 0 -> 244 bytes .../VendingMachines/soda.rsi/broken.png | Bin 0 -> 436 bytes .../soda.rsi/deny-unshaded.png | Bin 0 -> 368 bytes .../soda.rsi/eject-unshaded.png | Bin 0 -> 480 bytes .../VendingMachines/soda.rsi/meta.json | 56 +++ .../soda.rsi/normal-unshaded.png | Bin 0 -> 417 bytes .../VendingMachines/soda.rsi/normal.png | Bin 0 -> 355 bytes .../Machines/VendingMachines/soda.rsi/off.png | Bin 0 -> 309 bytes .../VendingMachines/soda.rsi/panel.png | Bin 0 -> 244 bytes .../VendingMachines/spaceup.rsi/broken.png | Bin 0 -> 447 bytes .../spaceup.rsi/deny-unshaded.png | Bin 0 -> 809 bytes .../spaceup.rsi/eject-unshaded.png | Bin 0 -> 871 bytes .../VendingMachines/spaceup.rsi/meta.json | 56 +++ .../spaceup.rsi/normal-unshaded.png | Bin 0 -> 750 bytes .../VendingMachines/spaceup.rsi/normal.png | Bin 0 -> 440 bytes .../VendingMachines/spaceup.rsi/off.png | Bin 0 -> 413 bytes .../VendingMachines/spaceup.rsi/panel.png | Bin 0 -> 244 bytes .../VendingMachines/starkist.rsi/broken.png | Bin 0 -> 436 bytes .../starkist.rsi/deny-unshaded.png | Bin 0 -> 394 bytes .../starkist.rsi/eject-unshaded.png | Bin 0 -> 490 bytes .../VendingMachines/starkist.rsi/meta.json | 56 +++ .../starkist.rsi/normal-unshaded.png | Bin 0 -> 466 bytes .../VendingMachines/starkist.rsi/normal.png | Bin 0 -> 374 bytes .../VendingMachines/starkist.rsi/off.png | Bin 0 -> 309 bytes .../VendingMachines/starkist.rsi/panel.png | Bin 0 -> 244 bytes 99 files changed, 1138 insertions(+), 40 deletions(-) rename Resources/Locale/en-US/advertisements/{ => vending}/chemdrobe.ftl (100%) create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/vendingsnacks.yml create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_robotics.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/panel.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/panel.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/panel.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/random.rsi/any.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/random.rsi/drink.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/random.rsi/snack.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/panel.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/panel.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/panel.png diff --git a/Resources/Locale/en-US/advertisements/chemdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl similarity index 100% rename from Resources/Locale/en-US/advertisements/chemdrobe.ftl rename to Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl index 9e5c6575b3..8d32404332 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl @@ -46,6 +46,9 @@ ent-CrateVendingMachineRestockSnacks = { ent-CrateVendingMachineRestockSnacksFil ent-CrateVendingMachineRestockVendomat = { ent-CrateVendingMachineRestockVendomatFilled } .desc = { ent-CrateVendingMachineRestockVendomatFilled.desc } +ent-CrateVendingMachineRestockRobotics = { ent-CrateVendingMachineRestockRoboticsFilled } + .desc = { ent-CrateVendingMachineRestockRoboticsFilled.desc } + ent-CrateVendingMachineRestockTankDispenser = { ent-CrateVendingMachineRestockTankDispenserFilled } .desc = { ent-CrateVendingMachineRestockTankDispenserFilled.desc } diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl index a33f93f678..0f34c41fe4 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl @@ -46,6 +46,9 @@ ent-CrateVendingMachineRestockSnacksFilled = Snack restock crate ent-CrateVendingMachineRestockVendomatFilled = Vendomat restock crate .desc = Contains a restock box for a Vendomat vending machine. +ent-CrateVendingMachineRestockRoboticsFilled = Robotech Deluxe restock crate + .desc = Contains a restock box for a Robotech Deluxe vending machine. + ent-CrateVendingMachineRestockTankDispenserFilled = Tank dispenser restock crate .desc = Contains a restock box for an Engineering or Atmospherics tank dispenser. diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl index d8dcf8cc0d..08017c265d 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl @@ -20,7 +20,7 @@ reagent-name-lemon-lime = lemon-lime reagent-desc-lemon-lime = tangy lime and lemon soda reagent-name-pwr-game = Pwr Game -reagent-desc-pwr-game = The only drink with the PWR that true gamers crave. +reagent-desc-pwr-game = The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to. reagent-name-root-beer = root beer reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsparilla. Goes well with ice cream. @@ -39,3 +39,7 @@ reagent-desc-starkist = A sweet, orange flavored soft drink. reagent-name-fourteen-loko = Fourteen Loko reagent-desc-fourteen-loko = A highly processed liquid substance barely-passing intergalatic health standards for a soft drink. + +reagent-name-shamblers-juice = Shambler's Juice +reagent-desc-shamblers-juice = ~Shake me up some of that Shambler's Juice!~ + diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 00f618796c..3c1e5db6f1 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -166,6 +166,16 @@ category: Service group: market +- type: cargoProduct + id: CrateVendingMachineRestockRobotics + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockRoboticsFilled + cost: 1600 + category: Science + group: market + - type: cargoProduct id: CrateVendingMachineRestockTankDispenser icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml index 3de97fa654..b4ab04ddaa 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml @@ -133,6 +133,14 @@ contents: - id: VendingMachineRestockVendomat +- type: entity + id: CrateVendingMachineRestockRoboticsFilled + parent: CrateScienceSecure + components: + - type: StorageFill + contents: + - id: VendingMachineRestockRobotics + - type: entity id: CrateVendingMachineRestockTankDispenserFilled parent: CratePlastic diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml new file mode 100644 index 0000000000..eb83c3cc74 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml @@ -0,0 +1,16 @@ +- type: vendingMachineInventory + id: CentDrobeInventory + startingInventory: + ClothingShoesBootsLaceup: 3 + ClothingShoesBootsJack: 3 + ClothingHandsGlovesCombat: 3 + ClothingEyesGlassesSunglasses: 3 + ClothingUniformJumpsuitCentcomOfficer: 3 + ClothingUniformJumpsuitCentcomOfficial: 3 + ClothingUniformJumpsuitCentcomFormal: 3 + ClothingUniformJumpskirtCentcomFormalDress: 3 + ClothingHeadHatCentcom: 3 + ClothingMaskGasCentcom: 3 + ClothingHeadsetCentCom: 3 + ClothingOuterWinterCentcom: 3 + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index bbf72a15b1..8a039e10ad 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -1,13 +1,9 @@ - type: vendingMachineInventory id: RobustSoftdrinksInventory startingInventory: - DrinkColaCan: 2 - DrinkEnergyDrinkCan: 2 - DrinkGrapeCan: 3 + DrinkColaCan: 4 + DrinkGrapeCan: 2 DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 - DrinkSpaceMountainWindCan: 2 - DrinkSpaceUpCan: 2 - DrinkStarkistCan: 2 DrinkFourteenLokoCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml new file mode 100644 index 0000000000..ede59628da --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml @@ -0,0 +1,10 @@ +- type: vendingMachineInventory + id: PwrGameInventory + startingInventory: + DrinkPwrGameCan: 4 + DrinkEnergyDrinkCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml index a3a7301433..91c29ad500 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml @@ -1,18 +1,15 @@ - type: vendingMachineInventory - id: RobotechDeluxeInventory + id: RoboticsInventory startingInventory: - #TO DO: add missing prototypes - ClothingOuterCoatLab: 4 - #roboticist under - CableStack: 4 - Flash: 4 - #proximity sensor - #signaller - #health anaylzer + CableApcStack: 4 + #Flash: 4 add when robotics + ProximitySensor: 3 + RemoteSignaller: 3 + HandheldHealthAnalyzer: 3 Scalpel: 2 - Saw: 1 - #bonesetter - #anaesthetic - #medical mask - Screwdriver: 5 - Crowbar: 5 + SawElectric: 2 + #Bonesetter: 2 add when robotics + NitrousOxideTankFilled: 2 + ClothingMaskBreathMedical: 5 + Screwdriver: 2 + Crowbar: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml new file mode 100644 index 0000000000..10ab528b0e --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml @@ -0,0 +1,9 @@ +- type: vendingMachineInventory + id: ShamblersJuiceInventory + startingInventory: + DrinkShamblersJuiceCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml new file mode 100644 index 0000000000..4fc1519fd2 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -0,0 +1,9 @@ +- type: vendingMachineInventory + id: SodaInventory + startingInventory: + DrinkColaCan: 3 + DrinkGrapeCan: 3 + DrinkRootBeerCan: 3 + DrinkIcedTeaCan: 3 + DrinkLemonLimeCan: 3 + DrinkFourteenLokoCan: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml new file mode 100644 index 0000000000..39e3de5f1e --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml @@ -0,0 +1,10 @@ +- type: vendingMachineInventory + id: SpaceUpInventory + startingInventory: + DrinkSpaceUpCan: 3 + DrinkSpaceMountainWindCan: 3 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml new file mode 100644 index 0000000000..cbc0c70e63 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml @@ -0,0 +1,9 @@ +- type: vendingMachineInventory + id: StarkistInventory + startingInventory: + DrinkStarkistCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml index db5075eefb..d988f7f1db 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml @@ -1,21 +1,33 @@ - type: entity id: RandomVending name: random vending machine spawner + suffix: Any parent: MarkerBase components: - type: Sprite layers: - state: red - - sprite: Structures/Machines/VendingMachines/coffee.rsi - state: off + - sprite: Structures/Machines/VendingMachines/random.rsi + state: any - type: RandomSpawner prototypes: - VendingMachineCigs - VendingMachineCoffee - VendingMachineCola + - VendingMachineColaRed + - VendingMachineColaBlack - VendingMachineDiscount - VendingMachineSnack + - VendingMachineSnackBlue + - VendingMachineSnackGreen + - VendingMachineSnackOrange + - VendingMachineSnackTeal - VendingMachineSovietSoda - VendingMachineChang - VendingMachineDonut + - VendingMachineShamblersJuice + - VendingMachinePwrGame + - VendingMachineSoda + - VendingMachineStarkist + - VendingMachineSpaceUp chance: 1 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml new file mode 100644 index 0000000000..1b187cf221 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml @@ -0,0 +1,24 @@ +- type: entity + id: RandomVendingDrinks + name: random vending machine spawner + suffix: Drinks + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Machines/VendingMachines/random.rsi + state: drink + - type: RandomSpawner + prototypes: + - VendingMachineCoffee + - VendingMachineCola + - VendingMachineColaRed + - VendingMachineColaBlack + - VendingMachineSovietSoda + - VendingMachineShamblersJuice + - VendingMachinePwrGame + - VendingMachineSoda + - VendingMachineStarkist + - VendingMachineSpaceUp + chance: 1 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingsnacks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingsnacks.yml new file mode 100644 index 0000000000..b634d50cc6 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingsnacks.yml @@ -0,0 +1,22 @@ +- type: entity + id: RandomVendingSnacks + name: random vending machine spawner + suffix: Snacks + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Machines/VendingMachines/random.rsi + state: snack + - type: RandomSpawner + prototypes: + - VendingMachineDiscount + - VendingMachineSnack + - VendingMachineSnackBlue + - VendingMachineSnackGreen + - VendingMachineSnackOrange + - VendingMachineSnackTeal + - VendingMachineChang + - VendingMachineDonut + chance: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 8621fed551..a3a674598c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -342,3 +342,41 @@ - 6pack4 - 6pack5 - 6pack6 + +- type: entity + parent: DrinkCanBaseFull + id: DrinkShamblersJuiceCan + name: shamblers juice can + description: ~Shake me up some of that Shambler's Juice!~ + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ShamblersJuice + Quantity: 30 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/shamblersjuice.rsi + - type: Item + sprite: Objects/Consumable/Drinks/shamblersjuice.rsi + +- type: entity + parent: DrinkCanBaseFull + id: DrinkPwrGameCan + name: pwr game can + description: The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: PwrGame + Quantity: 30 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/pwrgame.rsi + - type: Item + sprite: Objects/Consumable/Drinks/pwrgame.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index f44226549c..27a504d0cd 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -75,12 +75,29 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockClothes - name: ClothesMate restock box - description: It's time to step up your fashion! Place inside the ClothesMate restock slot to begin. + name: wardrobe restock box + description: It's time to step up your fashion! Place inside any clothes vendor restock slot to begin. components: - type: VendingMachineRestock canRestock: - ClothesMateInventory + - AtmosDrobeInventory + - BarDrobeInventory + - CargoDrobeInventory + - CentDrobeInventory + - ChefDrobeInventory + - ChemDrobeInventory + - DetDrobeInventory + - EngiDrobeInventory + - GeneDrobeInventory + - HyDrobeInventory + - JaniDrobeInventory + - LawDrobeInventory + - MediDrobeInventory + - RoboDrobeInventory + - SciDrobeInventory + - SecDrobeInventory + - ViroDrobeInventory - type: Sprite layers: - state: base @@ -139,7 +156,7 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockDonut - name: Robust Donuts box + name: Robust Donuts restock box description: A box full of toroidal bundles of fried dough for restocking a vending machine. Use only as directed by Robust Industries, LLC. components: - type: VendingMachineRestock @@ -155,7 +172,7 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockEngineering - name: EngiVend resupply box + name: EngiVend restock box description: Only to be used by certified professionals. components: - type: VendingMachineRestock @@ -220,7 +237,7 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockMedical - name: NanoMed resupply box + name: NanoMed restock box description: Slot into your department's NanoMed or NanoMedPlus to dispense. Handle with care. components: - type: VendingMachineRestock @@ -253,7 +270,7 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockPTech - name: PTech resupply box + name: PTech restock box description: All the bureaucracy you can handle, and more! Load into the PTech vending machine to get started. components: - type: VendingMachineRestock @@ -276,6 +293,11 @@ canRestock: - RobustSoftdrinksInventory - BodaInventory + - PwrGameInventory + - ShamblersJuiceInventory + - StarkistInventory + - SpaceUpInventory + - SodaInventory - type: Sprite layers: - state: base @@ -286,7 +308,7 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockSecTech - name: SecTech resupply box + name: SecTech restock box description: "Communists beware: the reinforcements have arrived! A label reads SECURITY PERSONNEL ONLY." components: - type: VendingMachineRestock @@ -302,7 +324,7 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockSalvageEquipment - name: salvage resupply box + name: Salvage Vendor restock box description: Strike the earth ere the space carp nip your behind! Slam into a salvage vendor to begin. components: - type: VendingMachineRestock @@ -350,7 +372,7 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockTankDispenser - name: tank dispenser resupply box + name: tank dispenser restock box description: Capable of replacing tanks in a gas tank dispenser. Handle with care. components: - type: VendingMachineRestock @@ -367,7 +389,7 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockVendomat - name: vendomat restock box + name: Vendomat restock box description: A box full of parts for various machinery. Load it into a Vendomat to begin. components: - type: VendingMachineRestock @@ -380,10 +402,26 @@ shader: unshaded - state: refill_parts +- type: entity + parent: BaseVendingMachineRestock + id: VendingMachineRestockRobotics + name: Robotech Deluxe restock box + description: A box full of tools for creating borgs. Load it into a Robotech Deluxe to begin. + components: + - type: VendingMachineRestock + canRestock: + - RoboticsInventory + - type: Sprite + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_robotics + - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockHappyHonk - name: happy honk restock box + name: Happy Honk restock box description: place this box full of fun into the restock slot on the Happy Honk Dispenser to begin. components: - type: VendingMachineRestock diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 2390b44794..7345b626f3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -349,6 +349,183 @@ energy: 1.6 color: "#3c5eb5" +- type: entity + parent: VendingMachineCola + id: VendingMachineColaBlack + suffix: Black + components: + - type: Sprite + sprite: Structures/Machines/VendingMachines/cola-black.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#423438" + +- type: entity + parent: VendingMachineCola + id: VendingMachineColaRed + name: Space Cola Vendor + description: It vends cola, in space. + components: + - type: Sprite + sprite: Structures/Machines/VendingMachines/cola-red.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#A50824" + +- type: entity + parent: VendingMachineCola + id: VendingMachineSpaceUp + name: Space-Up! Vendor + description: Indulge in an explosion of flavor. + components: + - type: VendingMachine + pack: SpaceUpInventory + - type: Sprite + sprite: Structures/Machines/VendingMachines/spaceup.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#44964A" + +- type: entity + parent: VendingMachineCola + id: VendingMachineSoda + suffix: Soda + components: + - type: VendingMachine + pack: SodaInventory + - type: Sprite + sprite: Structures/Machines/VendingMachines/soda.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#CBC6BE" + +- type: entity + parent: VendingMachineCola + id: VendingMachineStarkist + name: Star-kist Vendor + description: The taste of a star in liquid form. + components: + - type: VendingMachine + pack: StarkistInventory + - type: Sprite + sprite: Structures/Machines/VendingMachines/starkist.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#D3A44D" + +- type: entity + parent: VendingMachine + id: VendingMachineShamblersJuice + name: Shambler's Juice Vendor + description: ~Shake me up some of that Shambler's Juice!~ + components: + - type: VendingMachine + pack: ShamblersJuiceInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 1.9 + - type: Advertise + pack: RobustSoftdrinksAds + - type: Speech + - type: Sprite + sprite: Structures/Machines/VendingMachines/shamblersjuice.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#66538F" + +- type: entity + parent: VendingMachine + id: VendingMachinePwrGame + name: Pwr Game Vendor + description: You want it, we got it. Brought to you in partnership with Vlad's Salads. + components: + - type: VendingMachine + pack: PwrGameInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 1.9 + - type: Advertise + pack: RobustSoftdrinksAds + - type: Speech + - type: Sprite + sprite: Structures/Machines/VendingMachines/pwrgame.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#6927C5" + - type: entity parent: VendingMachine id: VendingMachineDinnerware @@ -673,6 +850,86 @@ energy: 1.6 color: "#c73434" +- type: entity + parent: VendingMachineSnack + id: VendingMachineSnackBlue + suffix: Blue + components: + - type: Sprite + sprite: Structures/Machines/VendingMachines/snack-blue.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#3c5eb5" + +- type: entity + parent: VendingMachineSnack + id: VendingMachineSnackOrange + suffix: Orange + components: + - type: Sprite + sprite: Structures/Machines/VendingMachines/snack-orange.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#CE3401" + +- type: entity + parent: VendingMachineSnack + id: VendingMachineSnackGreen + suffix: Green + components: + - type: Sprite + sprite: Structures/Machines/VendingMachines/snack-green.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#5F6A1C" + +- type: entity + parent: VendingMachineSnack + id: VendingMachineSnackTeal + suffix: Teal + components: + - type: Sprite + sprite: Structures/Machines/VendingMachines/snack-teal.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#207E79" + - type: entity parent: VendingMachine id: VendingMachineSovietSoda @@ -775,6 +1032,39 @@ energy: 1.6 color: "#9dc5c9" +- type: entity + parent: VendingMachine + id: VendingMachineRobotics + name: Robotech Deluxe + description: All the tools you need to create your own robot army. + components: + - type: VendingMachine + pack: RoboticsInventory + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + - type: Advertise + pack: VendomatAds + - type: Speech + - type: Sprite + sprite: Structures/Machines/VendingMachines/robotics.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: [["Research"]] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#B0ADA9" + - type: entity parent: VendingMachine id: VendingMachineYouTool @@ -870,7 +1160,7 @@ - type: entity parent: VendingMachine id: VendingMachineSalvage - name: salvage vendor + name: Salvage Vendor description: A dwarves best friend! components: - type: VendingMachine @@ -1414,7 +1704,33 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AccessReader access: [["Medical"]] - + +- type: entity + parent: VendingMachine + id: VendingMachineCentDrobe + name: CentDrobe + description: A one-of-a-kind vending machine for all your centcom aesthetic needs! + components: + - type: VendingMachine + pack: CentDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + - type: Sprite + sprite: Structures/Machines/VendingMachines/centdrobe.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#48CF48" + - type: entity parent: VendingMachine id: VendingMachineHappyHonk @@ -1456,7 +1772,7 @@ parent: VendingMachine id: VendingMachineTankDispenserEVA suffix: EVA [O2, N2] - name: gas tank dispenser + name: Gas Tank Dispenser description: A vendor for dispensing gas tanks. components: - type: VendingMachine @@ -1469,7 +1785,7 @@ parent: VendingMachine id: VendingMachineTankDispenserEngineering suffix: ENG [O2, Plasma] - name: gas tank dispenser + name: Gas Tank Dispenser description: A vendor for dispensing gas tanks. This one has an engineering livery. components: - type: VendingMachine @@ -1479,3 +1795,4 @@ layers: - state: dispenser - state: dispensereng + diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index 87c872de0e..0cd79f7099 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -157,3 +157,12 @@ damage: types: Poison: 1 + +- type: reagent + id: ShamblersJuice + name: reagent-name-shamblers-juice + parent: BaseSoda + desc: reagent-desc-shamblers-juice + physicalDesc: reagent-physical-desc-fizzy + flavor: metallic + color: "#66538F" diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c089ba47cd898a402a372dd09d3d63238636a032 GIT binary patch literal 545 zcmV++0^a?JP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0k%m*K~z{rV?1!+ z0K-56CMZ2%VAKJl4j6U7fIEP!f@s#t6aS%1I7kb(V1zPB0wg;CWO;0uBZI!SI#dJ# z92`R!W=*Xj*%2f;0A#tDu`+|YvK+(WRr|qWFh0mZP?3HoN5L?CKm>u$)u$Pk{r;O(DR>%S&D(zO$jQ3 z09Q9{XAolLWvE|JLc1scS+2sZ#_)O9JqD>G3}70BL6*yLpe9OU0m*3~YQ8H&zDF*D zhn+V=tY-6wHQM{(Q@8Fij31D+DZyJ;9E+KmQFF8`{r?%8(Aoa=`K4?O;b(MHYkc z`GcuY8PWk+4mf}44%iXLmiL13!DC0k;_rTc2GgVfk{oc8<6gs^ueTV)Ma3DOUH{B* z{LpzY27yOEZZdoqU~K?%NB|_)hH2R?_1?@LV2ePG0Rfohz>265EI8&II$(euz`y_ix1p7udTZq800000NkvXXu0mjfdG*!) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..6451930614a4157ce73ff554189a8f30c7016243 GIT binary patch literal 546 zcmV+-0^R+IP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0k=s+K~z{rV?1!+ z0K-56CMZ2%VAKJl4j6U7fIEP!f@s#t6aS%1FfcP#2Ga&AqKse$34r7f09hUz=E%^~ zm;uHx%cu3v1k7o%iv+>%@FGu4#7@IP+8Ie$qoPkqh@I+3j!p4L>VI50-!w709g(I0hl8c6Gg!E zimDA@np8lt1C}N3W;j>-6wHQM{(Q@8Fij31D+DZyJ;9E+KmQFF8`{r?%8(Aoa=`K4 z?O;b(MHYkc`GcuY8PWk+4mf}44%iXLmiL13!DC0k;_rTc2GgVfk{oc8<6gs^ueTV) zMa3DOUH{B*{LpzY27yOEZZdoqU~K?%NB|^P$G{4w-kaG2Y!S#YAON#`*3_CtumA~Q kv|}>rfKdkwumczv0Om!LDTH*;s{jB107*qoM6N<$f-(rx!Tk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw&YU^(^y$;S%4vJDFQ=!czkB!Y$x#EKWQbR_6p-R53Gxg64*?AK zn)gNm#W)K*B8wRq_zr_G4SW55xg-x9|zW6M;`NYXV-t33l_JgeP2Du;3p4ZR# zaC*AwAH$g(0v90YAA5_jB6rJeF#g;0x6Fh2_rwXTPAnW5?FXX76>jDGmKUZj0J?+0 M)78&qol`;+0H>X7NB{r; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cb290981140d101f18398d8f9398583a8291e7b4 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw&YU^(^y$-kvM>88r@edkE0$dO(V!B*-uLKLjw` zYu+0P6yq%Lh%9Dc;5!V$jK}j=qyPmQJY5_^BHZ6zvlePF;BdXz^5@(B|7C(xZcr1;9p#X@)ClvK1^c0R|8i@z= zq#i^=R0GL+X0bk&vu}_0vz)b;uoE)jZvnEHA1XUW|4m=d!0^DV(U8x>JU>{Wa-AX2 OEexKnelF{r5}E*v^<{DZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json new file mode 100644 index 0000000000..d269458e27 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..12e05e98d79b01fb80f600cb3a20b71170bf07c4 GIT binary patch literal 521 zcmV+k0`~ohP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0iH=jK~z{rV?1!+ z0K-56CMZ2%VAKJl4j6U7fIEP!f@s#t6aS%1I7kb(V1zPB0wg;CWO;0uBZI!SI#dJ# z92`R!W=*Xj*%2f;0A#tDu`+|YvK+(WRr|qWFh0mZ=;T#~lKL57-+~;{)0hEw(6s)U3<8X-U^Xd$q$sE(?8Gt|{fTjRFvm{iF`YJg?Z{m|Q@X12hc8!MN+~R|Z`p1qOcUzfc*{0oesnVCgI{ z9b3H-Op^=9cEI}XG%&rm)gMfg3&?W7-!&bG5Lk7XLH*<*Fq<4emIIhWDi9$MX3KEX z+z!kp2ax4}8y8-pq=Dl{E`r(Q0J76Sdo(2O%Yya6Gzh%>_!7z@9+2dKS3jROT)Tgc zK}t*jjLU?%p)w2%k6&M9VCNHRfO3fjBst*L)jf?MM_he$fdPa;jsanqPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ij7mK~z{rV?1!+ z0K-56CMZ2%VAKJl4j6U7fIEP!f@s#t6aS%1FfcP#2Ga&AqKse$34r7f09hUz=E%^~ zm;uHx%cu3v1kI*$*W0fQx<(2N{L+7+ zGNc2t8~_4=rL(|vZ1qMkO)enY0qeWd!1Ur)e=tohAj<)N*K{C4VAWv;^^=FdY;piu z4qy(cK!iY;EyGQ7J20CZK$Zh;TzH9+296)O2xgN5$W8<8(U7<=3)TnIAn@|zODKzY zK#~Jq{e0eV?fy9iDKP;sE)(X4$}liIetngJolmF%$|V|*chqd~)~z)p|xC2asddXxD7i0R!v+1_l6C_LXz%M7Op8 O0000k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y&YU^(^y$+!MzLwZ{psoH2M!zn%KR`m1k%l3666>B9}F0zyqVpA zLYxI2k;M!Qe1}1p@p%4<6rf<0r;B4qg!|iT7r7b?I9ea(=I#5hJUwATWm8J{!Jq40 z9wnEgUOvkqumOk!E>xY*-eKc>TJh0k+ldc@IT(w73PfLS7pQCG-}qi%;=}3brhg2l zLKFkZf9y+)7jiAR4aWbN`F-XgvS` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ace1850674ab1d548b98959a83fb2a5622fdb9b2 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y&YU^(^y$-S!TmNyu?G$uNKa1($|T;L38L6bg8YL2g8_q-H?td1 zh_k>WvY3H^?=T269?xHq0u-$Eba4!caDRJkw@`xuk4qp&|Ns9fcW1gNi?L+td<)Z@ z!R$Qsin+1_gP=l#p2Aa^qjK)=J(s*NS>5rXwBBJR*x382Ao@Fyrz36)8Z$Tu&Fr5DWje6CC*tC~&ZB-SpwVyf|yGS&03E zmgTe~ HDWM4f9eZV$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..ecea1ed30f6c0e5d4ff84ab38f8d7ad98091e0a5 GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUrM=X+HAS_vwWDWx3yX^IR`9-i_wLGanc^T$wbg2|Ut>Madjz`& zBqk)dxw%c9Iu)qT%`blqkP<8j@(cct1{hS=&P)PIau#?*7BevL9R^{>R@|yrSwPXLa+-nbHGGe5VGTifDgxROhz0rsU}< zZ$I))+4k_qTsecJ?aB)Cmz`p~VYP@|&QG?0JKt+(q_u(N-Nve`pTB-%c&U)IGUhN# zlk$-t^Vm3>7=HA$?_gKDsAP4Rg>^!o-YG97dif4twJaBk0R z4&i_U{{&SZv4~ulk;s1{T$tX7 hhZSj(23NM#GIq{T6gckC5eW1fgQu&X%Q~loCICg+ol5`! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/meta.json new file mode 100644 index 0000000000..2b5f49cda1 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.0, + 0.1, + 1.0, + 0.1, + 1.0, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..5455be6a216c809b3a77368dd2e4e7326a36520b GIT binary patch literal 2084 zcmZuy3vd%v6kTWwZJ|Qt>jzl2{Hon#ck|nXrlmG1t&kGhC}sHA&F)LOHpy-`+a?7Z zB~nTq6hS_MKNztFZ5lQh;NgomKok;v-|Fzd+xpG z-S@W6UN|!)`O#zqK~f6xEk*EN3a=T7aq$1x03d~@8l#|}PyG_U2KBYFA5F`77h;H~O4n+;pX)#L3SUruQM{;RcDcV-!yww~Ox zb?(en{an?E&f>g;)Pl5WMee@@>xH+`Gyv1<#yxmS7N_ANHNEHvxG&LfYvwAFSl zur~gRY%!d_^HF&7bn(-q#x?Wz=?3m7s^6Huw|&R5?ThzbD7-T9iAA=> z`+m-nCr@6wXxMn-SzNf@qLMe=maO z6WJLwybY3z3XAV41Np3JdlR%IiTU&W2r^`Zat%PXyge2{;xF@#61l`S+r$c96~hTm zpbC0Lh(?gi?4Zc7QAz|H&2SkKo@7|L^IY@W_W*u-2=#^*1QK=G172fL)4HF8*X zR!VYa&;%L0KxWXO*W>e>f@Um2Y=X~#P#C`s>C`m7k z1^8Ks7iC`Xp$aYI6e?vi2J?s}=oM|YK6anKR|lwwI>?A>Qbnk}UM1@Y+AmwHpmT37 z4@CPN)gn+A0l!cwvA|jdd~#aMon!la#Y)K&se)tGzyrJx=7-V9zECp@Z1z61Qnj1+ ziV+W}a34zMUH@xyUp~s4Ncyqh(5;W}K4h#;1qj73Sp>FH$)~_##+0BYPGEV?6nSK{ zfYURa6W5XijcWl(;xq+loN;Lwqef5Yjif%tQ{eNR z_u3u27Zl5kA|0vMDubdm23kYuG`)ytf#iq1rI3+?ilQ-8QQicThY~VM+dExHpQ!>+ z!KjffV|;D^H!bX!sD*#Pn$S9z(?Do7xSrySxK_vMahd@-xWon{MLBgeO>1NRe!(RN z7zyOKVRf(w*dCE0&}qH8rN@wgGN6b;z}-o}pV2|;O@!8@g}SNx)sd-IHf8_XGSv@~ zA&Tp_nWG0q#2cOza0dNihmSJrJHUVs3LwGb$$N=C13zR~fhEULGV_m3T@UR;6Z3L@ zzuj~#E2FOdr_krR(>2HCSNB)XxVzjj=8b`yMt-?{?{6Q*TMlp7e5LaG=`iu>d3?;! z)^FaKi|n4zmGrWXzHqMHEAbC^)jee`x!#d7uw&zZ{UvioHeaLacCA*GHg|vb(u&5Z zE3a%*9rX=cnmZiXJ$7QZ^G!?Qz4)6YbJ(4!-L&=4YdcoHG_-2KLf1&toH=z~=eQf6 z92in`eqA(y$qA}-@s>L0$+AgfkKGa1ugn1t0x$htH{U72ZU?&h@we&qhjlRT8 zwFwDMCn~fK9=XHpx=X=SUz^(_zg2CE!%r!Jm=nhz#C!bWKGv|{yIA$#SsDou39&~H rJ=k&Jz|F4e|NIWZ4j-p9x!;?wouD$|MXT8yp#2PTD@E@bvU_NvA($#wnr(!Xc+! zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..3992fd8d0bf0c7dc47b32188e72608c1c152c09d GIT binary patch literal 443 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/meta.json new file mode 100644 index 0000000000..d0d4a1f0e9 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..7d061a70286861f69ee5a041d0fcec558a9f8e43 GIT binary patch literal 1067 zcmV+`1l0S9P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1Hef{K~#8N?VG=g z6G0TmcP#`hgpf3XB3vto;PpvkX_GW|{ts$rZKqe+i;6)m-r1eKAmrCABu^#{$rC8 z?F{f${?5Sx){rqMSm(rh=yS(Dq~cuM|M455~nuF%l-ont-Vb5 zQMAXlAJTu9jaVgJLF46zD+nraF&L^`U%6}IDz!;Qinx;3fE~z|R=rtHA><?|)BC)8B;XP*VH*@ZU58hNAr1R=3gLRPb*@QLzu%kE!6_h9bKE zwpq}7u~zOz|9#R~`%b?HNL0Z|-fK97fn&xLgjJ}5vwXEZ9*^@+8+`1$_%CJ!)|&AW zz(i~TOvDzzgo^;q8!;viT`fbMlL3s5Df0JcApXBMZ9&kI5J0nqWjClnYxMge>} zezVzR-`-r$9#1awR4|}jf_z84%ekDc6J!Zmmd@s2Q$bUEq_dfwL@9tA{m}VvnO_L- zx<kzD0`#zuFX{?qYq!KK!^BaQ%&j5Q|1c1(lLUlgBleh?wBRao! zK7O~2XMjD*G_=je%jJB2*J<@Cg7*RKX)S;**fs(2foH&fS_v>54&i+Kz3r795srv= z8j}EDuzE$5TCio>W19t0pU>|s+8Lli6`bK-@Pka7|1dmncnP3`1#rW8BgTY<1t5k6 lAch4Xh6Nyo1t29!{sCvBel?CW!+rn&002ovPDHLkV1g0(><9n= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal.png new file mode 100644 index 0000000000000000000000000000000000000000..baa1de12d8ca035e2744f842e1e9d397b694d6fc GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUQ<*s~8K>>%vUnCV)q#OwDThiAyP&a>lCY@AyLa!dESD(`;tX~V zm^yVTP=~{Ml>#8eUlQaO{2v7{T)8u2AyA65z$3Dlfr0NZ2s0kfUy%Y7Jn8A;7-Hdn zcG5+@W(6KsU5`fIzyHt2=67>?#BSO?SLeuEx%`=%<|Y(xJQ2nvY}n@TU)`naheVYv zXZ5S?Wgb$O*IiUS({jLu`_5#)b2~q5Z~Ij>U0&K{LDa;TU2VG+Dpf^OzDi9vefPtv z+X_2dW?f&-rg{9+jfS@~pZxC@T%UL-d&67FxWhAcS5KJ#afa1e%R>{E2Z=Qb$Dhbn zoV0$sZ_>KPm{-%>%vUnCV)q#OwDThiAyP&a>lCY@A)TvX0-2>Vz+%hsU zfXcUhpRWR>_)3EOg8w4}2G;|3P5@;%3p^r=feMa*FymBhK53xf2~QWt5DWjalWz01 zDDb%GM&v#E|NmWCl#jz}wcp#++g23MSyX6!@LAHtwIX6kJdOYSJ46a4s`hbM_q(&J z^zO+n;nY@KvV|*CrFl-V=Y6Rx?Wf1t1pDqyeA(5uTcOfEWWv>K2R;A8uk)Ip2xZ;7 zFSSJGbT;$0^hy84jN=YBT~D}eyr<2w{JX;Tk2BfUS{|BGtjVufxGO=A zNB(4-*xI;?scu#K1+5H$lvB3qT%a N@O1TaS?83{1ON$omUaLD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..9e3049e07d7a844331a3a4f1d3b659746f2c4727 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ehi z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYtYCJNg$ezzI&kmaH~S8|iVp_LcV#!^?7Q=S z*R|(7m(~8HR{VZGZQ2I zw4JX^$y#tC@t4(s+{psXr}p#nl%8F~!_)NRYS4Yg%wzv0)8?k`VHWpTzL~jU+F=>T io}ybR&PuxMj11R=v?F4y!$pBEX7F_Nb6Mw<&;$Um9a~)h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png index 7c51ef95edc813250a5be0e49f38c34c058ab87c..99ef104517d4a537dba914e106da70a86a90a774 100644 GIT binary patch literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij=0(?STZEbA>ETz{pSx(B6&I#dBQj|>gQml>@cQ^3J%*zk4h}6?nbo0J2~D)Iu>l(Fyxiaykdi40 z@(cct8!(7(dUPGAjYo z3%E}I|Ns163ln2^a&LQzPgKBWowk#c3PfLjoZOZn-l3wHc~n_g(V6{`*4j80ajykjMp@tgaQ*{d~ zh4h#umXx%sv`@?kQI ze;VV%oBV$n7(@56b1=0ezW6<>uYKyhX0b^TUDXRJ((P}s8kO~I7w^$HxxeXKu!M7R zg=-VX`+Giiv c{fKGx>ZV#TUwjz2fg#4=>FVdQ&MBb@0BeKBDF6Tf delta 848 zcmV-W1F!sq1l$IY8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00S0DL_t(oh2@vqPZL2D z#(!Lzy0lOzptMw}4Hk(3(nyR(A(1x|UrqGS^1tBSM-v`Mh>5`SWYI}J% z#dJK&m!BQ31{CF#Pj4lF<-=nLw#p24LdBl8%f&a6wOZgGlkHqWjKeP61d< zrm4ZoydU53vMCjlV@oOtD>7o|0KMmHv>F!}jV2k5CJ6?E zoE+~pWn4=lvpQq>&*%XY0bisGU!;qHpuO^k;$cSui|G_6r$x(9XgvTH8gPS~allps zTJZ^(JmAIn#(KeVTxNBK#dOM+gf7!hH?r8Fex8WDbf=5)ftAVev28^YCo= zTy0|Fq?=>QO^<8|wx2 zcGN-`w#x^u1P-bN$`)FXy8TGq4bct7!;II?D1XoC>%GNvig0mOcM^}vr*!bqS6U}|dW3hLLf_8urz%W7dNj%UcmGftRaPx2wPrt8bfCARXRx(D)GIR<0H z*GUOUdj>jy#ydffYz899Mf>!j%F1cL@H88Y4U^x>SuQjf8&=zPW9;Vip0AnyX`g3z a8~*_K9~+;Jg0*A-0000|N+ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..f231113db2adb0a3b376674323c752a5eb1150b7 GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUEhSPrqi!@Be45<4KTv+AlCW{6`cVZ1g$y8YpJuG2BrGaY9K;#y z9x!$4)MS$}z$3Dlfr0M`2s2LA=92~r{`Pcn z46*R9o!rUStRUbbzJ$A@>W}V+O2;Co&3wPXT$zmPc;PNlXw$28vNxl*_?a~m)T7CY~wvcILYNq zXRX`1s8h29f+w+PZd7k^;nex~aou&U6QBF*R15f(-X${b@O+bchGmvv8Y{!>i_U&q zIBqg0WxF*+ExI;==^IN_i^_z2|B0oO-&~e^quG|P;^6g3_UiGdvuc@kUpG$S6-fGV z&XOmZ>1yc4_Zs=W7Vl5(VpX`G@31#=Dx<@8#)aY&gcuL3_pS5%CpUvJI7#zE@cGYd Z&O4M3PWbh9GcXt!JYD@<);T3K0RR>Ku*U!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..a8d4fa3db7a8f1d554cf622267cf80fd6bdf2c11 GIT binary patch literal 597 zcmV-b0;>IqP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Tz=*^{F!Tu+8IhQHf--hwU}x)Nup^;901FGMkf5{ip$iK1>^RQ3 zQJnviB0C;(`p>^|mhA!n0001Btd!h}7-QDlopMX8%CfxXep0sEtr&kYnW)7-;MT{~ z3ZBtp`z!m*e?~pLFYe4oacLgTE({NKVQK}>=&}8v_?ykfygZ(moB3g5{3Zvya<|St z9U#WnbbuF1fFlWBv>ZSQa3sM?8wUU%k^@2zax#`Y zgxviLVl{cL!+Cd_|}Oy3BmjKcEUuqQ#Y%Bwo=0zwuowK}o!360c-mC@#_wC+s6`81-`ibLn_+~i1EAFzB8$3z6p()k7m^30RR91000000FVXV z?IhZh<8HF^`MwFdA3!^@u3cG)KF$SVX>x$HBb${2yifvs+tMzEA^i0000$P87vA#<}T~k2SkJ00000NkvXXu0mjf-l+cs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/eject-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..9f825ee56a4ea942f174759b7b44bab714f51631 GIT binary patch literal 648 zcmV;30(bq1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TG zefDd3|0hL`+u^s9mlRrO000000001G4Y`eS&b{;Q4!7ifI2>N^epc4=>j6~T2Y0D| z+{M<-viC&d%^zJI0y=-jk{~3tRUM|{-5~a(iNEEU*^-< z4$gkG0{n1Eloe!~%BKM=gi=fW`b`!Km#P5k`4qVDuXrdHF3CcE%3nd>+%A|0@9tf< zew`t}dj2wrGrtbg`KBjd(ar~9TK{d#$P9^5@WWS_^uXw+EsuhVJg z{N9{^Tn8YPc0K?A0000000022sr6et`c0H~ZLZJP7XBz*?Jungh!I?spqgL8sw*Hi zSv%|Vwb21csko5zx*YB%>(dngn=Dp=DHWOX3MiScuImAiqMcs?o)6e$-o*W_@gPVq zTB58VyJ&u|_><+i&mgNc}bKNWEag>7fza5>ep|w*yN=uP&;2;HCfZo z2b6&41Nun2^0f0+;o!r+l6?Qf^6)%*Gw{h|;^<+F5IwXp9*=PXa?^f7CYPjvw_W~o iId22n`2di|VDJN?TPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T3HY%;1nDp6CE&nG) z2^n~KwqN3?&IkYi002-|aF4$5rCj$p6gmyG&fb zsci0e;kMc4Y=_lq)xJGnwfD30)}K1W#5MR-Hg{|izhwS>74Ys4x7DnGX#9#5V4DBt z0umR|Noxd32P8V7lU97|{9!FN0&+$~$qLA+h>{ghGylOCpk-(WXsMBZ&MZiR&i%#A z{i&qSkB3(K9_Si+V{Lldw@rUNGQURrUKDPq2M}ANv|GsBH2rfaRZ-TMl ziX-qRe(Fs)*7zmjo8<3Cz|w8Wr@jOa7f^z$fTcWq{hxcbZ#yN_$UkQm^yT-z#CpDv zX#7&Qoe1mv_i6O}Axe+@KBoE8__p~2000000001hfKD*~v1TBHNImW8BH0XPk@3dpGlDnQB54nV%F?*m+;o3774Wqq@t ztkuauSTI##xgd6JuUMl3@~Kn+BY(K;?*meA!m-Au0+hH4FkPSj9}NCJfZL8CM!q2$ g9{>OVIC7)WH@_>Jx0IT3l>h($07*qoM6N<$f_=9v=>Px# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/normal.png new file mode 100644 index 0000000000000000000000000000000000000000..23c81b1fdb8fa48605cb613e16bb93ed20d27bcc GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijK0(?STEhSPrqi!@Be45<4UrE?FQ~hY5{LFXn-We+?35$wcSuRr?#QFJo zWw3j|)TvWJCbF(k2T}qhL4LviQ31mPZ=oisO_)<~bwzqTNL(%&NSv-UNfUn5>8O?+nfTv4I(86(5t z3l7Di-?q$Os3<$tQssdCRe=@k!IloeZ4Mh4jg%(r@897t>HjS~1J@~R)8;&9Kln@G V^}!cqaGz$Zq$DgVGIi?IVE2G& zecnJF`*-*T11bKJAiv=MD1hP0of!*(Qk(@Ik;M!Qd`Cc-ajG_-G*IxEr;B5Vh5y+} zk$f!*0<5_kCSLt5UtVRb%%t|&{Hf67s(oya%ZzS|gjTU%f4H~!Lp>w^Jb%}DyASkz zTg7;#WA_T}3y)(sY87OBO!_sK%KU13?9fx9x%AneWM8yJn0Ce-)saGdo2mY#v@6t-z|p0j7pR4`mEeF_u; N44$rjF6*2UngBnylo$X2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..9e3049e07d7a844331a3a4f1d3b659746f2c4727 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ehi z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYtYCJNg$ezzI&kmaH~S8|iVp_LcV#!^?7Q=S z*R|(7m(~8HR{VZGZQ2I zw4JX^$y#tC@t4(s+{psXr}p#nl%8F~!_)NRYS4Yg%wzv0)8?k`VHWpTzL~jU+F=>T io}ybR&PuxMj11R=v?F4y!$pBEX7F_Nb6Mw<&;$Um9a~)h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/any.png b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/any.png new file mode 100644 index 0000000000000000000000000000000000000000..95dd62efce92df9cb688227b25ad2f191d2f5f23 GIT binary patch literal 2019 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 FV1i@+2s{7) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json new file mode 100644 index 0000000000..64adf522b9 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062, cola and any sprite modified by potato1234x (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "drink" + }, + { + "name": "snack" + }, + { + "name": "any" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/snack.png b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/snack.png new file mode 100644 index 0000000000000000000000000000000000000000..76d9de468bec1a21d2ad14299b26d161aa8c1385 GIT binary patch literal 1916 zcmV-?2ZQ*DP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2N6j`K~z{ry;f^X z990-S`vzfQDFup4?Y0)}f|kCKTCI)5CMHcOYGN?0#y2LWF)?X0#veu#V>JFSMr$={ z)YM0;Hfq$g+J_=-HBjg?E>#Mpu;9X0VA-90jOV*ETZ6mXlt13&?04tR%y-WBxOd00 zfB$~`ckFL`QP*MR%!(8&v^MBON?8Z3op3266|O)61&E^%n#Bpt1|$S@AxP3ilJ@Cc z)#7a0$SPo8mp1t6m?BPm+0-IruXS1s{n~U4iBPMHzpi*t6Ga=2DqSg7V z*z~=01E$4@NXe9x>hL?Qc;Sub`PB50RlwGDTlEH8i`rJw?V9OSZ7D)TDND#bI2fTl z#3;kWBr!$LQQA0f5|#vd&;O2(c7L8BKwi%nQi3VVEY{I!)S4-kI!lu&F_M0{c9Jmf z4B$M=qhiRYv+V-CGTmtr7L5=QDbxG(kyU^+pw#lWD_rQzC-MlFVUHHZaICNor;EA~ zC^&&Yeh&h91H=dd&M|t7& z2JXsZ7!7@Z@v(0Z3hqHT)Pd0XUlFe;XOuC8!|nU9{+-9*ZMc%xBo@p>fNVdhxd_<& z%oy(7mO$RZQJm=5fx$C-&|h#hx-D1ZxW%W?<6eU3nM0Ty=_6Sj^{X53{e!P!;1EkA z!;<9B3ABwemTztDFFq{qzPeTGdcgD9mXS14C1vnPvQ81qj1gh<2nSe zV6qD?Uo|w1T~2~{GLG;t4;>jK`spw;@L@B&Yl_wV88@NY%l2VoOYszQ*Hm-DZ^3c>W9ly#90zI-LL|Cw|v43@O+TSc@7w*$Q;=P$o>^_ zO9bvaw&007SHO1n{d}7Hn``!=bBf$yW0x|rWfeh`tzUH}MZd zh~*rZnE<{ZS>Tpxz21rsde7pK#l_IA8joRaHIf#3m|k_RF||=0m9N~)YiYJ5Zfsx% zT7JO5&wumU6ri?Z=Exy{DU&_Tqx7>s11j=wPjzGb)G>^oK8c!pTd*kH$$sd8KXwwc z)~(=|!@p$h?d`bz<7?qvD^aI=AbSR~{ukV{@ebYRosWP$iBw%ZSHy`pH!!yQ3snMR z=oE4WCCzJLJ=%@xq{jCoHA0xecrb!xWk7FV1Rs6=Bz7(7baFytl~zfry^zIUo=;JH?`&OcATN55Xz72Rnm!|BHPY zJ&;4d27T3%Ri;xRlE{)64)OCUy{5#ZttpDER+`E(4{Wpw6k@0Su`7sozswYnqX~7A z{YmsHw1o$V^XzUN0h`4DJ3YXIC}6WISQx#Hdc3neaL_u5zlOsYA%Y{}nf5>mJW2PQbr?J>1JHSliifuO!Sm*S@`2MJ-XzE&Z2#n52?{`5q4z5V?Bb5=|(dQZba5 zdw89|xgAGP_2^ZoYONx!#N5_OEO@vI!Pom$nuW|k2ziiE^9WJIB1q=B1Z3}lP3v{v zJU25?s-kZj<+tC(W;8lmQYw(5imi#qa8(Iw&-p+ojQPdJT<)D63!`f&hPS@D>>d!J z1cv__tZONnxg>=|gj)d*7! z!={@^mL-gfRu(x=N1|Rc@1;ljneAU+<~IEQ2JjCFaWOtJkVGy300004nJ@ErkR#;MwT(m)6EdAc};Sorr&YAkCq;BjR>Xr?ozlWX(;|BJny zH8q*f%Pn`EJ=^;UhoRdJAFX9qw+Q*n=G@lH`XOSvGWU#4i+1q@Z0BCY9?`ICp6c4U zj2mCi$~*mQ=}WGH;#(V*{ZEF_BU3k26;S!?_DG6#^XA)Ds zaqKm0kPn)1$h?r_yY=dYOh+81*zD?TT*0&~bHT|c{f#dd&J_wg(Z4d?!`aU0W6fR` zO9`CR1DJN7ta#N%#A?+Sjz8hSMnzoRj{r?s%lJ UktZ&i1sGfmp00i_>zopr06~z-3jhEB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..2a2832c15df74180497cc7b9e80ae130c58f97a2 GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~;1^9%x&N27x5!z2o&3mj4fZ|NsAAUtcdGA`%`R?$#gK%E0jM-McHx zWr~A1OG-*YLqmn5)s7!OK6mci<;#~V&z%c2=Aiz@g+NNIB*-rqs2vk9FkU+F1gL_u zz$3Dlfr0NJ2s7@OnEe*$KsHYo$B+p3x6>~2H7oGA-o2w$JUegE|NpDAb-Nm5gDY<^ zw;xH!FW%eeqS4lz(wyTU(fp`Hj(wlrvT2`+WZhr-bcS#;tYo<2`*1Ov#2%K$x_X;P z!(7pWyk4ff1y_|`PiCx5YMifd;V(;W^j7a3Srbc>89o@@^Vz{R@16Pqw#y&iS!I2g z@by4Lr00WI52bb#TunMnq|OB{K}ZnRS9g8p^O|J&6joc}K|nb9?3gQeq}I)!AOrqA`+O*j5Js2L=b zt!d;AuTS**@V8{zOdh50%riqczfI=d#8`MCLBg)U+o0n8$%8+E!NlO{>gTe~DWM4f DJU!9h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..dffb34087110742827386107354be4842556df54 GIT binary patch literal 580 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Nn{1`odSG9TwiZt`Tx-O|NsB>_4OhmBH`iTZvBz13=Hqyy}PnprZ|YRq@*M? zG*mcR?fCKIbLY-ozI?gz+_}N-0aK?=HC9pr8gtX{S0a!SD+%%o2AYEj7#J@dcmhO>_%)r2R2!t6$HM|;t4$Sm)aSVxYe>?qcQImmyYcBKBwOc*~-uoXaedDxRW6RW~ z2C`2r9>3Uoak50c%JjT+zs3`q0+kX6pFSoLyYO8g#nwdO{Q7X`mCpD3o9ejaE=#_u<~U`fU8_<0qWWI5{*KO{`D@Fp(4;&Nurk}G)%gi~~p6k_}z73^`t9Gr^ z_LBYeZ-wZaIg`7acEY3!2Z?wDxM4~^XOKi%KFdBN*CM*EhXc{baQ#sXu4!PC{xWt~$( F699L({v`ka literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json new file mode 100644 index 0000000000..d0d4a1f0e9 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..f98b47be440488d8d9fca04cf96f039eaf142c9e GIT binary patch literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Nn{1`qXK+FTwiZt`Tx-O|NsB>_4OhmBH`iTZvBz13=Hqyy}PnprZ|W*F)@*c zhsV~|R;S3OfPtZ;q$D&n)Y{rwI9iRzMdJAJ<8$ZEUAS;zb#?Xf<;z=IT9oI`6>De! z8n3i-_9P%BR}$nG3^X4%V0a@T69-huS>O>_%)r2R2!t6$HN1ePFs6IDIEF;HznykF zui1ddVRvg!Zd+i+^{Kc2|9>{;rpg2%9oN=&&E-N_Z)XUbEBrKh=Ofgi(s*LO;GDR) z|8_r$zg-oaAFp$pSxiGE*lU00o+nwsxkTJ9~{a%bYJnn z)bD;jeirN%{?PUQ_F0_|4vf-u@5+@wa9p?N=$OhUrn{y@V8!D{q2Kj`gMKvvYyXl$|j#G5cSCJD8_ppnImGiXAA?Z`=I#r@fr| zjXD1xR|*JN&p9a6WygH`;I}U_=T!ur{jcbIm0%AwEzopr055(A@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal.png new file mode 100644 index 0000000000000000000000000000000000000000..c9be476a9f044d0032c02e171a71b2624068d835 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilW1AIbUgWUt}+`M}F*uHn~-Z`6CZdkk0SV>7(RAlPZsjs)N{D0{C|NsB` z`g#!&k?`EE@OMG8L0AMbx@Av4o2ZEdP+#)Q6Cla~I{U$`#o7W3)7;!^LH zy?M|p?$T$*5ma*h_NG#$m~EeY7$?X%+!dY2#t>*fFVL}TUIgpXV}jETxh-&U37WC2 zuFI2)LEpSwRdd0Ep6@o3Cursf%{0w9De{4pf#(O8!|OXzJx=%wn)b5+0EXKw1 z@NmK7`**{8S)|hE6e`}8Z$1$b!Oh;JZ}7dOWoc`(smKQ>L3NpgxBOvK^|pW5RHqO0 O6@#a%pUXO@geCxTUAyN1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..b9aa0c326a17a0f245e85372b7df8e52e7d405f3 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilQ1AIbUgWUt}+`M}F*uHn~-Z`6CZdkk0SV>7(RAlPZsrB{sIyyQ)g#rQs z3=Ukr3=FEOs{H)?3^ELHadD20jvgK!48Fc4dBw%KMIg)mR=5Hw$&w(y;Qu%P1EUGo zcAz580*}aI1_r((Aj~*bn@<`jc*N7iF~q|E?8IokW(5I;>slV+uNFI<{_B6sm2-iP z+P~6(#fcJ~O~rhxet6cK@lSiUzhztI--$QoExypX;YrJjMGBU`R5UpKxAIPSxh=e$ z%Y&!m*V30pN?xqBVF5)S-ZWji+!Fmz;fIS`;Ed;q=QO!Gyd!o8i+FGxtB&1!K!lGo zjo*C+Q!T@hiFS-qhuypH_s`<2lVjniDs_2!C~k*9 q662xUoEqHX)hh&AwH$XG*eSp2fkvw{ld>PsKMbC(elF{r5}E+a)1oi{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..95f1e4d33e9cd2d5317975432f8b735e80c480ab GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STm(7<`QBm2oMUlaH=1gN_pm4X_K64<&RubeF{2v4uHt%1uA1K0E z;1OBOz`%C|gc+x5^GO2*?L1u^LoEE?o;k?LpuppN(e3O%ZEckY3q!y8n}Wu_&*agF{vWgR!xalCY>q zaS&&)d%)DGQ)3uZl^FPdx_93CJ{d>}mjw9*|Hl9fn`-ZH0Hrw#JR*x382FBWFymBh zK53xfe@_?35DWj(NsU6y3Ovq^yL~4-eD=To%_Jtjh0jE)zQs!U-SOM0#((wF)v(Cr zl9MXy9CQ}G6g%Kn%CK+KLOvarD)x!Y8e0t)F{-dXu(bWTM?v?)LmnMR_831wv0PIH zmggH>IHa9UhzbbRC&XS?*?U;B;`tOe_ValcUpOfIV!rw5Hd9i_A@_Xi4-zUHj1O}N z1Rk(*Wt^d0mE*?7cf8`slFo+#yJI#UI8YMMaKe{uiSk0pGr@ltFE9M(dp`M@4MT=; z>#+{QrHm64k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E2l#}z_A^+1)~)%y`N9*1=r`>h9~ctmnESnZ_wLGanc^VMwG6Js40=Gd zeC(??11a8;Aiv=MNPxlig;E<(g0sLQvKXlB5C}7hYIrpOE$8-haSVxYe|zmVUz34A zOQOyEivQ2I3fCm>Km}`e9pZ38_Ul1o3;iWe6fC$sOXEN4aTkU8!oaO zy82md!lCK>t9%z|SLgUW6wfha+)?%0f1yLjg6@OoL;@TCZCkQNaVKkJOu)16Tt(;E fuN~sN^^Nm-{hHYaCsYE%h=IY=)z4*}Q$iB}_rJhf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/eject-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..9bb36508082d790747e6475896e9ab670b54074e GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Nn{1`)dPG&T>BX;KkL@~-hAN+L-f0M@2)JDDGuUX%itR99x!$4RAVKjVg@~+ z+Sd2wUw{;ENswRgetTYRNGe*S;2yZDVrd|xV?rk~uVc@KONHcZs2iZWU*+OBA??`Iz-)Ar|2Y`}`o z7g^_P^EubqRk6l{=zmL^K7T*|cF&XNo{dfhCns`FmYHcVafd>Ulab-4iP{1|$^FHp za^faGe{K-fxM|=c(2&@~z@w_SV*UgMH@h5G1=DX9;m->lC(rNK3E)t(G)kPLEUY$3 zBqrd`Bl(Rp#iLc$O5drh47gx))~GOS_q~F$bde+GH;(KKEbs|jF#Sm4iSyk}_d$-7 z-|PDCd%ge1;{T`DK99X%y6eFIfA1ytGQIczDCe(b@h3FUo2$fd#*-5*C*=wqf3&20 zTBI$ouI`MrK;DHbr?U@-EzmaS5oSr);T{uUugDlz$ok+F`yS?k=4Ekl(vb_g530DU z`F!)>`f^i!t+jyp=ZKB2mv$d~*!1Ib_2tva2f3o2d8VEFX2ezX|KX8sOl1ppvM+fj mC#wBn|NrV9U8|(Xe+&_#|JZl(+wlP-hQZU-&t;ucLK6VF59-7K literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/meta.json new file mode 100644 index 0000000000..d0d4a1f0e9 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..5700a9802a0276cc0ab6109d75c92ee2866586cd GIT binary patch literal 548 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Nn{1`4FY^ZT>BX;Ga0l#>(+c=P5!<4!jJClPZ*;2G5EZD_wLGanc^VMwG6Hu z3}(d)dcF+uKuvR$+P4EKfs!D<;Qy$A;em3jBv6jCz$3Dlfr0NZ2s0kfUy%ZINTR2U zV@QPi+iThRhZT5QAHJ)L|M!3Y+VkJ?6mN(*DY>luRa4}9mh+`aVU(F)n^8%+hI8G% zUlsWp&irjgPoC#9PJPTQ$D8`%WI)@WKW~I>q)%PwUdZ$FXERgW{d@KH*Eu|{|E&>R z;CkWarDqE^A6;`{qJ=_@liBowxsjGHSPo_V>bq$h`~7pFgH~?PUHVyvg{FRkOt-mITw<<8S7z`~A~GLDc@=sq^P~E-1ao$t=EbGb!wahv0|C zSJMCOCaN05oef{_v8loSrQih~iPx`~z9`%@$OAyvcqKFHDO`xjmNyFXs^ z!mgcPce9$D<;%GH|Myut$JgpX`Wwey8fJUDKC*>Azz za1-|qX1$Lr3Exlu*OpqrapBnlV<*86#XrrHg;#~E>}KyNEoJ;QQImZoQ`GnWb=LbA brCKtxP4Sa?yxIa70SpYDu6{1-oD!Meh%9Dc z;5!V$jK}j=qyPoCdAc};SooivbdayfK)^-NHEVa)+Q0wvOWXaFH?%T;e8Anv`&nXI zi(d1(q9BX1o>M#R#r3$3|NGyvP`)5$YUTy$;>41goNEt`X|7`0saf^$RL}?2^-dg) zf8q}R{U~y~VZx2JsSRzh3-2;ac(wE{gN96|!>6Se546Z+YH0s?r=66;$gTe~DWM4f{{En2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..784f53418a0efd697f0a6f0a142757ff95b22f26 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilg0(?STRm2^w7{rUR7Y7A(EMst*+`9jhe6c96nu9}D1B0=?p0BZzlCY@A z)TvX0-2-A6RFxR`fLe?BuSxfc%_6p zy7q42Ra?SwX`;fP23b|_LapzIxXex#YKz=sbC2h4*E!A3W~J?J^d|No&<6~ju6{1- HoD!M<_!Elg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..9e3049e07d7a844331a3a4f1d3b659746f2c4727 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ehi z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYtYCJNg$ezzI&kmaH~S8|iVp_LcV#!^?7Q=S z*R|(7m(~8HR{VZGZQ2I zw4JX^$y#tC@t4(s+{psXr}p#nl%8F~!_)NRYS4Yg%wzv0)8?k`VHWpTzL~jU+F=>T io}ybR&PuxMj11R=v?F4y!$pBEX7F_Nb6Mw<&;$Um9a~)h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..72f841391955d1b654effcbdc952afe12e0e7b54 GIT binary patch literal 436 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUW0@Gv88dAbV5wnadKJOoz`!t_n^{;?#8^qm+1c5^z(8GHy*P+7 z*gYU9C}`@`sX%@0$ptb%O0XozFZe$iU{GBO>_%)r2R1cVubtQ zIEGmGPo2!o*P_6~s(tm7@YjFK?{3o&e37?F*i=n6PBU-^i^0mJzhdSTpD1U(YsASH z-=(?7>4s@5yV%F+3mls_=&gh;f0R!zbnj=O%vHdB4Qw2qbxF zKAYlnqx<_6^^Sr9!_9^2XPi#WTtCNI_g5lyh&Ksjs?lt&5+*>(Gc3Q!-W0u@6 zoGqpIu>aZ4dQUzm*~dYNA?U~YC(l)0w6D7I-O=D;km$amSot5KDx3IE-&q9oID@CF KpUXO@geCy_hN0O2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..7f630c601cba622915de1d62c21077cb2638dc95 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}z2D=BmY47;JkTA#G@7=q1SC-2Z2XUT0whttKb9)Ss;w%aB3;quU z48i^tLLk8ckH}&M2EKzJ%(!D>_FJIfNlzEYkO=p;Q*R43EAY6yo%-j$xcQ4kj$(5r zP4`njzI@ZS4b6R#M?5*4Cj8Vq$mEjuo&B0lhiU!3dl9cWEIRxvRXt9va6DPfYm!rL z@nEMY!*R(MV%e^I=hrGc)qd%<{NTLu^9g$&Z#m3(el3H={bonzS>a8e=2+USXOaGK zvtft+3}qI@6Dpv~hZeVpss%en2( zzesNQS>Gzk@Vxp#)`4gLMSYpu6Z!;N99*6-f0ijf;+V8D3+O2ZPgg&ebxsLQ0FlL% AtpET3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..bb21e6a5c5b10132f14a3cb1157348b383011ea1 GIT binary patch literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Nn{1`B?5dxT!Y;M-o1NwWw}go5a;P*`=(BvYOJILl>BG?^fQp+C<*cl{tp2R z_nP-c0>wBBJR*x382Ao?FyoGi*>8as*?PJ-hD5l(oqn*W*?`9-ll$xc|AnoaL^Ri| z^$51I{PDEq+7r*VnHJu=XKHfHY?`3S@zehxQ`GMtf1J)XS7|z&rdT(wGZ6LH-Oe=O_G95A{y$v} zUH}CTev~WD+9_;v;3?~olY4gmS?|Fy?X7s#_3ezRii!vJa(VH&aCsfF&JFB^Isohn zL#97z-b>5$9t8khVE)|VVBxx#z6R$k!xYT>t$K?3L>r{%H*Q%GeV`M_e(|!}eovVi zM^T^f3-c0dsPw^e2~7$>oge2FFPih1g}qTt_NGb96Pqq^tEk=B;CiSH x$Y8l>FLQ3E$YEv?UJiyX!_K%YA4i95`-LZGiR@U}egzo144$rjF6*2UngCx@!F&J! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json new file mode 100644 index 0000000000..d0d4a1f0e9 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..1328a3b04147b4f3b087c1038b390f0e18fdd973 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Nn{1`MFV_7T!Y;M-o1NwWw}go5a;P*`_?R51e9q!$M6V9v6lq-1^)*F1}Sf5 zH=qz_fk$L90|Vbd5N6ylG5amh5++X<$B+p3x6>~2H7oGA-d*y;$)E=j#^s#HY9F^cHNe zbxd76d-l#<^SKY)FkYvy?}?LxyN2qk3(8vZKGI+Q#%y@L@v_(R7I!&!`|$7Fjys#y zdVD(j`M?&(`{!8`-bjWE#D8*22njII(wHIor|!7bSKA90zjGhtT*lkM{`uY0azUo) z0y|m`sIurO7H~G6p3L+o{c_j6?`IZry>sDs^RJ#yui)2zOBYsk?)}WW|Icsco&yw9 z-0=IqeQ(~O&W9Gp8`?>B|(0{|4{+M1Lasrpd4p`M`SSr1K&XqX529``z=s#fv1aO zh=u>zNw4`1D{#2Ij=B(g<$L{Y#an3{OC!IfAK#XF=wq|Q^ji@=RV(Wc`wIT^k2rj5 z9^ZfN#O94}nQ!da!rdUOz}jNLXrX#UrNc_`F1x1fy!DojTyqjQXMPY`Q8DpCVcG(Y zyuxV{ZlAixlk>;K`LOSe^Nn%)U3-=(Y-lkO>R80OMC@rp+JXG&2Rl62i<#~^b_$s| h89WRU_gnducUGkGJn5ciIzYEFc)I$ztaD0e0sz=si6#I5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..a5d20fa418cf68af1e7a1d43b2a0a073a42e32fe GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?STW0@Gv88dAbV0jh6;K0BzotwFajY(Kk#8^ow*gatC)Tuy)@ityS zDF&XBAiv=M2*4n8|J*sCIA?)JWHAE+-w_aIoT|+y4HRthba4!^@P9kWo3BBEht>5B z`;Py$y7HY%R}?-!#Hr|OwP(|dNk*rq+*-9gn)h9GQ@P!Iua#3bI98W2ZM$T}a)9vy z6B923ALkLSO`I}PXAEbs=uT;|e&~N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..9e3049e07d7a844331a3a4f1d3b659746f2c4727 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ehi z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYtYCJNg$ezzI&kmaH~S8|iVp_LcV#!^?7Q=S z*R|(7m(~8HR{VZGZQ2I zw4JX^$y#tC@t4(s+{psXr}p#nl%8F~!_)NRYS4Yg%wzv0)8?k`VHWpTzL~jU+F=>T io}ybR&PuxMj11R=v?F4y!$pBEX7F_Nb6Mw<&;$Um9a~)h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..6b9b633fe3cc38a843b32fc69469633a574b4489 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUmEBc3b|z%5bz5<)TA?98+Ct7{nwPPXlCY>q(d<$M1%;(6w@sZo zHP}6%KuD>iqy(t%Q~9FLKuWMA$S?Rm8emXeJ2MF=$ywkLS&h}O!Par1h%C#LlYhG_U;;E3e z@)5_C$J>7K@*4l+Y*SuScyxQ>_2vyr_iYv4YM3i#d&rq1qR@M>!!)UYZ?)%5%w(2k zoakhpE_80z=hcn;Z_E@$mpAqmWyE|r{A$rd)g^XLtba?THt65mIh>lYcm^*}=O?VShl-YU@L&`mlLkc0t^ENPgg&ebxsLQ0A5bDdH?_b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..7847a34ee1a968b6af7088cb4ca951f472d3f2eb GIT binary patch literal 809 zcmV+^1J?YBP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T{M4yzLp6A=Xq1#J{;C53;4u?)7+*1|??jEHz;KrNIsia!uZ z7Z3Fx80WjZk-f`ie(cV>G1>Ql$D7$X=DYLe?ds3#78uhJv%lenPsaNMOnL`@wJDQ88`lHcEZ#+J%?_N3J7Vu#@9NA8*K+NT(x0Mp(`KUoFrbCI)#ACndj4`<%^sgo$BrIRy=U-3Fm#K%SLwJ(wR~Li(jm>}%{TtUV z1a}&p0Z-@pr8t22$vaDB8M84BQtL+r0MVa&_JnFmZGPWSANCieNBZF;Q09U|KPvyQ z@VtKYf@(?~Tv=6HOSjANnX~8rEkZH3x0p*HRKGkBNZbV&2v-0&V0jYUO-KO9cNPf% z`OdO~evIvszED`|nokapbzOzUG$afZJ z0GjU4|6IPWe;2p(!~W&}=ZUBZW~K3V5g?-_W|7I zqj3gc@Ys&3+n?{m8j$My0B%^;0L-=>eBJ*1p3VRaKIQ&=ZlW_F_xAy*i3$K_Kj-%W n97Lrm$Nsz^2!bF8nNaF4Qd7jeZW&^@00000NkvXXu0mjfjstLt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/eject-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..45fd62d159457d7b160ccda049b4962ea303a48c GIT binary patch literal 871 zcmV-t1DO1YP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TUg3 zl1{Gh9~kGm%;4R^?%wXs%kyU52ZouKW#_xI-#0ttm{Ect2!bF8f*=TjAUJxxp3++X zL9u^Iaq(zv%M#+@aHtPooz>6opVEly61zS+9=c9Pfml)P3)5fJ`si>8ouamJuCOg$ zGXVXK_KS92ZA(!4Dd^M*Ib58rDTrDh9ov#R>p<+T*?8;$JZ50j`ogrrodMD4LumiZ z9NRPtLH~rUD+BTVk6-HR^L6!dW?mz3jku*rp~~S^eblzIv-rRnod2q4&f}1AKfC$!qD_9 z&w!1E#Z(+X{NmHKw2f>y4notfWB}Y>*nDjxrH+0csxK##w8r$qL!eDXi29YLDi)rP zyW2KW>h$^x^?U6}+P-#Ug?teVQJ?H#C&m05Z(CuKB*m|IY7BU|dQV@!vuvY(eAwJk zZ?@i%kK;QWI2a5PO0&52o8ZlWGN=vccDovfF|y#$MyJye1E>vnuyQx| xgv{IRjj#<(e{eK>!j))LWZZc71a{jRE|6CyM+&#Y8zDLF3oll|D=Hpz%- zDd!{8zD?Zwp8fFba_-M}t3Th%Rq*FfY!Pq*5sxH!*phlI4;INs?up-$r+e`HrZaE$ z?o5lb+nMy>`qJyKPiB}{!DL;pUhk7{ahmExM_8c&Zmk=$LkN? z+*~nd{l5P~p-k^?8hyK{b>QW1?-gDfs;9Zc8`f2S2#UP%J9Rdb%KkYO@2BT-1s#vS z$@uO;-M%+x#Uj=T^@cL)ZCw5;T-A2kzOp}0_AH8J6kg1~@b2o^t!C1E?PgGu zU;W74qThPDGsW<9H^lU`ve%R8Z_=W(K6P_o^A-79j7FV8!l z&%M=(;p)4|@6#VW{B3Lf;6LZOFqQaXyZyN=TYxFVhGs}($4v7<%N0Y)gcMP c#o>v(zwu8n&*&c5x-xQF>eFivTmm}u3RTvB zuQGmcpZmZo-Zv%jkyi_t4IXDp%xx@{e>yp(AR)uZ;L5UR?T%)(=Xf6-?sGoFYv=Ld z@cV!&&HxsB(-UGBl#LJfq(d^QtE4NLZIyKlm zpg>5eq@)C>DgS9o4UiHj3Gxg6j|vzbD91_yO=u<5X=vX`tXOPZ!4! z3;(l|0{L1LcwAU>k9K|ixBV{P6<>iH?`3-p&pnz4anYLtY2>%5&w`XDr`8L1zsps*wcZfE5^H~*p={MKbGVHEmmUpXo+a{i1 zyszz|oW$!DZ&(hTxR8?Y;n?TH3gYvMn^(kb>)h#hb;85?6?+$i&y{-Olsi-MLi~g$ zHY{ED6fRD&VrcoUrO5K=Ttad7m0u25B)=Ier!y9;uu_=s!RC> o-fTSLHRl$a#Ig|48PE3FFI=Vc$nt5Y8_<^wp00i_>zopr0CBUVW&i*H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..9e3049e07d7a844331a3a4f1d3b659746f2c4727 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ehi z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYtYCJNg$ezzI&kmaH~S8|iVp_LcV#!^?7Q=S z*R|(7m(~8HR{VZGZQ2I zw4JX^$y#tC@t4(s+{psXr}p#nl%8F~!_)NRYS4Yg%wzv0)8?k`VHWpTzL~jU+F=>T io}ybR&PuxMj11R=v?F4y!$pBEX7F_Nb6Mw<&;$Um9a~)h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..333758752caa56447e477a49a6bb54444cd13fae GIT binary patch literal 436 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUr*koV=~a6b!LV6?<^K`i8aAeLCXB+OBF0Ke&d$yT1_tWt>cv5v z!R`S;K|xceP6g_laoy}9kP<8j@(cct1{hS=&P)PIau#?*7BevL9RXp+soH$fK*6`3 zE{-7<{!=G&^R+1OuxelZB>eT?^1ItK1YhKB5;j$njnfR=!D6s->93eM#V5*{?;3IP z#dm4$ak^pJ$}aYC`U1!14SK6%L~Gx-^p>Qu=R{Sp9AaGH=kSTS!MTZFcHS?sIRZ&u zn$M;<-RS;)MZKe-z;JV+`WdHFGuO{?*7!Y#K}ROb#hB5=(dx-!HJ;!M?#v6{5;*qE zn0ut!B9$xICsNLJ0*mtn#Zvw%zP1HlzxX6>onW|lj`POolzR<+5BFA1lATsC?U*I^ z3ujB|J?wwBv)+>rO7?M3VhH-N{>gKd7wxOAe0Mas7$mx{C|3T5sLCe(({~mDJgTe~DWM4few(H5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..a554a13a0e6691a1bfdf4026131c6fd4d0002a9a GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=y{y*Y-lR@ZBd&dWcggNGZ@7}$;vRtM(i1SU7{2qE^>z5Leyfs4NI}|>LH%;g?G`jz;-)i~I;;MbG?zl7@tkkd2 z*P2ih{!OZMfL~&Y-$RvZwNg7G;`;F|2fSc|HWVAc=M0p@*Bs6eEXj~nAQt4<;)rR YNgdM`dI&110KLiJ>FVdQ&MBb@02jfdRsaA1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/eject-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..389914fdbc753680028eeecd5f559627575f9a53 GIT binary patch literal 490 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Nn{1`6$5-iT>l^Oy~!Z-?%lg9%Vmm#INv1cf4ea^*gatC)TzcwN(sof zpZ?45k$As_(K)~K>dm_wDEWM6R5OykIWAJN!9Q4w(Npo}zHp$7t_0tCXF+ zVlsQ=Z)6<2scunazajAU)0ZZS*MZ``iV^B5I^`Sgs0rsVTTHW#$Xm?vt>%BzQ?uUv zYh+aqJkeb+rP0ITC9{;@hBN+RQ|uNv9>}vW(`V%44+v3U&?s8>=j8Jb_gM}9F_m`S Vm0#wiV*w0X22WQ%mvv4FO#oaQ#|Z!c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/meta.json new file mode 100644 index 0000000000..d0d4a1f0e9 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad. Modified by potato1234x (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..9e4b20ba3450aad7b9541b5e6d068ae88327d85f GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Nn{1`)dPG&T>l^Oy~!Z-?%lg9%Vmm#I4>{p-7cv3CQ1KjwE4FibI)$>JbvUD zP_2z-*cBkfTN30K{2vK0*uGF|14?ifctjR6Fz_7$VMb96uLhvy(w;7kArbCxr+KeC ztia>Ssax59;NSJ=x**vd2`9ajLO;zEOy=X8oc-wRiUwC!9j%1Qpai4a+m2?$zyH?z z$msXJ^RITua~Z@lvVH&FWS`blpVqW+KF6M~sqWEyG7mM{w#gj$>ynUrbK<@S(rp1e zd11%@h9s<6D{XMFHGoy(jz4R;f588THBGM^0Pyv8?QH(Jt#lYx;g$H~JTE zd+K0orvfy6KFiKMLQfutGhOj#*=i$xEak-;s17$H(!GS53B1N z_8tFgb>%ykt|)wdh*QzmYR{$@lZ;MJxwUG0H1E6WrgFRaUMr_=aI7w4+IGo`b~p&KS;M(Vfy_{m}o!h7f+Hiy;ALT5brnWUx*V+^AfCV7u}L-Jo=z o39?rt4lZiZTpHTy9dwJ)MnHBk+x%}IfUaTiboFyt=akR{0AjIgeEZGZQ2I zw4JX^$y#tC@t4(s+{psXr}p#nl%8F~!_)NRYS4Yg%wzv0)8?k`VHWpTzL~jU+F=>T io}ybR&PuxMj11R=v?F4y!$pBEX7F_Nb6Mw<&;$Um9a~)h literal 0 HcmV?d00001 -- 2.51.2