From baff3261252aff780b7a5c180be2ab8fefe5ad84 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Fri, 11 Oct 2024 00:30:31 +0300
Subject: [PATCH 01/16] Revert "Pride-o-mat and refill for it (#22)"

This reverts commit 0c2f8a43
---
 .../catalog/cargo/cargo-vending.ftl           |   2 -
 .../catalog/fills/crates/vending-crates.ftl   |   2 -
 .../DeltaV/Catalog/Cargo/cargo_vending.yml    |   9 ---
 .../DeltaV/Catalog/Fills/Crates/vending.yml   |   7 ---
 .../VendingMachines/Advertisements/pride.yml  |  12 ----
 .../VendingMachines/Inventories/pride.yml     |  29 ----------
 .../Service/vending_machine_restock.yml       |  25 --------
 .../Structures/Machines/vending_machines.yml  |  54 ------------------
 .../vending_machine_restock.rsi/base.png      | Bin 241 -> 0 bytes
 .../vending_machine_restock.rsi/green_bit.png | Bin 175 -> 0 bytes
 .../inhand-left.png                           | Bin 171 -> 0 bytes
 .../inhand-right.png                          | Bin 172 -> 0 bytes
 .../vending_machine_restock.rsi/meta.json     |  28 ---------
 .../refill_pride.png                          | Bin 796 -> 0 bytes
 .../VendingMachines/pride.rsi/broken.png      | Bin 1719 -> 0 bytes
 .../VendingMachines/pride.rsi/meta.json       |  31 ----------
 .../pride.rsi/normal-unshaded.png             | Bin 912 -> 0 bytes
 .../VendingMachines/pride.rsi/off.png         | Bin 1439 -> 0 bytes
 .../VendingMachines/pride.rsi/panel.png       | Bin 190 -> 0 bytes
 19 files changed, 199 deletions(-)
 delete mode 100644 Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl
 delete mode 100644 Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
 delete mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
 delete mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png
 delete mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png
 delete mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
 delete mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png
 delete mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png
 delete mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json
 delete mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png
 delete mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png
 delete mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png

diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl
deleted file mode 100644
index 9d7ece7aa5..0000000000
--- a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-CrateVendingMachineRestockPride = { ent-CrateVendingMachineRestockPrideFilled }
-    .desc = { ent-CrateVendingMachineRestockPrideFilled.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
deleted file mode 100644
index c85296a649..0000000000
--- a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate
-    .desc = Contains a restock box for the Pride-O-Mat.
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
deleted file mode 100644
index 343ec4d533..0000000000
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: cargoProduct
-  id: CrateVendingMachineRestockPride
-  icon:
-    sprite: Objects/Specific/Service/vending_machine_restock.rsi
-    state: base
-  product: CrateVendingMachineRestockPrideFilled
-  cost: 1100
-  category: Service
-  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
deleted file mode 100644
index 985b0443e2..0000000000
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: entity
-  id: CrateVendingMachineRestockPrideFilled
-  parent: CratePlastic
-  components:
-  - type: StorageFill
-    contents:
-      - id: VendingMachineRestockPride
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
deleted file mode 100644
index 6b59a93261..0000000000
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: messagePack
-  id: PrideDrobeAds
-  messages:
-  - advertisement-pride-1
-  - advertisement-pride-2
-  - advertisement-pride-3
-
-- type: messagePack
-  id: PrideDrobeGoodbyes
-  messages:
-  - thankyou-pride-1
-  - thankyou-pride-2
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
deleted file mode 100644
index 9e1de27fa4..0000000000
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: vendingMachineInventory
-  id: PrideDrobeInventory
-  startingInventory:
-       ClothingNeckLGBTPin: 3
-       ClothingNeckAromanticPin: 3
-       ClothingNeckAsexualPin: 3
-       ClothingNeckBisexualPin: 3
-       ClothingNeckIntersexPin: 3
-       ClothingNeckLesbianPin: 3
-       ClothingNeckNonBinaryPin: 3
-       ClothingNeckPansexualPin: 3
-       ClothingNeckTransPin: 3
-       PlushieSharkBlue: 2
-       PlushieSharkPink: 2
-       PlushieSharkGrey: 2
-       ClothingNeckCloakTrans: 2
-       ClothingNeckCloakAro: 2
-       ClothingNeckCloakAce: 2
-       ClothingNeckCloakBi: 2
-       ClothingNeckCloakIntersex: 2
-       ClothingNeckCloakEnby: 2
-       ClothingNeckCloakPan: 2
-       ClothingNeckCloakGay: 2
-       ClothingNeckCloakLesbian: 2
-       ClothingHeadHatXmasCrown: 2
-       BedsheetRainbow: 2
-       ClothingUniformColorRainbow: 2
-       ClothingUnderSocksCoder: 1
-       ClothingUnderSocksBee: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
deleted file mode 100644
index febf8d2765..0000000000
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-- type: entity
-  parent: BaseVendingMachineRestock
-  id: BaseVendingMachineRestockDeltaV
-  name: vending machine restock box
-  description: A box for restocking vending machines with corporate goodies.
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi
-
-- type: entity
-  parent: BaseVendingMachineRestockDeltaV
-  id: VendingMachineRestockPride
-  name: Pride-O-Mat restock box
-  description: The station needs more plushie sharks and you know it.
-  components:
-  - type: VendingMachineRestock
-    canRestock:
-    - PrideDrobeInventory
-  - type: Sprite
-    layers:
-    - state: base
-    - state: green_bit
-      shader: unshaded
-    - state: refill_pride
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
deleted file mode 100644
index a0a511be2a..0000000000
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-- type: entity
-  parent: VendingMachine
-  id: VendingMachinePride
-  name: Pride-O-Mat
-  description: A vending machine containing crimes.
-  components:
-  - type: VendingMachine
-    pack: PrideDrobeInventory
-    offState: off
-    brokenState: broken
-    normalState: normal-unshaded
-  - type: Advertise
-    pack: PrideDrobeAds
-  - type: SpeakOnUIClosed
-    pack: PrideDrobeGoodbyes
-  - type: Speech
-  - type: Sprite
-    sprite: DeltaV/Structures/Machines/VendingMachines/pride.rsi
-    layers:
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.Base"]
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
-      shader: unshaded
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-
-- type: entity
-  parent: VendingMachine
-  id: VendingMachineCourierDrobe
-  name: CourierDrobe
-  description: Neither solar flares nor meteors nor plasma fire nor void of space stays these couriers from the swift completion of their appointed rounds.
-  components:
-  - type: VendingMachine
-    pack: CourierDrobeInventory
-    offState: off
-    brokenState: broken
-    normalState: normal-unshaded
-  - type: Advertise
-    pack: CourierDrobeAds
-  - type: SpeakOnUIClosed
-    pack: CourierDrobeGoodbyes
-  - type: Sprite
-    sprite: DeltaV/Structures/Machines/VendingMachines/courierdrobe.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: [["Mail"]]
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png
deleted file mode 100644
index 01a8c4ed215cd3473a68bc2ec243281307e9007f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NS%G|&0G|+7
zAg$-6XJ&2Z>gDI@AM70%>K7Ur7Mm24oSBkSRNc}wZSJCl(b`Nvb&MrJe!&b5&u*jv
zIoX~rjv*T7lM^Id8urRCaV0Qa-QBpr#KeSS8N-qLa$N!|=5Vq+eY$kv!4piz>3;3p
z5%2HuUStv8(6l0=N8kkmvksG^2!}(>CW|W^S_`JKF(q|3izYDXC2Wvb*5D}oXv0YZ
hRvxbag9(954EOhV{`}>#VlmKK22WQ%mvv4FO#tw0O9=n~

diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png
deleted file mode 100644
index e362ff17152e40bd6447a9263d5ba02dccb23bb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;*0X`wF
zg=Hc~j~+EJ(w#nidPqpfA_j&A1_logkCc=Y2IH9w3~7#zj<vP5(b3Tj4GsVQ|4;7m
z0Ro2qth0)&9svzuED7=pW^j0RBMrzA@pN$vk&sN5U|pOb!Jya{=)lduAQQkKZ1B*!
Q5Gc>!>FVdQ&MBb@0Ew$F`Tzg`

diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png
deleted file mode 100644
index 0c543aa0751c12cf5969a8a87bb29d3128b02e16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSEa{HEjtmSN`?>!lvI6;>0X`wF
zK-$dOE+#p%Bi7au$YCrA@(X5gcy=QV$Z_y=aSX9Iotz-Sx`naN;mnIBl?j|e5l)jF
zG&~eiOmy1iI2^=hICwO0Djj(7f<ZK)WyZlBrx-&O1(_D|efgx$a6g!<eR_Ij5zs6K
MPgg&ebxsLQ07#`S?f?J)

diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-right.png
deleted file mode 100644
index 599ede72c16b1374c59787efd92197cd06f27e72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSEa{HEjtmSN`?>!lvI6;>0X`wF
zK-$dOE+#p%Bi7au$YCrA@(X5gcy=QV$Z_;^aSX9Iotz-SdWF45hhv*|L;|Oi!eoy|
zffk1s858(i4|M4rXbWz*c#%=*0)ub_t6)N@gRp~&5l>?P`>tw121O2zD}D7H_ko5n
Nc)I$ztaD0e0sv9>EsOvF

diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
deleted file mode 100644
index b4d6a7706c..0000000000
--- a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "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_pride made by Dorragon for Delta-V",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "green_bit"
-    },
-    {
-      "name": "refill_pride"
-    }
-  ]
-}
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png
deleted file mode 100644
index f31c671e49ff29e8505718c3e33ecb1b7e04b2ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 796
zcmV+%1LOROP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PX+uL$X=7sm
z04R}lkvU5PQ51#0B#K+qLJJX#0T(P15CyT62&Rb^F@jN>WU>iK9A*+E*a|il0SnQ_
zt?(acE7&Rsf+C36*}F9o#`}^$f+TNvb3e{|=W^!^I0I=tW3|jeCYv*ZexJ4yUe(&(
z>7WM~MvLf{v9L5BqUrj1#G&egSM_Rsui@&7#Vs8i?ZVT#VdjKo8UkB6L-C$)zn+T3
zginM$rVJ>2tMq7v-xMb+{H53o1?Rx2dTPl!j@GfBGBd*C!Xue<Ua!uhzQi5RE-y(P
zls$w+5I;UNqU6~iO%AWrtYp^MH&OO2vMC;2-UbCsaU@BJ*CT3Py2hm@M32jprl4~F
zpQn|Wnyhqp`=IsJwm(OqZ68WS+x|VZ?a~>zUf?=g^KVK{GvA^YYud;$^zOjrO-+j)
zz|}4cJR1=+QkGn@orwf|TtIgi`tG4~t&&ysobx9LZObpZgTo^jll#5ve-c_~5+Z^@
znE(I)32;bRa{vGf5&!@T5&_cPe*6Fc0aZyvK~z{rV_+BsqaiRF0;3@?z#+g$P5WmH
z2>dtu`<LP2&z}q*;(sydE3h#<efyWetM4yPdzh%@09=+Ur{cGPg<1|s{qO<q%ZmzZ
z|3N+nS^o6tUus!FnmISGGymVWhvC1|MdttbbW$w}&@BP^yhW6m;VXd<pqT?;mY-C<
zf;Z?$P6IQ}eSrsQh7k|W)D7}E*z$*u@H&9#Y*@GPD%j%2-|yfC*0TzM*-if1nC9HP
z@*iw@iZTPkBXyki5FG+}H!naeE{%daAg_BF!~xj+2(_H~|5FBh`GDvUxOwv?I0V!#
zzk*wLOIHlcR#(U3L%Ey(L6-0SewD%LO)ljjAiVJm*s_@}{%{9`Y}|-5eqokhe1DTV
ziExs-0ob7ZlUm>gJ`0S+X*kH|Aj=E?P9Zv!@w${$$$sV>yaf=c=8dW!4S~@R7!85p
a8v+0{#(`0aE>brD0000<MNUMnLSTYm!D(#(

diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png
deleted file mode 100644
index b506b41a54344ba1c30369b66a59a258b09a797b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1719
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
N002ovPDHLkV1jewC<p)m

diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json
deleted file mode 100644
index cef421923b..0000000000
--- a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-4.0",
-  "copyright": "The art belongs to Woods#1999 on discord",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "broken"
-    },
-    {
-      "name": "off"
-    },
-    {
-      "name": "panel"
-    },
-    {
-      "name": "normal-unshaded",
-      "delays": [
-        [
-          1.5,
-          0.1,
-          1.5,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png
deleted file mode 100644
index 4bea61c2abb8d21e6ab56bfb748b741cc91219d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkRLP<nHRCt{2n%_$lQ545NH$?({sr)@Fq$C<dK9tgfg3l6C_S_#~
z_!2}9(W6NJh&{L!k|G2`i>wbTDT!v$wykDb5B@+XZVx*%-ksf?+1(kWJRcbL&YZ*f
z-h1}mI}G=LAP9mW2*Mdf`8hmz^hEdcT&MBUMc-iGc6LdnmY8_@*f(xaqSmkWb8y5v
zJ1(D?Ep7ORN!0r1f;gGtN_j5lx$PGPQR@5704KPz8w!|Q$hfw9eHH*(2Ut&K;?*xO
zR-o^j0A)0u+XJ^^ZLWQCAq~JtuZ1T3B$)b&!uY0UIr{zyFobVyex#$tqW;$&0N=N^
zK*2^f1Ij|_6GN4SDl%|o-e`OME6UOjv<ILdGc}(Zd{dMA*lBmPSbUwDFYH`csN)}{
z@*Wk;j8gRj?EwJ$oy~CVDl|0Y8@6+=r~P-oOH-}@<!M(k@q#5lL+#oo>{UV2ZoX}6
z3xL|}CUjq^tT!j<o12}P0j)ifCF=Vw0c{6t9qwl%o5`(v8>hXI&CojBk1k!`7f0WW
z?F?EQV%p;q6yF)(1XUUm&Fv&KSk-koqg6-dOB$Nn88JE<CZ@jjY<_voGW7#30Vn84
zuVudu)2?l#&vJL-C}zK@UyuaDp<MmIo1iutcY7^&^U)Fg^C#&;;pSJaexTRj+QuhW
z#9fERulD$bO_ch+Ga!{(3jBfLe2s<4Y3mDuAP9mW2!bF8f*|~NNPU2xgVYBg^#PHd
z&!4uw?+hq*3j5>bYZNdYKg#bQ;U}S(zIj!u@1Fo$xPJ8m00)U_c2<_j#E)26{>iI!
zE(vWH)+3n#f2$AhE`g%6BLIQx0}kirh;6U);>}z1#6zYNafa{QBrzQ)w!IFAvu@`?
zC&K!GU<q(Y&2szMeP-BZV0@Ih85kcJh16_msukj`52%D-3D8i})dj#Bxxvot<V-s=
zwogsB>l-@eNwDW2w9@(j|Ksrz0!CdQ0QRA%QzQ{WeSm*~gncC!7a`VN+$q*gGMUWl
zXjr&|()okbp8Lq_13Jb=NdupgN%mQV>;YB#@E$ndHAo|aXQMt~sCA4XK(&Itacq<N
m0Hi)Z>H`Ep5ClQ^r}zWRT7?*&OZzzh0000<MNUMnLSTY)#;FSc

diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png
deleted file mode 100644
index 4e1dc9af28da3a157cb0fed631875dedc1f2f9f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1439
zcmV;Q1z`G#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<WQAtEWR9J<*mrICT#}$UZQ+4m{+cVwsmTb2ZJ;n$>lFT5iz{K8|
zEWA<>UWBat0Ab;kz>AQDF=QhM7;ME55(Emuk3cXc3}~Z8zzMbykr`WK1rlkHWgBKB
zjb<db`c8M>N1ZHsM*W!E^7JMLid&~nRsH`tRduSakRwkW8dCsOB@u|Mpn#$zS|l+O
z2tJ8I+%RZnz*w|lkyP-ThM~wH&Jh9u7Jx6R|BzlRFOPul!Eau!Gdbm<o@FU8d=)qf
z))GmD|CnFUNFHKcg|BZlxO-^`R}YYI4E=gHSv6q#LWv)&gglZ#NpJ9%@@sie`2<A4
zPYi-$oa5182wSjJEri^qBDY!f_F~e2>*EpebVyPg!PUTxSILrHT>eqYculEBmQw12
zY;zs}lglbIj5R`r%4LdUWrlo@X%zy%nhkcD1wwC?qNF?+j#8{d*s@?s0d|i?$6;eP
zT%JjYN``MSG;-nl5HL<CCWde|L6Q_J%BU#&RWMd4$~Qb9|3dvL4;Y`Ra)I*hnBl3A
zU?RZVpJGN0-_5|k_ol4)LQ{0-O90>rj5ItV>yuf7ic$e;PFV6X#`v5Grr0n~Q{IS4
zCYo#jaiVyWj<8@!t{MJ&AVpUl&Bh=EtYAwXZdb@eX)o(0Ljs{#v^>^u6j5$l<w19i
z75O<Ml&IPv?mX<XK0Zma8sle5JTlBu?G{%LIvQW30}xPHyOZ(INE3~g2qz#J5gLi$
zD@-_LF>q|4H0r<QhJTc_KF(@bVm*tgH%4jJ>eN>RO$$`(m+|Z%5m3dXj(x}T2X)IT
z@Vi`#-TY=h`!ksQQ;<&}Q>2*zh8JEr&g|?AyC)~Um&(nxbuM09<oMASS^M}BZ`R=4
z>o1a}RXj}wAdrH&)AD``{J``+@_lH@R;*@cXE^lJC%bL?hS6{A_CfSHhHN-wsm-_(
zT%@OLwQu$Vxb(|6`1^;?aNy*7En^UaxLl|{O8^qJ*IzaZ9e`a%K(%fA@dv+#4*))D
zd09vhGYA3QoRJPd=^)b6ReI{5z4|x)d1sk3vCrcB$MA+D#AbsKP$X>)kR0Hyw62@$
zFReQS;Luyobxjxkuu4|Q&ja~;z%yvM(1F<gh;%h=i;M_-`N>gEJ$sJFAA16T{X=z%
zc910yLH+z)+XcQ^@68rJdHOVP`kp?$w#a%?%bhDf0!fChZM5|c1l<g|_UN5`U;FD3
zKKb}lPQ3IX0M?vC<W??JZUi(_;wZZZ(8)oz+In2qj&kBx^PFJ5Z3|K`1LOfwK@!t7
zG1?8HJvtpkpFi~yC*S%#Q<J*@7%vnFY(9b92xN(J_g34zd)_N(UOMbqmUoYx;a$$O
z9m?N-K%WTMR0yJOq%O}lm92UwIKbT89CLGXZ31zMY}=|W$&Enj;C54CxTRmYdW{3q
z`?~i*2eB==a`hSj=g*(-ny(o(TQBFG67WPQ*_P?z#YJXkXL1Mk%GPbzE0bxHKnpn|
z`o4%D8){YG`P17w0>7V(X5ja+<r4^ntn9&BOFew}Fw4u!1A$g570#YL+nP?>kCPn{
zP+xFk<{p79IdbI4j=<;V=ezXyF1Y-wpkFEm=e1A4^71m3N`(s-F6@XvrBdmRm~OvC
z?@z!A8n#Uf3kxhPEbIt8SMKwa>hmCRWKql?_9%X$xRn&r41bS80T}jSG=!TG?Dwcg
zO+q8cXb4S#h9b3?IB?uJs3ZlDKAWKLkI5ge2RH}Df#Sd_W}Q~*@(lO}nkD#7$g%<k
t5Z{8MRnh=wl;%xv2I6>!(fWVO{{UT>A1mRYQKSF>002ovPDHLkV1h$nohSeR

diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png
deleted file mode 100644
index 0032751ff4ffedd3d0ecc00eaf4e0ab459929e9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!<klkcv6U2@<S}6GVEN0u8v_
z4r)lSGV@4eCcb!ba`ON9eKj*1fxt01c=Eyx8w8fy>TD@E@bvU_NvA($#wnr(!Xc+!
zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p
h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0


From 6f19f6f38fae805f16b942cd70006ccf92243ce4 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Fri, 11 Oct 2024 00:37:14 +0300
Subject: [PATCH 02/16] delete: Pride-O-Mat

---
 Resources/Maps/arena.yml      | 2 +-
 Resources/Maps/asterisk.yml   | 2 +-
 Resources/Maps/edge.yml       | 2 +-
 Resources/Maps/glacier.yml    | 2 +-
 Resources/Maps/hammurabi.yml  | 2 +-
 Resources/Maps/hive.yml       | 2 +-
 Resources/Maps/lighthouse.yml | 2 +-
 Resources/Maps/pebble.yml     | 2 +-
 Resources/Maps/shoukou.yml    | 2 +-
 Resources/Maps/submarine.yml  | 2 +-
 Resources/Maps/tortuga.yml    | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
index 563011f75f..3da341ac3d 100644
--- a/Resources/Maps/arena.yml
+++ b/Resources/Maps/arena.yml
@@ -158556,7 +158556,7 @@ entities:
     - type: Transform
       pos: -3.5,-18.5
       parent: 6747
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 10266
     components:
diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml
index 156fb2de6e..20cfff4439 100644
--- a/Resources/Maps/asterisk.yml
+++ b/Resources/Maps/asterisk.yml
@@ -62162,7 +62162,7 @@ entities:
     - type: Transform
       pos: 13.5,-20.5
       parent: 2
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 4671
     components:
diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml
index 601cb7dd17..2d0103ea76 100644
--- a/Resources/Maps/edge.yml
+++ b/Resources/Maps/edge.yml
@@ -97254,7 +97254,7 @@ entities:
     - type: Transform
       pos: -17.5,11.5
       parent: 2
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 14757
     components:
diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index 2cba2930f0..afcf0acffc 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -101090,7 +101090,7 @@ entities:
     - type: Transform
       pos: 29.5,0.5
       parent: 2
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 4015
     components:
diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml
index 0afaa64934..95a32a1fee 100644
--- a/Resources/Maps/hammurabi.yml
+++ b/Resources/Maps/hammurabi.yml
@@ -248095,7 +248095,7 @@ entities:
     - type: Transform
       pos: -34.5,-12.5
       parent: 1
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 2577
     components:
diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml
index a732c83a53..4448f1fb88 100644
--- a/Resources/Maps/hive.yml
+++ b/Resources/Maps/hive.yml
@@ -151790,7 +151790,7 @@ entities:
     - type: Transform
       pos: -3.5,21.5
       parent: 1
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 6930
     components:
diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml
index 8a1148c774..ee38c8aa79 100644
--- a/Resources/Maps/lighthouse.yml
+++ b/Resources/Maps/lighthouse.yml
@@ -117046,7 +117046,7 @@ entities:
     - type: Transform
       pos: -31.5,33.5
       parent: 100
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 13632
     components:
diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml
index 6f38df6c0e..7b7bcca308 100644
--- a/Resources/Maps/pebble.yml
+++ b/Resources/Maps/pebble.yml
@@ -63298,7 +63298,7 @@ entities:
     - type: Transform
       pos: -0.5,10.5
       parent: 2
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 9235
     components:
diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
index afd78ab15e..e0c8c00124 100644
--- a/Resources/Maps/shoukou.yml
+++ b/Resources/Maps/shoukou.yml
@@ -78406,7 +78406,7 @@ entities:
     - type: Transform
       pos: -20.5,-7.5
       parent: 34
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 61
     components:
diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml
index f517f5a5ab..6eb943cfc5 100644
--- a/Resources/Maps/submarine.yml
+++ b/Resources/Maps/submarine.yml
@@ -219296,7 +219296,7 @@ entities:
     - type: Transform
       pos: -56.5,2.5
       parent: 2
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 2543
     components:
diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml
index 399a06a400..fa8295b45d 100644
--- a/Resources/Maps/tortuga.yml
+++ b/Resources/Maps/tortuga.yml
@@ -178062,7 +178062,7 @@ entities:
     - type: Transform
       pos: -19.5,42.5
       parent: 33
-- proto: VendingMachinePride
+- proto: VendingMachineCola
   entities:
   - uid: 27721
     components:

From 74cbc0471e2c868db486b1937ec55f0e9cc11876 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Fri, 11 Oct 2024 07:37:50 +0300
Subject: [PATCH 03/16] Revert "delete: Pride-O-Mat"

This reverts commit 6f19f6f38fae805f16b942cd70006ccf92243ce4.
---
 Resources/Maps/arena.yml      | 2 +-
 Resources/Maps/asterisk.yml   | 2 +-
 Resources/Maps/edge.yml       | 2 +-
 Resources/Maps/glacier.yml    | 2 +-
 Resources/Maps/hammurabi.yml  | 2 +-
 Resources/Maps/hive.yml       | 2 +-
 Resources/Maps/lighthouse.yml | 2 +-
 Resources/Maps/pebble.yml     | 2 +-
 Resources/Maps/shoukou.yml    | 2 +-
 Resources/Maps/submarine.yml  | 2 +-
 Resources/Maps/tortuga.yml    | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
index 3da341ac3d..563011f75f 100644
--- a/Resources/Maps/arena.yml
+++ b/Resources/Maps/arena.yml
@@ -158556,7 +158556,7 @@ entities:
     - type: Transform
       pos: -3.5,-18.5
       parent: 6747
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 10266
     components:
diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml
index 20cfff4439..156fb2de6e 100644
--- a/Resources/Maps/asterisk.yml
+++ b/Resources/Maps/asterisk.yml
@@ -62162,7 +62162,7 @@ entities:
     - type: Transform
       pos: 13.5,-20.5
       parent: 2
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 4671
     components:
diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml
index 2d0103ea76..601cb7dd17 100644
--- a/Resources/Maps/edge.yml
+++ b/Resources/Maps/edge.yml
@@ -97254,7 +97254,7 @@ entities:
     - type: Transform
       pos: -17.5,11.5
       parent: 2
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 14757
     components:
diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index afcf0acffc..2cba2930f0 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -101090,7 +101090,7 @@ entities:
     - type: Transform
       pos: 29.5,0.5
       parent: 2
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 4015
     components:
diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml
index 95a32a1fee..0afaa64934 100644
--- a/Resources/Maps/hammurabi.yml
+++ b/Resources/Maps/hammurabi.yml
@@ -248095,7 +248095,7 @@ entities:
     - type: Transform
       pos: -34.5,-12.5
       parent: 1
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 2577
     components:
diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml
index 4448f1fb88..a732c83a53 100644
--- a/Resources/Maps/hive.yml
+++ b/Resources/Maps/hive.yml
@@ -151790,7 +151790,7 @@ entities:
     - type: Transform
       pos: -3.5,21.5
       parent: 1
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 6930
     components:
diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml
index ee38c8aa79..8a1148c774 100644
--- a/Resources/Maps/lighthouse.yml
+++ b/Resources/Maps/lighthouse.yml
@@ -117046,7 +117046,7 @@ entities:
     - type: Transform
       pos: -31.5,33.5
       parent: 100
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 13632
     components:
diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml
index 7b7bcca308..6f38df6c0e 100644
--- a/Resources/Maps/pebble.yml
+++ b/Resources/Maps/pebble.yml
@@ -63298,7 +63298,7 @@ entities:
     - type: Transform
       pos: -0.5,10.5
       parent: 2
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 9235
     components:
diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
index e0c8c00124..afd78ab15e 100644
--- a/Resources/Maps/shoukou.yml
+++ b/Resources/Maps/shoukou.yml
@@ -78406,7 +78406,7 @@ entities:
     - type: Transform
       pos: -20.5,-7.5
       parent: 34
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 61
     components:
diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml
index 6eb943cfc5..f517f5a5ab 100644
--- a/Resources/Maps/submarine.yml
+++ b/Resources/Maps/submarine.yml
@@ -219296,7 +219296,7 @@ entities:
     - type: Transform
       pos: -56.5,2.5
       parent: 2
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 2543
     components:
diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml
index fa8295b45d..399a06a400 100644
--- a/Resources/Maps/tortuga.yml
+++ b/Resources/Maps/tortuga.yml
@@ -178062,7 +178062,7 @@ entities:
     - type: Transform
       pos: -19.5,42.5
       parent: 33
-- proto: VendingMachineCola
+- proto: VendingMachinePride
   entities:
   - uid: 27721
     components:

From f59e00a28962412b13f80d47d3320d24a5ab5655 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Fri, 11 Oct 2024 07:38:06 +0300
Subject: [PATCH 04/16] Revert "Revert "Pride-o-mat and refill for it (#22)""

This reverts commit baff3261252aff780b7a5c180be2ab8fefe5ad84.
---
 .../catalog/cargo/cargo-vending.ftl           |   2 +
 .../catalog/fills/crates/vending-crates.ftl   |   2 +
 .../DeltaV/Catalog/Cargo/cargo_vending.yml    |   9 +++
 .../DeltaV/Catalog/Fills/Crates/vending.yml   |   7 +++
 .../VendingMachines/Advertisements/pride.yml  |  12 ++++
 .../VendingMachines/Inventories/pride.yml     |  29 ++++++++++
 .../Service/vending_machine_restock.yml       |  25 ++++++++
 .../Structures/Machines/vending_machines.yml  |  54 ++++++++++++++++++
 .../vending_machine_restock.rsi/base.png      | Bin 0 -> 241 bytes
 .../vending_machine_restock.rsi/green_bit.png | Bin 0 -> 175 bytes
 .../inhand-left.png                           | Bin 0 -> 171 bytes
 .../inhand-right.png                          | Bin 0 -> 172 bytes
 .../vending_machine_restock.rsi/meta.json     |  28 +++++++++
 .../refill_pride.png                          | Bin 0 -> 796 bytes
 .../VendingMachines/pride.rsi/broken.png      | Bin 0 -> 1719 bytes
 .../VendingMachines/pride.rsi/meta.json       |  31 ++++++++++
 .../pride.rsi/normal-unshaded.png             | Bin 0 -> 912 bytes
 .../VendingMachines/pride.rsi/off.png         | Bin 0 -> 1439 bytes
 .../VendingMachines/pride.rsi/panel.png       | Bin 0 -> 190 bytes
 19 files changed, 199 insertions(+)
 create mode 100644 Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl
 create mode 100644 Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
 create mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
 create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
 create mode 100644 Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
 create mode 100644 Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
 create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-right.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png
 create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png
 create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png
 create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png
 create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png

diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl
new file mode 100644
index 0000000000..9d7ece7aa5
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl
@@ -0,0 +1,2 @@
+ent-CrateVendingMachineRestockPride = { ent-CrateVendingMachineRestockPrideFilled }
+    .desc = { ent-CrateVendingMachineRestockPrideFilled.desc }
\ No newline at end of file
diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
new file mode 100644
index 0000000000..c85296a649
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
@@ -0,0 +1,2 @@
+ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate
+    .desc = Contains a restock box for the Pride-O-Mat.
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
new file mode 100644
index 0000000000..343ec4d533
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: CrateVendingMachineRestockPride
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockPrideFilled
+  cost: 1100
+  category: Service
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
new file mode 100644
index 0000000000..985b0443e2
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
@@ -0,0 +1,7 @@
+- type: entity
+  id: CrateVendingMachineRestockPrideFilled
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockPride
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
new file mode 100644
index 0000000000..6b59a93261
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
@@ -0,0 +1,12 @@
+- type: messagePack
+  id: PrideDrobeAds
+  messages:
+  - advertisement-pride-1
+  - advertisement-pride-2
+  - advertisement-pride-3
+
+- type: messagePack
+  id: PrideDrobeGoodbyes
+  messages:
+  - thankyou-pride-1
+  - thankyou-pride-2
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
new file mode 100644
index 0000000000..9e1de27fa4
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
@@ -0,0 +1,29 @@
+- type: vendingMachineInventory
+  id: PrideDrobeInventory
+  startingInventory:
+       ClothingNeckLGBTPin: 3
+       ClothingNeckAromanticPin: 3
+       ClothingNeckAsexualPin: 3
+       ClothingNeckBisexualPin: 3
+       ClothingNeckIntersexPin: 3
+       ClothingNeckLesbianPin: 3
+       ClothingNeckNonBinaryPin: 3
+       ClothingNeckPansexualPin: 3
+       ClothingNeckTransPin: 3
+       PlushieSharkBlue: 2
+       PlushieSharkPink: 2
+       PlushieSharkGrey: 2
+       ClothingNeckCloakTrans: 2
+       ClothingNeckCloakAro: 2
+       ClothingNeckCloakAce: 2
+       ClothingNeckCloakBi: 2
+       ClothingNeckCloakIntersex: 2
+       ClothingNeckCloakEnby: 2
+       ClothingNeckCloakPan: 2
+       ClothingNeckCloakGay: 2
+       ClothingNeckCloakLesbian: 2
+       ClothingHeadHatXmasCrown: 2
+       BedsheetRainbow: 2
+       ClothingUniformColorRainbow: 2
+       ClothingUnderSocksCoder: 1
+       ClothingUnderSocksBee: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
new file mode 100644
index 0000000000..febf8d2765
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -0,0 +1,25 @@
+- type: entity
+  parent: BaseVendingMachineRestock
+  id: BaseVendingMachineRestockDeltaV
+  name: vending machine restock box
+  description: A box for restocking vending machines with corporate goodies.
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi
+
+- type: entity
+  parent: BaseVendingMachineRestockDeltaV
+  id: VendingMachineRestockPride
+  name: Pride-O-Mat restock box
+  description: The station needs more plushie sharks and you know it.
+  components:
+  - type: VendingMachineRestock
+    canRestock:
+    - PrideDrobeInventory
+  - type: Sprite
+    layers:
+    - state: base
+    - state: green_bit
+      shader: unshaded
+    - state: refill_pride
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
new file mode 100644
index 0000000000..a0a511be2a
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
@@ -0,0 +1,54 @@
+- type: entity
+  parent: VendingMachine
+  id: VendingMachinePride
+  name: Pride-O-Mat
+  description: A vending machine containing crimes.
+  components:
+  - type: VendingMachine
+    pack: PrideDrobeInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+  - type: Advertise
+    pack: PrideDrobeAds
+  - type: SpeakOnUIClosed
+    pack: PrideDrobeGoodbyes
+  - type: Speech
+  - type: Sprite
+    sprite: DeltaV/Structures/Machines/VendingMachines/pride.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+
+- type: entity
+  parent: VendingMachine
+  id: VendingMachineCourierDrobe
+  name: CourierDrobe
+  description: Neither solar flares nor meteors nor plasma fire nor void of space stays these couriers from the swift completion of their appointed rounds.
+  components:
+  - type: VendingMachine
+    pack: CourierDrobeInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+  - type: Advertise
+    pack: CourierDrobeAds
+  - type: SpeakOnUIClosed
+    pack: CourierDrobeGoodbyes
+  - type: Sprite
+    sprite: DeltaV/Structures/Machines/VendingMachines/courierdrobe.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: [["Mail"]]
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..01a8c4ed215cd3473a68bc2ec243281307e9007f
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NS%G|&0G|+7
zAg$-6XJ&2Z>gDI@AM70%>K7Ur7Mm24oSBkSRNc}wZSJCl(b`Nvb&MrJe!&b5&u*jv
zIoX~rjv*T7lM^Id8urRCaV0Qa-QBpr#KeSS8N-qLa$N!|=5Vq+eY$kv!4piz>3;3p
z5%2HuUStv8(6l0=N8kkmvksG^2!}(>CW|W^S_`JKF(q|3izYDXC2Wvb*5D}oXv0YZ
hRvxbag9(954EOhV{`}>#VlmKK22WQ%mvv4FO#tw0O9=n~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png
new file mode 100644
index 0000000000000000000000000000000000000000..e362ff17152e40bd6447a9263d5ba02dccb23bb0
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;*0X`wF
zg=Hc~j~+EJ(w#nidPqpfA_j&A1_logkCc=Y2IH9w3~7#zj<vP5(b3Tj4GsVQ|4;7m
z0Ro2qth0)&9svzuED7=pW^j0RBMrzA@pN$vk&sN5U|pOb!Jya{=)lduAQQkKZ1B*!
Q5Gc>!>FVdQ&MBb@0Ew$F`Tzg`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c543aa0751c12cf5969a8a87bb29d3128b02e16
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSEa{HEjtmSN`?>!lvI6;>0X`wF
zK-$dOE+#p%Bi7au$YCrA@(X5gcy=QV$Z_y=aSX9Iotz-Sx`naN;mnIBl?j|e5l)jF
zG&~eiOmy1iI2^=hICwO0Djj(7f<ZK)WyZlBrx-&O1(_D|efgx$a6g!<eR_Ij5zs6K
MPgg&ebxsLQ07#`S?f?J)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..599ede72c16b1374c59787efd92197cd06f27e72
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSEa{HEjtmSN`?>!lvI6;>0X`wF
zK-$dOE+#p%Bi7au$YCrA@(X5gcy=QV$Z_;^aSX9Iotz-SdWF45hhv*|L;|Oi!eoy|
zffk1s858(i4|M4rXbWz*c#%=*0)ub_t6)N@gRp~&5l>?P`>tw121O2zD}D7H_ko5n
Nc)I$ztaD0e0sv9>EsOvF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
new file mode 100644
index 0000000000..b4d6a7706c
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+  "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_pride made by Dorragon for Delta-V",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "green_bit"
+    },
+    {
+      "name": "refill_pride"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png
new file mode 100644
index 0000000000000000000000000000000000000000..f31c671e49ff29e8505718c3e33ecb1b7e04b2ee
GIT binary patch
literal 796
zcmV+%1LOROP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004PX+uL$X=7sm
z04R}lkvU5PQ51#0B#K+qLJJX#0T(P15CyT62&Rb^F@jN>WU>iK9A*+E*a|il0SnQ_
zt?(acE7&Rsf+C36*}F9o#`}^$f+TNvb3e{|=W^!^I0I=tW3|jeCYv*ZexJ4yUe(&(
z>7WM~MvLf{v9L5BqUrj1#G&egSM_Rsui@&7#Vs8i?ZVT#VdjKo8UkB6L-C$)zn+T3
zginM$rVJ>2tMq7v-xMb+{H53o1?Rx2dTPl!j@GfBGBd*C!Xue<Ua!uhzQi5RE-y(P
zls$w+5I;UNqU6~iO%AWrtYp^MH&OO2vMC;2-UbCsaU@BJ*CT3Py2hm@M32jprl4~F
zpQn|Wnyhqp`=IsJwm(OqZ68WS+x|VZ?a~>zUf?=g^KVK{GvA^YYud;$^zOjrO-+j)
zz|}4cJR1=+QkGn@orwf|TtIgi`tG4~t&&ysobx9LZObpZgTo^jll#5ve-c_~5+Z^@
znE(I)32;bRa{vGf5&!@T5&_cPe*6Fc0aZyvK~z{rV_+BsqaiRF0;3@?z#+g$P5WmH
z2>dtu`<LP2&z}q*;(sydE3h#<efyWetM4yPdzh%@09=+Ur{cGPg<1|s{qO<q%ZmzZ
z|3N+nS^o6tUus!FnmISGGymVWhvC1|MdttbbW$w}&@BP^yhW6m;VXd<pqT?;mY-C<
zf;Z?$P6IQ}eSrsQh7k|W)D7}E*z$*u@H&9#Y*@GPD%j%2-|yfC*0TzM*-if1nC9HP
z@*iw@iZTPkBXyki5FG+}H!naeE{%daAg_BF!~xj+2(_H~|5FBh`GDvUxOwv?I0V!#
zzk*wLOIHlcR#(U3L%Ey(L6-0SewD%LO)ljjAiVJm*s_@}{%{9`Y}|-5eqokhe1DTV
ziExs-0ob7ZlUm>gJ`0S+X*kH|Aj=E?P9Zv!@w${$$$sV>yaf=c=8dW!4S~@R7!85p
a8v+0{#(`0aE>brD0000<MNUMnLSTYm!D(#(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png
new file mode 100644
index 0000000000000000000000000000000000000000..b506b41a54344ba1c30369b66a59a258b09a797b
GIT binary patch
literal 1719
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
N002ovPDHLkV1jewC<p)m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json
new file mode 100644
index 0000000000..cef421923b
--- /dev/null
+++ b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-4.0",
+  "copyright": "The art belongs to Woods#1999 on discord",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "broken"
+    },
+    {
+      "name": "off"
+    },
+    {
+      "name": "panel"
+    },
+    {
+      "name": "normal-unshaded",
+      "delays": [
+        [
+          1.5,
+          0.1,
+          1.5,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bea61c2abb8d21e6ab56bfb748b741cc91219d9
GIT binary patch
literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkRLP<nHRCt{2n%_$lQ545NH$?({sr)@Fq$C<dK9tgfg3l6C_S_#~
z_!2}9(W6NJh&{L!k|G2`i>wbTDT!v$wykDb5B@+XZVx*%-ksf?+1(kWJRcbL&YZ*f
z-h1}mI}G=LAP9mW2*Mdf`8hmz^hEdcT&MBUMc-iGc6LdnmY8_@*f(xaqSmkWb8y5v
zJ1(D?Ep7ORN!0r1f;gGtN_j5lx$PGPQR@5704KPz8w!|Q$hfw9eHH*(2Ut&K;?*xO
zR-o^j0A)0u+XJ^^ZLWQCAq~JtuZ1T3B$)b&!uY0UIr{zyFobVyex#$tqW;$&0N=N^
zK*2^f1Ij|_6GN4SDl%|o-e`OME6UOjv<ILdGc}(Zd{dMA*lBmPSbUwDFYH`csN)}{
z@*Wk;j8gRj?EwJ$oy~CVDl|0Y8@6+=r~P-oOH-}@<!M(k@q#5lL+#oo>{UV2ZoX}6
z3xL|}CUjq^tT!j<o12}P0j)ifCF=Vw0c{6t9qwl%o5`(v8>hXI&CojBk1k!`7f0WW
z?F?EQV%p;q6yF)(1XUUm&Fv&KSk-koqg6-dOB$Nn88JE<CZ@jjY<_voGW7#30Vn84
zuVudu)2?l#&vJL-C}zK@UyuaDp<MmIo1iutcY7^&^U)Fg^C#&;;pSJaexTRj+QuhW
z#9fERulD$bO_ch+Ga!{(3jBfLe2s<4Y3mDuAP9mW2!bF8f*|~NNPU2xgVYBg^#PHd
z&!4uw?+hq*3j5>bYZNdYKg#bQ;U}S(zIj!u@1Fo$xPJ8m00)U_c2<_j#E)26{>iI!
zE(vWH)+3n#f2$AhE`g%6BLIQx0}kirh;6U);>}z1#6zYNafa{QBrzQ)w!IFAvu@`?
zC&K!GU<q(Y&2szMeP-BZV0@Ih85kcJh16_msukj`52%D-3D8i})dj#Bxxvot<V-s=
zwogsB>l-@eNwDW2w9@(j|Ksrz0!CdQ0QRA%QzQ{WeSm*~gncC!7a`VN+$q*gGMUWl
zXjr&|()okbp8Lq_13Jb=NdupgN%mQV>;YB#@E$ndHAo|aXQMt~sCA4XK(&Itacq<N
m0Hi)Z>H`Ep5ClQ^r}zWRT7?*&OZzzh0000<MNUMnLSTY)#;FSc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e1dc9af28da3a157cb0fed631875dedc1f2f9f2
GIT binary patch
literal 1439
zcmV;Q1z`G#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<WQAtEWR9J<*mrICT#}$UZQ+4m{+cVwsmTb2ZJ;n$>lFT5iz{K8|
zEWA<>UWBat0Ab;kz>AQDF=QhM7;ME55(Emuk3cXc3}~Z8zzMbykr`WK1rlkHWgBKB
zjb<db`c8M>N1ZHsM*W!E^7JMLid&~nRsH`tRduSakRwkW8dCsOB@u|Mpn#$zS|l+O
z2tJ8I+%RZnz*w|lkyP-ThM~wH&Jh9u7Jx6R|BzlRFOPul!Eau!Gdbm<o@FU8d=)qf
z))GmD|CnFUNFHKcg|BZlxO-^`R}YYI4E=gHSv6q#LWv)&gglZ#NpJ9%@@sie`2<A4
zPYi-$oa5182wSjJEri^qBDY!f_F~e2>*EpebVyPg!PUTxSILrHT>eqYculEBmQw12
zY;zs}lglbIj5R`r%4LdUWrlo@X%zy%nhkcD1wwC?qNF?+j#8{d*s@?s0d|i?$6;eP
zT%JjYN``MSG;-nl5HL<CCWde|L6Q_J%BU#&RWMd4$~Qb9|3dvL4;Y`Ra)I*hnBl3A
zU?RZVpJGN0-_5|k_ol4)LQ{0-O90>rj5ItV>yuf7ic$e;PFV6X#`v5Grr0n~Q{IS4
zCYo#jaiVyWj<8@!t{MJ&AVpUl&Bh=EtYAwXZdb@eX)o(0Ljs{#v^>^u6j5$l<w19i
z75O<Ml&IPv?mX<XK0Zma8sle5JTlBu?G{%LIvQW30}xPHyOZ(INE3~g2qz#J5gLi$
zD@-_LF>q|4H0r<QhJTc_KF(@bVm*tgH%4jJ>eN>RO$$`(m+|Z%5m3dXj(x}T2X)IT
z@Vi`#-TY=h`!ksQQ;<&}Q>2*zh8JEr&g|?AyC)~Um&(nxbuM09<oMASS^M}BZ`R=4
z>o1a}RXj}wAdrH&)AD``{J``+@_lH@R;*@cXE^lJC%bL?hS6{A_CfSHhHN-wsm-_(
zT%@OLwQu$Vxb(|6`1^;?aNy*7En^UaxLl|{O8^qJ*IzaZ9e`a%K(%fA@dv+#4*))D
zd09vhGYA3QoRJPd=^)b6ReI{5z4|x)d1sk3vCrcB$MA+D#AbsKP$X>)kR0Hyw62@$
zFReQS;Luyobxjxkuu4|Q&ja~;z%yvM(1F<gh;%h=i;M_-`N>gEJ$sJFAA16T{X=z%
zc910yLH+z)+XcQ^@68rJdHOVP`kp?$w#a%?%bhDf0!fChZM5|c1l<g|_UN5`U;FD3
zKKb}lPQ3IX0M?vC<W??JZUi(_;wZZZ(8)oz+In2qj&kBx^PFJ5Z3|K`1LOfwK@!t7
zG1?8HJvtpkpFi~yC*S%#Q<J*@7%vnFY(9b92xN(J_g34zd)_N(UOMbqmUoYx;a$$O
z9m?N-K%WTMR0yJOq%O}lm92UwIKbT89CLGXZ31zMY}=|W$&Enj;C54CxTRmYdW{3q
z`?~i*2eB==a`hSj=g*(-ny(o(TQBFG67WPQ*_P?z#YJXkXL1Mk%GPbzE0bxHKnpn|
z`o4%D8){YG`P17w0>7V(X5ja+<r4^ntn9&BOFew}Fw4u!1A$g570#YL+nP?>kCPn{
zP+xFk<{p79IdbI4j=<;V=ezXyF1Y-wpkFEm=e1A4^71m3N`(s-F6@XvrBdmRm~OvC
z?@z!A8n#Uf3kxhPEbIt8SMKwa>hmCRWKql?_9%X$xRn&r41bS80T}jSG=!TG?Dwcg
zO+q8cXb4S#h9b3?IB?uJs3ZlDKAWKLkI5ge2RH}Df#Sd_W}Q~*@(lO}nkD#7$g%<k
t5Z{8MRnh=wl;%xv2I6>!(fWVO{{UT>A1mRYQKSF>002ovPDHLkV1h$nohSeR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png
new file mode 100644
index 0000000000000000000000000000000000000000..0032751ff4ffedd3d0ecc00eaf4e0ab459929e9f
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!<klkcv6U2@<S}6GVEN0u8v_
z4r)lSGV@4eCcb!ba`ON9eKj*1fxt01c=Eyx8w8fy>TD@E@bvU_NvA($#wnr(!Xc+!
zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p
h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0

literal 0
HcmV?d00001


From 3eb3413fbc4ea703577d2ff871cd89581d3f3d65 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Fri, 11 Oct 2024 07:42:52 +0300
Subject: [PATCH 05/16] migration.yml

---
 Resources/Migrations/whiteMigration.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Resources/Migrations/whiteMigration.yml

diff --git a/Resources/Migrations/whiteMigration.yml b/Resources/Migrations/whiteMigration.yml
new file mode 100644
index 0000000000..cbb0f22800
--- /dev/null
+++ b/Resources/Migrations/whiteMigration.yml
@@ -0,0 +1,2 @@
+# 2024-11-10
+VendingMachinePride: VendingMachineCola
\ No newline at end of file

From 232862268deb9cf6529b60f9e6566d7e581287de Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 07:53:18 +0300
Subject: [PATCH 06/16] tweak

---
 Resources/Migrations/migration.yml                            | 4 ++++
 Resources/Migrations/whiteMigration.yml                       | 2 --
 .../Objects/Specific/Service/vending_machine_restock.yml      | 1 +
 .../DeltaV/Entities/Structures/Machines/vending_machines.yml  | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 Resources/Migrations/whiteMigration.yml

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 7f19699ad8..45f76ecab5 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -254,3 +254,7 @@ BriefcaseSyndieBase: null
 # 2024-04-08
 BodyBag_Container: BodyBag
 BodyBag_Folded: BodyBagFolded
+
+# 2024-11-10 WD EDIT
+VendingMachinePride: RandomVending
+VendingMachineRestockPride: null
diff --git a/Resources/Migrations/whiteMigration.yml b/Resources/Migrations/whiteMigration.yml
deleted file mode 100644
index cbb0f22800..0000000000
--- a/Resources/Migrations/whiteMigration.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# 2024-11-10
-VendingMachinePride: VendingMachineCola
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
index febf8d2765..1d9cf3f7ee 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -13,6 +13,7 @@
   id: VendingMachineRestockPride
   name: Pride-O-Mat restock box
   description: The station needs more plushie sharks and you know it.
+  noSpawn: true
   components:
   - type: VendingMachineRestock
     canRestock:
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
index a0a511be2a..50c3289d85 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
@@ -3,6 +3,7 @@
   id: VendingMachinePride
   name: Pride-O-Mat
   description: A vending machine containing crimes.
+  noSpawn: true # WD EDIT
   components:
   - type: VendingMachine
     pack: PrideDrobeInventory

From e7209405f88a8e7b94ea5f765ffeceada207aa47 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 14:54:16 +1000
Subject: [PATCH 07/16] Update vending_machine_restock.yml

---
 .../Objects/Specific/Service/vending_machine_restock.yml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
index 1d9cf3f7ee..af5a37e7db 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -13,7 +13,7 @@
   id: VendingMachineRestockPride
   name: Pride-O-Mat restock box
   description: The station needs more plushie sharks and you know it.
-  noSpawn: true
+  noSpawn: true # WD EDIT
   components:
   - type: VendingMachineRestock
     canRestock:

From 1f56327847e96a393defa11af7e8b3af0a4ed2f9 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 07:56:35 +0300
Subject: [PATCH 08/16] fix

---
 .../Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml    | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
deleted file mode 100644
index 343ec4d533..0000000000
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: cargoProduct
-  id: CrateVendingMachineRestockPride
-  icon:
-    sprite: Objects/Specific/Service/vending_machine_restock.rsi
-    state: base
-  product: CrateVendingMachineRestockPrideFilled
-  cost: 1100
-  category: Service
-  group: market

From f145eb8c37921ccfca8a163fbc2559bc5277df33 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 07:59:38 +0300
Subject: [PATCH 09/16] fix

---
 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
index 985b0443e2..554f77f7c7 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
@@ -1,6 +1,7 @@
 - type: entity
   id: CrateVendingMachineRestockPrideFilled
   parent: CratePlastic
+  noSpawn: true
   components:
   - type: StorageFill
     contents:

From 5179efb7762f0ce3a09e4d3d53f76563be060426 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 15:00:11 +1000
Subject: [PATCH 10/16] Update vending.yml

---
 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
index 554f77f7c7..8f5078dc02 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
@@ -1,8 +1,8 @@
 - type: entity
   id: CrateVendingMachineRestockPrideFilled
   parent: CratePlastic
-  noSpawn: true
+  noSpawn: true # WD EDIT
   components:
   - type: StorageFill
     contents:
-      - id: VendingMachineRestockPride
\ No newline at end of file
+      - id: VendingMachineRestockPride

From 2c3b639c29951c02a0a8561fbda5a45a226675e8 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 20:34:07 +0300
Subject: [PATCH 11/16] fix

---
 .../Objects/Specific/Service/vending_machine_restock.yml         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
index af5a37e7db..febf8d2765 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -13,7 +13,6 @@
   id: VendingMachineRestockPride
   name: Pride-O-Mat restock box
   description: The station needs more plushie sharks and you know it.
-  noSpawn: true # WD EDIT
   components:
   - type: VendingMachineRestock
     canRestock:

From d558708a9e851abb77125657f6df59c44b5353b5 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Thu, 17 Oct 2024 03:37:34 +1000
Subject: [PATCH 12/16] Update vending_machine_restock.yml

---
 .../Objects/Specific/Service/vending_machine_restock.yml         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
index af5a37e7db..febf8d2765 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -13,7 +13,6 @@
   id: VendingMachineRestockPride
   name: Pride-O-Mat restock box
   description: The station needs more plushie sharks and you know it.
-  noSpawn: true # WD EDIT
   components:
   - type: VendingMachineRestock
     canRestock:

From e639e0e49163e4389f38fe8b733194805793d19e Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Thu, 17 Oct 2024 04:01:29 +1000
Subject: [PATCH 13/16] Update vending.yml

---
 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
index 8f5078dc02..067e5be6e6 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
@@ -1,7 +1,6 @@
 - type: entity
   id: CrateVendingMachineRestockPrideFilled
   parent: CratePlastic
-  noSpawn: true # WD EDIT
   components:
   - type: StorageFill
     contents:

From c7fd1d79b2dd989e55491e66dd4fdd6b99cefbca Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Thu, 17 Oct 2024 04:18:01 +1000
Subject: [PATCH 14/16] Update vending_machines.yml

---
 .../DeltaV/Entities/Structures/Machines/vending_machines.yml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
index 50c3289d85..a0a511be2a 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
@@ -3,7 +3,6 @@
   id: VendingMachinePride
   name: Pride-O-Mat
   description: A vending machine containing crimes.
-  noSpawn: true # WD EDIT
   components:
   - type: VendingMachine
     pack: PrideDrobeInventory

From 05c101abc8cc2ed2b76d410b7c73ac0e76d6eaad Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Thu, 17 Oct 2024 04:53:14 +1000
Subject: [PATCH 15/16] Update migration.yml

---
 Resources/Migrations/migration.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 45f76ecab5..f78869a89a 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -257,4 +257,3 @@ BodyBag_Folded: BodyBagFolded
 
 # 2024-11-10 WD EDIT
 VendingMachinePride: RandomVending
-VendingMachineRestockPride: null

From 503c2442d81a97f5f5588fefe9f874b749f99768 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Tue, 22 Oct 2024 20:47:01 +0300
Subject: [PATCH 16/16] Revert "fix"

This reverts commit 1f56327847e96a393defa11af7e8b3af0a4ed2f9.
---
 .../Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml    | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml

diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
new file mode 100644
index 0000000000..343ec4d533
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: CrateVendingMachineRestockPride
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockPrideFilled
+  cost: 1100
+  category: Service
+  group: market