diff --git a/Resources/Locale/en-US/advertisements/vending/magivend.ftl b/Resources/Locale/en-US/advertisements/vending/magivend.ftl index b447bce16d..b889a43465 100644 --- a/Resources/Locale/en-US/advertisements/vending/magivend.ftl +++ b/Resources/Locale/en-US/advertisements/vending/magivend.ftl @@ -1,4 +1,4 @@ -advertisement-magivend-1 = Sling spells the proper way with MagiVend! +advertisement-magivend-1 = Sling spells the proper way with MagiVend! advertisement-magivend-2 = Be your own Houdini! Use MagiVend! advertisement-magivend-3 = FJKLFJSD advertisement-magivend-4 = AJKFLBJAKL @@ -7,4 +7,5 @@ advertisement-magivend-6 = HONK! advertisement-magivend-7 = EI NATH advertisement-magivend-8 = Destroy the station! advertisement-magivend-9 = Space-time bending hardware! +advertisement-magivend-10 = 1234 LOONIES LOL! diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index c78c0e1e24..7777ff1dd3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -338,6 +338,38 @@ energy: 1.6 color: "#4b93ad" +- type: entity + parent: VendingMachine + id: VendingMachineMagivend + name: MagiVend + description: A magic vending machine. + components: + - type: VendingMachine + pack: MagiVendInventory + - type: Advertise + pack: MagiVendAds + - type: Sprite + sprite: Structures/Machines/VendingMachines/magivend.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - texture: Structures/Machines/VendingMachines/maintenance_panel.png + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + ejectUnshaded: true + broken: true + - type: WiresVisualizer + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#9a18d6" + - type: entity parent: VendingMachine id: VendingMachineDiscount diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png new file mode 100644 index 0000000000..17d7f7e595 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/meta.json new file mode 100644 index 0000000000..777f43a5fd --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/magivend.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/3e1db725c152145b1682a31e5e54da7a63595436#diff-b4b731212dc8db8859d52ef3b762bccfb667f8783ad4c36f648db7f758f7eaf2", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 2.7, + 0.1, + 3.4, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png new file mode 100644 index 0000000000..21e74f3c7f Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png new file mode 100644 index 0000000000..3b3b865aa6 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png new file mode 100644 index 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/magivend.rsi/panel.png differ