From c043e7e4506759473e7a514e4c22d2b670f06a73 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Wed, 4 Dec 2024 20:03:24 -0600 Subject: [PATCH 1/5] Makes intercoms rotate to indicate direction they are facing --- .../Structures/Wallmounts/intercom.yml | 4 +- .../Wallmounts/intercom.rsi/base.png | Bin 0 -> 1383 bytes .../Wallmounts/intercom.rsi/broadcasting.png | Bin 0 -> 160 bytes .../Wallmounts/intercom.rsi/build.png | Bin 0 -> 1041 bytes .../Wallmounts/intercom.rsi/meta.json | 35 ++++++++++++++++++ .../Wallmounts/intercom.rsi/panel.png | Bin 0 -> 460 bytes .../Wallmounts/intercom.rsi/speaker.png | Bin 0 -> 154 bytes .../Wallmounts/intercom.rsi/unshaded.png | Bin 0 -> 316 bytes 8 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/base.png create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/broadcasting.png create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/build.png create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/panel.png create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/speaker.png create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/unshaded.png diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 94190eda50e..4cb405f26f9 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -43,7 +43,7 @@ - type: Sprite noRot: false drawdepth: SmallObjects - sprite: Structures/Wallmounts/intercom.rsi + sprite: DeltaV/Structures/Wallmounts/intercom.rsi # DeltaV - Add sprite rotation layers: - state: base - state: unshaded @@ -135,7 +135,7 @@ - type: InteractionOutline - type: Sprite drawdepth: SmallObjects - sprite: Structures/Wallmounts/intercom.rsi + sprite: DeltaV/Structures/Wallmounts/intercom.rsi # DeltaV - Add sprite rotation layers: - state: build - state: panel diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/base.png b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..35fcd2101f97a95568759b6b2c20c2d4a1d8ce25 GIT binary patch literal 1383 zcmV-t1(^DYP)Px)AxT6*RCt{2n$J(;Mij@tt*R6PZE?VK6A{&ArA;6!Cy;=MwwG1ao>31-mD;M6 zDn;TCLdtb_rAi#C{tKzL0zm@A;)fHpY`V@SY+z&9LP)a*dPrxm^TW0_6UZw5Tx`#b z$1_he&u`v)fQ?OG^WJR_z=%K~aMfuadwY9^bL?3G1OkC8=b%GZRwxwU@p#(4)2hC5 zSu+&E`yGz6tMI%Fz7rK6X8r`vyYS;rKZEC8c#&7|BClX>K1%O(^+V6$m@I+kU8djo z;0EUL)*K&~!99rLvxf4AUw#DuI6G76J%MwL3dcD-D(kdo1rSv~ny(|R7-yoU1qA1j=`eSVk!$VF0Xlt1P!1+Z5%dr^t zW%C2cZDJ?@uh)xWu}H5#-Qaliq{%QLNU0>2V=<&9iT#KfV`vGsvZ_|%aazB( zyQ^!jeO`&j5fnw1W9a!Wy)FE-(7z%*rUC6!p9nW4?5psqg2$N9DCG2e1|No2MEaA6bR{;Q_nflUK%O$*i zx&dKy6#Ud({Qdl>%TwqK!!2+VZt2^m?@eJF8yg!N8ylOxg_)IR)oL`e3|aMK6(*gK zC{9omk(MNS1+JqtJnzEsaoO-}K+Yf9wj|O+95YrUK2~8G93^frt=kL$?)m(19sFgv zpRff$Y;BOmC>KmKCgavvdQh~DRwT+<5J+*o5aUSGTUr zdOAghKoX={h2lD;D*|W?mH>4Js#UaYiEaVvTZ`xxRxlGlPz*v!CF$g)R8kitA>Lyv zv})Tf4%sQplcY$}lFvWIy6djMbPJqcRPe)h-{btELK7DWByM1Z&`c0&xx{j4ZDA&W zeOU&_ark9*6&%N5UzV{i%WrK5%*-y}R6U{Pt@H{Dm~DZ^L(6qQbqu-OA=GjS9*@V= zh#__W=NhMWKw1-tCc1@H;svu6Kyvf6cKd`^p!GYI9m{>ae!8K1_W7qErIKxvB|Cwc z0LUSwU8?HmpAJ~=OBfy1Jr6h>I{m^DW&$`W=9^XkIkaRmGCujoy7^k3x{GW^zr;z( pjW&0f1%2-kvazwTv9al6{sYvJj)j&~Eo}e*002ovPDHLkV1kv6m9_u? literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/broadcasting.png b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/broadcasting.png new file mode 100644 index 0000000000000000000000000000000000000000..a4649bf96da00b28e14c41effd4ec8762cda1e37 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|qC8z3Ln`LH zy>(EqL4k+mK+hIONwH+bFV2Bi9w%_uu^he2rgz?3O^{)Y>h&w$-FDS{Kurt}n!UQ` zWfvu|0GWyV>+?6(F*6*nx_9gS_CUwub$wk-3=jIaUwz^a%CmY`3ew=|>gTe~DWM4f D#tSwI literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/build.png b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/build.png new file mode 100644 index 0000000000000000000000000000000000000000..fa035d280a7d9f33bd7fc659e211f53f9205fa74 GIT binary patch literal 1041 zcmV+s1n&EZP)Px&%Sl8*RCt{2n=w<{FcioC^l-Ms5YaZAF=x~bhBDKEegOEi@D<8Thh#%=7_Qub z92{?U?$UuubsSr-JB3YD$6OueU9~--aPt&bo{hgb<|JSa}bt9Uw@v3=w~-41!&< zg_h$0m=2VjbLFf7SRMo^rRWa^%7^EiBjQi!4+gKght&>XjN$a;q?T=6yCPOQfKrOH z^K$^R^SeO&F6?x%ItDPtaIn9xv=KqD*W1Qz7=jR@6$GtSg21d4ehu@aaKlGOIXphX z5UdP>A{#3Pl)O57c=$6@FR#r0F|pYR%2}XHRrLo0knZM8`Apqth|`l3+}21)-V<#d zAOwd>nF%|_*aBT!4%!Z=D>%;1&p|2G?$EN)7D5O6`$)44K=~*jgrG~d(Ccll#0XG2 zph{J>9H%VU0VoZER-<%4nvG>TnPy`oqZs{utZZ6+@5{@%4N|%% zzu$$S^$t-wz}@J`ho;~5RHl+7iNUU}Wu3>zXu&SNElLN(&m);`#?PZ#4Zfz%d!i+U z-(q9pz0vAi5Cjv?^D4{l@9(XD;38J92rUCGA(V__JUZ1?l976fY-ng`XlSqtW1^+* z0_r@WWU8II7-=L3g2}G$gHj5{nEV9(Z&|w=9mLNg<&hP!5SzEnFU$(W+Jp%w7*&E| z8LYT$w&VLUL#zY4x|V5p*{V~WvqE(->HyN+#KpxgknW~jHnSb$xqvvJ6!E92-|Ma? z6m83Pg;l3TbuktLs@~PI;VM#QkvkNx%WTWAE(X-0-ErZ09z4$jAq0dFd0qCfyS|TI z-$#-p_<4McBuQq@4lTk;q{C^JO~n_Jtb_x^86lI=UtskK5#VJ5wzx-W5@REv*V~?o z&V-Pa*d#GN0)!K~WXp8ZZ-UVnz@s6Kj(&hgLwRt~c8uwOsxsBwUPlL%X$h0LfU#Gg zN(i+(E-2kYlEjtCkocQRJ{fAaT`+bn<4As!Rvd{lfw5O$UecnQ4CU#PEh(Bzvl2R> zPx$hDk(0RCt{2+OckfFc1ddOVy4Bwa|88AurPx=yUc3`Z9Q7DozC6l1Rxw9MLEU zE-r^${%?tp4T8gV@YyR0Nb>T0Op>Ix+!#YadK>)U&8`EGw8v)Qt) z`QUp~p$n=7*ruj(pqwkH7NDZotNfOr0zgD$ttDM(ver_e+u!7)AZzVi*9$HHe~tB* zF}FO=k3)5|)Th0c!qr%a1w-kEPy%*pUu%Jb`%s^5G-^$ZQ}wrkyzPOvaA zSlnCp_Cu6t$?~;bObiTmuYUY*h@Gv>aA3WU^(>xGTEUARfz*4t`njxgN@xNASc@|4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/unshaded.png b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..5af1ce420243eb982cd4605946ff936e2b06b9a2 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|zInPhhE&XX zd+R)JlYz+bkMeI0aGDni#Ws=LG^+x+jLM_**wg?Lgz6eM{;u z*>M7OpWc2~eoawc#_hicpY^>=f3?hXrtQ{KmaAu%1ql_!Gq#1T@d}Mye*K=<>Y`~C zX%oK)Ffi!&UOF9g|7TrzTL0Y09M2zB>J_%}^X?gY?zXA_{qOoDIVPaFAfR&hJm>Oz zH{G*qLgqbT%zQfM=8CH1cNKOI_d2P3{(JbqBF%{_XP5mvoK+L}$oNLUe_o{{S_b=? zds6d0YNaqOn#ruPcj}3s0 Date: Wed, 18 Dec 2024 18:58:26 -0600 Subject: [PATCH 2/5] goofed the confict resolve --- .../DeltaV/Structures/Wallmounts/intercom.rsi/meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json index 3730fc84677..d44e3c25968 100644 --- a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi, modified by JustAnOrage, Modified by Radezolid for random intercom spawner", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi, modified by JustAnOrage, Modified by Radezolid for random intercom spawner", "states": [ { "name": "base", From 85869bcef9e6e464342160cc21ef346eb736eb5d Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 1 Jan 2025 13:13:41 +0000 Subject: [PATCH 3/5] webedit ops 1 Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../Prototypes/Entities/Structures/Wallmounts/intercom.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 4cb405f26f9..93537d80d01 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -43,7 +43,7 @@ - type: Sprite noRot: false drawdepth: SmallObjects - sprite: DeltaV/Structures/Wallmounts/intercom.rsi # DeltaV - Add sprite rotation + sprite: _DV/Structures/Wallmounts/intercom.rsi # DeltaV - Add sprite rotation layers: - state: base - state: unshaded @@ -135,7 +135,7 @@ - type: InteractionOutline - type: Sprite drawdepth: SmallObjects - sprite: DeltaV/Structures/Wallmounts/intercom.rsi # DeltaV - Add sprite rotation + sprite: _DV/Structures/Wallmounts/intercom.rsi # DeltaV - Add sprite rotation layers: - state: build - state: panel From 5cbfb8b8552709b5763f730e88c7ab466f6ae386 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 1 Jan 2025 13:14:38 +0000 Subject: [PATCH 4/5] webedit ops 2 Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../DeltaV/Structures/Wallmounts/intercom.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json index d44e3c25968..ea072f2e8cf 100644 --- a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json @@ -31,7 +31,7 @@ "name": "panel", "directions": 4 }, - { + { "name": "random_intercom", "directions": 4 } From 10011aee9391283a18bae1151d42e1ca7ef6138b Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 1 Jan 2025 13:15:21 +0000 Subject: [PATCH 5/5] webedit ops 3 Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../DeltaV/Structures/Wallmounts/intercom.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json index ea072f2e8cf..a993f92d76d 100644 --- a/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/intercom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi, modified by JustAnOrage, Modified by Radezolid for random intercom spawner", + "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/6bfe3b2e4fcbcdac9159dc4f0327a82ddf05ba7bi, modified by JustAnOrange, Modified by Radezolid for random intercom spawner", "size": { "x": 32, "y": 32