From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Fri, 24 Mar 2023 08:54:47 +0000 (+1000) Subject: TG Vending Machines + Tweaks (#14703) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=51778afe6f701c0f1a2ba62db983e8cd40b264df;p=space-station-14.git 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 --- 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 0000000000..c089ba47cd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon.png differ 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 0000000000..6451930614 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png new file mode 100644 index 0000000000..2ed4941501 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png differ 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 0000000000..cb29098114 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png differ 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 0000000000..12e05e98d7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon_open.png new file mode 100644 index 0000000000..a30e5dc6b4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png new file mode 100644 index 0000000000..6b182db296 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png differ 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 0000000000..ace1850674 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json new file mode 100644 index 0000000000..d269458e27 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.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/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json index b1aca32515..99cc8f2c33 100644 --- a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_honk made by brainfood1183 (github) for ss14", + "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_honk made by brainfood1183 (github) for ss14. Refill_robotics made by potato1234x (github) for ss14.", "size": { "x": 32, "y": 32 @@ -72,6 +72,9 @@ { "name": "refill_ptech" }, + { + "name": "refill_robotics" + }, { "name": "refill_salvage" }, diff --git a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_robotics.png b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_robotics.png new file mode 100644 index 0000000000..87b51297b0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_robotics.png differ 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 0000000000..ecea1ed30f Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/broken.png differ 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 0000000000..5455be6a21 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/off.png new file mode 100644 index 0000000000..cfe2f933af Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/panel.png new file mode 100644 index 0000000000..0032751ff4 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/panel.png differ 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 0000000000..3992fd8d0b Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/deny-unshaded.png new file mode 100644 index 0000000000..74c7f834c3 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/eject-unshaded.png new file mode 100644 index 0000000000..ffb6de3c21 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/eject-unshaded.png differ 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 0000000000..7d061a7028 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal-unshaded.png differ 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 0000000000..baa1de12d8 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/off.png new file mode 100644 index 0000000000..672a0218a0 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/off.png differ 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 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png index 7c51ef95ed..99ef104517 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png differ 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 0000000000..f231113db2 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/broken.png differ 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 0000000000..a8d4fa3db7 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/deny-unshaded.png differ 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 0000000000..9f825ee56a Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/meta.json new file mode 100644 index 0000000000..d0d4a1f0e9 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.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/pwrgame.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/normal-unshaded.png new file mode 100644 index 0000000000..6790b5205a Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/normal-unshaded.png differ 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 0000000000..23c81b1fdb Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/normal.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/off.png new file mode 100644 index 0000000000..62e026fe18 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/off.png differ 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 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/panel.png differ 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 0000000000..95dd62efce Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/any.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/drink.png b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/drink.png new file mode 100644 index 0000000000..2339c1d02d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/drink.png differ 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 0000000000..76d9de468b Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/random.rsi/snack.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png new file mode 100644 index 0000000000..0e73b4e957 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png differ 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 0000000000..2a2832c15d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png differ 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 0000000000..dffb340871 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png differ 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 0000000000..f98b47be44 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png differ 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 0000000000..c9be476a9f Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal.png differ 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 0000000000..b9aa0c326a Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png differ 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 0000000000..95f1e4d33e Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/broken.png new file mode 100644 index 0000000000..e4b3a2f2ea Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/deny-unshaded.png new file mode 100644 index 0000000000..6622947145 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/deny-unshaded.png differ 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 0000000000..9bb3650808 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/eject-unshaded.png differ 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 0000000000..5700a9802a Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal.png new file mode 100644 index 0000000000..47e1182970 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal.png differ 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 0000000000..784f53418a Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/off.png differ 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 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/panel.png differ 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 0000000000..72f8413919 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png differ 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 0000000000..7f630c601c Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png differ 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 0000000000..bb21e6a5c5 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png differ 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 0000000000..1328a3b041 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal.png new file mode 100644 index 0000000000..34632a7e10 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal.png differ 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 0000000000..a5d20fa418 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png differ 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 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png differ 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 0000000000..6b9b633fe3 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/broken.png differ 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 0000000000..7847a34ee1 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/deny-unshaded.png differ 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 0000000000..45fd62d159 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/meta.json new file mode 100644 index 0000000000..d0d4a1f0e9 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.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/spaceup.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal-unshaded.png new file mode 100644 index 0000000000..d063e402aa Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal.png new file mode 100644 index 0000000000..6914a22448 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/off.png new file mode 100644 index 0000000000..d60aa24105 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/off.png differ 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 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/panel.png differ 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 0000000000..333758752c Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/broken.png differ 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 0000000000..a554a13a0e Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/deny-unshaded.png differ 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 0000000000..389914fdbc Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/eject-unshaded.png differ 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 0000000000..9e4b20ba34 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal.png new file mode 100644 index 0000000000..38b7f0953c Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/off.png new file mode 100644 index 0000000000..c9eb8d31ed Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/panel.png new file mode 100644 index 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/panel.png differ