From 88c39bf12d96fa4a9e64d6d1b5d1391d59693335 Mon Sep 17 00:00:00 2001
From: Swept <sweptwastaken@protonmail.com>
Date: Sun, 7 Mar 2021 19:17:58 +0000
Subject: [PATCH] Readds Ammovend (#3542)

* Initial

* Maint Panel

* Woops
---
 .../Constructible/Power/vending_machines.yml  |  28 +++++++++++++++-
 .../Power/VendingMachines/ammo.rsi/broken.png | Bin 0 -> 444 bytes
 .../Power/VendingMachines/ammo.rsi/meta.json  |  31 ++++++++++++++++++
 .../ammo.rsi/normal-unshaded.png              | Bin 0 -> 642 bytes
 .../Power/VendingMachines/ammo.rsi/off.png    | Bin 0 -> 323 bytes
 .../Power/VendingMachines/ammo.rsi/panel.png  | Bin 0 -> 132 bytes
 .../VendingMachines/boozeomat.rsi/meta.json   |   3 ++
 .../VendingMachines/boozeomat.rsi/panel.png   | Bin 0 -> 146 bytes
 8 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/broken.png
 create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/meta.json
 create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/normal-unshaded.png
 create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/off.png
 create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/ammo.rsi/panel.png
 create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png

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 0000000000000000000000000000000000000000..bd323d456b4e48a254b832fa30bcafdda3afcc26
GIT binary patch
literal 444
zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0000^P)t-sz`(#M
zHfv=A2#}xZcyaqONQ%D-IMOp_s?XZyT$LgwO;udNr3fTI005bpnKL3HczAeLR#rzx
zM-vqkb5aRYM^KfOm5c`wbZ&A&G&rn++4uke00DGTPE!Ct=GbNc00A6HL_t(IjfIeb
zmVzJ<MU@1tF~*f>?f-vt=fOx|p6zO$l*i>k*L8h`InaUrG60K*bI!QJ*aQYE5ofA#
z*BVl!9UhN?!Pes+OMqsDcVN0qxTncpcShVAxRGu_I=F`Ut^rTnd-C{YmdwwZ16EFm
z<m!oLGXqWpqXx`O^O?MS7Xy2K#1NL<KthiP%~^3USQwa+2Ltj5{5%-4AQ{ZLK`);K
zXC0{OVAP=Jur9iLos56z@CbSi_q=yKf|GMtbMZVkd0;>XR>LnQSM!UZbYR_m=_16)
z!570p0D~;B8#r#lYiq%KWDS5<tl9F1JrF+Fa*q;-+z=%o>o$RBMGBz7JHSl=*&qyc
m;9Cc&EYuEt)xbY=-}wUx(JN!0SrpFz0000<MNUMnLSTXdl(<L$

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..878bccfaf8fa9dde4af87ee23e8d12a03e425fe8
GIT binary patch
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006>Nkl<Zc%1E;
zze@u#6vtnr;2?s<BI+a-5ga_RVqFB?P7o2UNISSl{{!iuxGEf?f|FuF-3qmvL&ZgK
zkV1#nRSTVTl7e0QfktxnO1(CEQ0=AWeIPtY+T`Ws%e#;S5ClOG1d$eEPMlI|*g~N|
z-EKFrV|hVKrBd8@`u%>0L?RH4MoDG8cW@4T;}KY0Zl@btMPkSD#>i%~-0>Af0bSQ2
z7K<6<R|VidG3NDtnN7a<2rG|oaQa+;i&9;Sb-w1x+OfP+`F|_PWRix%;i@*KfQ7|N
z$Ye6quH_Xrab{V+=jk*YufM?5$h|R+XMcxw2ZQDDrBlFeu>%gCZpBo9Z)Wq)74W*Z
zCbt5F&H;^30OkNo4se-`Y*hk*fbpHKm&$#FwJTO%Yab8_g{Z2k#&^12!kR{+i3D3w
z!W3|KHVlXH2ROQHgQ2T9?bdYwS@!{`08te%O$f}kx}k@3*4@{3?|aSqhAM#9#!~>x
z%pO&Rp<hq{Xj-}NzJX!G=5MYID^(8o4njVsUbPR94Ge$)J~#>nKmZ>c1p^>}4~~KX
z5WojV!2k&0gQH*o1n|L8FaQGh;3yaX0eo;2=>y=hR><-`z&s8V=1h<Uprd~hyq*bL
zzn?!@;<m9<;dCz7Tz7*;5IhrLuIx{io$m4qYj3){!A2=S*!KY@f2{yv-v?k0D1kYk
z!8t&f+u`xiHma&!peXJ323d~t+cb@o6d>>IaMLN^w{M4~S3oWBeL#)(0SJO12!bF8
cA|n9s0gR4nDFe5=xBvhE07*qoM6N<$f<E3GE&u=k

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..e881bd497aebed0add80513f07afc48b77923fa9
GIT binary patch
literal 323
zcmV-J0lfZ+P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0000^P)t-sz`(#M
zHfv=A2#}xZcyar`3OLd;W~$HH=3JE`CQVgb!lei#KmY)lnVEQact=M^GDwOuA|ewN
z6pRNE?(Xi?ryO%q2~$T<bZ&B$m6f)C4?O??00DGTPE!Ct=GbNc005&&L_t(Ijm?m2
z4}u^VMlnlEM17%x{{J71%gfavTWzf)n_tcj&me?!38w;L==yWuk}>>~F!rN4nyY6p
z2Zh^IE6^DQ7C*=0V5<|hDL@@y;i6gq2KUF4FRg;#uzg$*Ul(x0y08)~;5*EMmi(ds
zASE0ZI1dGos)7U*_9*xB0^gzR$|y+4kXq39X2L7M3T8nRiWy)FsnFU`1%(4hn>V02
VEOI?PGDQFY002ovPDHLkV1h*;d&K|%

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..b266b9101c6c2d04bd8ed0057844c58c487ab658
GIT binary patch
literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*8>L*ESoQ<qN1{Eiy}js
z@nQv=Pe3Wgk|4ie28U-i(tsRgPZ!4!jfu$#60FYr9Fhw-H8dA+N^maVv{>*l(tyV`
boRN(o%81eXp2GEhpmGLJS3j3^P6<r_@eUzP

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..597a8b05ccdefd01d16b5b17745ac75a696315d3
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*sH&<?>SCBNk-^(L
z*2g<x{Za-!{kZB<hD=F0F?r+LK$VOoL4Lsu4$p3+0Xa&ZE{-7@6O$7pmNf(l_&Rt<
q_&Qt=^>tXoba%qckkU&5EDX0UF>Y1NbiD;s&EV<k=d#Wzp$Py*04VYR

literal 0
HcmV?d00001