Skip to content

Commit

Permalink
BEHOLD! The MagiVend! (#9440)
Browse files Browse the repository at this point in the history
* Magivend Sprites, and Entity stuffs

* Oopsie!
  • Loading branch information
Ablankmann authored Jul 9, 2022
1 parent 4a393d4 commit d4c5381
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Resources/Locale/en-US/advertisements/vending/magivend.ftl
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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!
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d4c5381

Please sign in to comment.