From 8f6b613e1f42a56bebc65ad0009498dbace331ae Mon Sep 17 00:00:00 2001 From: "DESKTOP-0V0K4HQ\\Rosy" Date: Sat, 21 Dec 2024 17:22:07 -0700 Subject: [PATCH 1/4] resprite of the nukie chemvend, the syndiejuice --- .../Structures/Machines/vending_machines.yml | 11 ++++- .../syndiejuice.rsi/broken.png | Bin 0 -> 601 bytes .../VendingMachines/syndiejuice.rsi/deny.png | Bin 0 -> 1083 bytes .../VendingMachines/syndiejuice.rsi/meta.json | 38 ++++++++++++++++++ .../syndiejuice.rsi/normal.png | Bin 0 -> 956 bytes .../VendingMachines/syndiejuice.rsi/off.png | Bin 0 -> 443 bytes .../VendingMachines/syndiejuice.rsi/panel.png | Bin 0 -> 211 bytes 7 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/deny.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/panel.png diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index d8956395a7ba16..27e690050402f4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -2219,7 +2219,7 @@ parent: VendingMachineChemicals id: VendingMachineChemicalsSyndicate name: SyndieJuice - description: Not made with freshly squeezed syndies I hope. + description: Not made with freshly squeezed syndies, I hope. components: - type: VendingMachine pack: ChemVendInventorySyndicate @@ -2228,6 +2228,15 @@ normalState: normal denyState: deny ejectDelay: 2 + - type: Sprite + sprite: Structures/Machines/VendingMachines/syndiejuice.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AccessReader access: [["SyndicateAgent"]] diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..183c58e343b6a370e5a98e1974cc35ce2b5258a2 GIT binary patch literal 601 zcmV-f0;c_mP)J5|3WHMu7`$2Ff>U-aO?`K{M3W6Xw`X*(g^S$yS;%_ z!Ns|%)c$zD{&)ZYyuH6;G=9S7`zvRkVax$nFu7uwMtApey_nDCJ0_vx;y%EqW|hj6 zDk@M!r2@s%nG%!tOoE;D(XaySysA20pI`9$`~si>1yrz8pVGWq4gj#mo>5x?o7~0N z7ePez6i{PsJ1JKKJLOLyM5O}GAyAu=jSLSV-0>FkIX2lU*BhJ&*vhRc3DtIcaSr%o zx(&6fz?OtA_ry=TEuY7SzV>~syP&Ko9kNWWI|f2t1gb(&M&hU4MkoTgPbf7GI<;@Z zvTHjO0TN1c`%SjeYG&uq9YkKj@Fga?L%VY&0_xP!0IP n4gXrfIUhy{-QY z0TT6k(==NLAPAV{O;6_^me&~=&jYaZVBWR?K7ZM<133CD$BV*88lQe~Y^A0U z(XIi2TzZg)H{Nr7?v(cTp0y2A^ez1LJuIG2t9g2m}sbp>d9fH{JuV4q6iKbs`9CeQ!GIqYVOPd6WEY zxSRO~{3Y>WdELH8e($nIhR@n|WCG&p78*E7q_0t(U9?xeEZt|=76BoJ#ORRkS0dCl z0U?EiW=(XAfRJuY_-RiF$nV^XL`MjS9nW)3c#vqDfV|_$(vj#4fgg2#mN)J1e_%Xs z+xc?dL1I`l&u%vN~L&r<+)DiwR4ghxQ00muZ((rLHk zvY|=B#QD|i#^Yp-jD20SO4>xnmq0E(*gW^wHb_oS+T+#PMbd}jjvY~616dQHKT1y6+uKW`UXPp+^`%mdSK!ueJWj1v^UevyWKq?ZO4+t$Sr~@VGBwi%AWslh zI!9i4q4EkMdk!h_3ie%&D7yWD{ZKc6eGj19ANYU!1GlbR4n5iZCr_2J$o+vJg@>G` z>72IJAMk5XRA(2tbn}{RC#NUvBV6tetiE}}_R1L^J^sS{t3>erfLY$;ZsuFdlv^aL zZX4j_;a=Mw8yNxOzzHBkTE2d-hx7D!mgb^GBS`3y7&n2y0pxH0^e;X}hXA#Vlluda z3FM@d8~zp_;;8|pL>C0){y<~`;;D3{xvpGmrM3tN>6#Qe?dckDKV6j49QKHSkYAIc zV+7=;WLOey6Oea2p;jb1LcqPt2?Zt5HUUwd%Z+JaFQg|OB$!a=iQFGh8Wca8r<&Uq zB<_@s@chqz_oP1{6JTw_aq`JFG)a(lu7RNafk5TC?%dan$>sUU)ERAmAaHpu?*qC$ zK{qB7*s8pB;MX-Lz=J?kxl4Opf54YOw?FVN^&2`d`ah}Poa_Jq002ovPDHLkV1jTp B_GWm#}tH?lJdLWp*bZQJPedg@~c0IA_H zb^uW!1>m|aQUKoMGLaYi)oe@ebZkli5JGU#YQZw|T8HgQ6#$UgDhmNnr-TrJ&CXRH z#g$dqwjCS*Wxzf=9qGJ#aD>H;H2}c=&K|P?;QaD}1yDOaM(^hmzJ9yJ-tUyeh%yHN zXc?HTH<0n>P@6LF=lmUBzd8f}l!`?F27ng;`qDaq0q7XO`ZD%+_5c8j8*9RR>KuT? zKvettISS}0n5y@tOxEgpNHxgCYl4?>$@X$ zqstKwiRQp;y}|5^V*K$k(5_UG*(yt{(DxK$VSwIv%6q}P3xZAqkN^Yxji&-XJ{|_H zhqyUAW%t11#+qn*<3Si02D6_(ONS4@&j39ED%;P%MXSZu@srL6G%^65firHO_kA{? zJ`n@MK!N1gv*R|Eg^rd1b_3QM!bxaXsxaq_z*A5lIXG@pcNKdNgt2|3hxA{Y(E2u=mWe!fqFyu^6|Dg zXDB6_u=+r#_FVPdSH0ug^OxBrr9Ke4J?HmSwZE!&JOiE9i9o+foB&2J5EuT|UZoFc e8JOw=4~f5LaJksK1a*-B0000&nQQ`r*hP{nc#)C=1agkt zKys1XA~GPj@oj{nmeSIVn{?%%nQ7F7iHqg~;ms)T|M?x|8K~hn&K?&ciXsC5ZVzuP z77J{*TW!L=?;{8TvA)r!)RC)!!3{`<5CE3TB{=7BT^9fvbstncIOmOLjQYa1?Y-xD zAfn!46^yagXTmT=I!cL?ndG zvJ_WViTL>=w_fx`q2 z(UL$VW?`TN=F=JG(;0w)5~%Y(&p@4P0@noE63}koXEYM^^OJQM19=>a+B{-Nn}JHm zWsX>Lij;$nHUlnmz$t31lX!PI14+DV#IF)RYCtt!b;X)YL`_6sjQu(2C=Jvb^hG6f lY|4_x@{^T&QjO(<^9yP!tR3@ADp~*l002ovPDHLkV1kGoylMad literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..a0039f58da78f12e0b90762759c4294af8da0af7 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DA?-h z;usRqnw%iPx;R0krzy~Y%k7|s1S>O-L}ucPCnqQWkKb1_vk?d!gM%k8+^|7lxvkEY zf&))aPnUH1Q)ZkZY9JhP+J&3l00@8_<2w)aWi8l!W`CIO_%zx4@S4rXzLYntTc>yU yZ Date: Sat, 21 Dec 2024 17:26:13 -0700 Subject: [PATCH 2/4] edited attribution, oops --- .../Machines/VendingMachines/syndiejuice.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json index ece84f34af17ff..06752c8a1b05c0 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tg at https://github.com/tgstation/tgstation/commit/245b29599acbb6bba24f005095e7798e954fc81c", + "copyright": "Taken from tg at https://github.com/tgstation/tgstation/commit/245b29599acbb6bba24f005095e7798e954fc81c, major changes by RosySaturniidae", "size": { "x": 32, "y": 32 From a342da1599e0ea704873d1d0618a7fdc4513b44f Mon Sep 17 00:00:00 2001 From: "DESKTOP-0V0K4HQ\\Rosy" Date: Thu, 26 Dec 2024 08:41:58 -0700 Subject: [PATCH 3/4] moved files to imp directory --- .../Structures/Machines/vending_machines.yml | 2 +- .../VendingMachines/syndiejuice.rsi/broken.png | Bin .../VendingMachines/syndiejuice.rsi/deny.png | Bin .../VendingMachines/syndiejuice.rsi/meta.json | 0 .../VendingMachines/syndiejuice.rsi/normal.png | Bin .../VendingMachines/syndiejuice.rsi/off.png | Bin .../VendingMachines/syndiejuice.rsi/panel.png | Bin 7 files changed, 1 insertion(+), 1 deletion(-) rename Resources/Textures/{ => _Impstation}/Structures/Machines/VendingMachines/syndiejuice.rsi/broken.png (100%) rename Resources/Textures/{ => _Impstation}/Structures/Machines/VendingMachines/syndiejuice.rsi/deny.png (100%) rename Resources/Textures/{ => _Impstation}/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json (100%) rename Resources/Textures/{ => _Impstation}/Structures/Machines/VendingMachines/syndiejuice.rsi/normal.png (100%) rename Resources/Textures/{ => _Impstation}/Structures/Machines/VendingMachines/syndiejuice.rsi/off.png (100%) rename Resources/Textures/{ => _Impstation}/Structures/Machines/VendingMachines/syndiejuice.rsi/panel.png (100%) diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 27e690050402f4..70c496f6bb07b5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -2229,7 +2229,7 @@ denyState: deny ejectDelay: 2 - type: Sprite - sprite: Structures/Machines/VendingMachines/syndiejuice.rsi + sprite: _Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/broken.png b/Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/broken.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/broken.png rename to Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/broken.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/deny.png b/Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/deny.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/deny.png rename to Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/deny.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json b/Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json rename to Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/meta.json diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/normal.png b/Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/normal.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/normal.png rename to Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/normal.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/off.png b/Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/off.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/off.png rename to Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/off.png diff --git a/Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/panel.png b/Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/panel.png similarity index 100% rename from Resources/Textures/Structures/Machines/VendingMachines/syndiejuice.rsi/panel.png rename to Resources/Textures/_Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi/panel.png From ef35fa455406341ed96754ed9f21c23ea91ea398 Mon Sep 17 00:00:00 2001 From: "DESKTOP-0V0K4HQ\\Rosy" Date: Thu, 26 Dec 2024 12:34:16 -0700 Subject: [PATCH 4/4] noted imp edit --- .../Entities/Structures/Machines/vending_machines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 70c496f6bb07b5..98d1752deacace 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -2228,7 +2228,7 @@ normalState: normal denyState: deny ejectDelay: 2 - - type: Sprite + - type: Sprite # imp sprite: _Impstation/Structures/Machines/VendingMachines/syndiejuice.rsi layers: - state: "off"