diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index 76812ded3b..99f7ecda82 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -53,6 +53,32 @@ - type: Anchorable - type: Pullable +- type: entity + parent: VendingMachine + id: VendingMachineAmmo + name: Liberation Station + description: An overwhelming amount of ancient patriotism washes over you just by looking at the machine. +# Ads cause I remember somebody was working on these +# product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!;Better dead than red!" +# product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?" + components: + - type: VendingMachine + pack: AmmoVend + - type: Sprite + sprite: Constructible/Power/VendingMachines/ammo.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + broken: true + - type: WiresVisualizer + - type: entity parent: VendingMachine id: VendingMachineBooze @@ -68,7 +94,7 @@ - state: "off" map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png + - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Appearance visuals: diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png new file mode 100644 index 0000000000..bd323d456b Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json new file mode 100644 index 0000000000..6f490f95e7 --- /dev/null +++ b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/21d5a65346cfdaa61e86410cf9323e4e03a362d9", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 5, + 0.1, + 0.6, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal-unshaded.png new file mode 100644 index 0000000000..878bccfaf8 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png new file mode 100644 index 0000000000..e881bd497a Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/panel.png new file mode 100644 index 0000000000..b266b9101c Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/panel.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json index 340942d10d..8bce6d8cf4 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json @@ -42,6 +42,9 @@ }, { "name": "off" + }, + { + "name": "panel" } ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png new file mode 100644 index 0000000000..597a8b05cc Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png differ