From 7d5cb9f9770f0f1ad9e756cbb11567affad8ea25 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:58:55 +1300 Subject: [PATCH 01/40] New Computer terminal sprites! And another resprite bundle begins. --- .../Machines/computers.rsi/broken.png | Bin 3542 -> 2770 bytes .../Machines/computers.rsi/computer.png | Bin 1872 -> 1447 bytes .../computers.rsi/generic_keyboard.png | Bin 1201 -> 993 bytes .../Machines/computers.rsi/generic_keys.png | Bin 338 -> 339 bytes .../Machines/computers.rsi/id_key_off.png | Bin 1136 -> 1049 bytes .../Machines/computers.rsi/meta.json | 2 +- .../Structures/Machines/parts.rsi/0.png | Bin 1717 -> 1322 bytes .../Structures/Machines/parts.rsi/1.png | Bin 2040 -> 1415 bytes .../Structures/Machines/parts.rsi/2.png | Bin 1885 -> 1447 bytes .../Structures/Machines/parts.rsi/3.png | Bin 2224 -> 2236 bytes .../Structures/Machines/parts.rsi/4.png | Bin 1986 -> 1793 bytes .../Structures/Machines/parts.rsi/meta.json | 2 +- 12 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Structures/Machines/computers.rsi/broken.png b/Resources/Textures/Structures/Machines/computers.rsi/broken.png index 5adb4f73f2eb804a8e96da7845c7b321399e64e8..1f457c2db133c8273a7f5f52081f44dc8483baa3 100644 GIT binary patch delta 2750 zcmV;v3PJVO8`2e!Fn1Ur1cp8UNXYtcqO@BvJ0jK8UIA=!=2t1SDC< z2PvsY6WC>;ArM$tx^?r=IzBC>Pl1A_dDu<21Qr64LfAqQ#Ab^Rj!6(QUQh~VR=W~P za0cB34n;H+Qv0Ca@w?~Gy>}*wdC2d@x#ymH&iDPkKj*K&TYruk{&3-wk?sBH^!hiW zHMVkB|E~IRNYdUx`tjA*-);|_K84M#=hgI;81;3v@cqp8=bwEPQYxnZsthxd8;b4! zAb+{J^&C=eRMXch!RFR;jE-Fe0L@7LT0~oWC(7j#mX{Wz38=5DeM#}-k)#h&mMcMMYwv`V5<&=T z`TE)_+S)rqZ4e1IC;}!XZdajBb%^VWE1+B6^HNw|TEzO=sYxf0C8UETvT6QhokRFbLpr`eiVz3R69`w)YsJ_o$gT2 zTwt5L~k%J5ZNKj&!EXSXtyn{dl&g7>;ZF2=VDExds1K-ai(Wxp--n}0R z^~hn6lz*i-(=)FPq8C7n00JnN?wm;;;)DU?D)uBlSfy!*-wSOxF0H9QUYA7Luuqwv0KFLG%UEa68 zwu(~uX{gMZ1E>>M#^=KifRF%s+*bl_ahn13db$C4nauz?oE|`MWqcA&&ka!uC&}bI z-`JGb`=dHM2j~W%cQ%A_fbVA@ga`@B-HSl;bb3!y%_s#)@VE@$o9z$f8~#1zC7VSl z2Y=Y)pm(IGkW#|) zQU(bWQq?Tf(&-Kqi;s+NxdE&bA%bn;K|_u$+1MsXv?6n@$6q&y1Q(nHaDn-6PJapy z3o4`C94h0#D+LK2m00zfYBaU)_pPfC1^;vUJz$>{(ShB`Mos`_W>>f##|ows<7*Us(;&=+v_GF z%KH0mfT|81Uo+mM0p30&_5j;abG66TuNp5STcX2J{ph;Bu9kjpziARKd@`~j(_R=97b|O`*x|q22y@HKWE676p0D2VRY>38zX^~r_GOQ z;S7N!O3{L8_so6Y!htJ4lb>?#G;tkVvRMh>F<)O-i^;q9L+_{aa|nV$Xj^>0NYIsU zY-&~;9>=@Vp}K$g{jk!(l@pvE;JPj|zfeRF6hcc{orE|gD!nAd!GDz}a9KDBNv`~a z2sqI*ux(kUhH$(qjlOI*M#rwATrR0Kf<{6pD-)>9bxEo(+a38G07H2?av#YJCA#0F z>u7jDOKVr6gy#DhwSh`ILB--DMT~9ZQwV{-{Mo%2tgoxZuYWV_{MPeQC>9?X8?&*S zH4(ZQqri>&7YKp^rhoHum|rMb80GcRW190)18Qg3N_hX$1k@7CL;-i2NLY2F$A*F(e2s%~f?G(&>&6QE?DL7+c}COBdvI z)V3>U5p22{1b>d7eQBz(sX25Ml@#T2DRLi@Cq)_t>57dDHr=cq zK%;;T9%J04$O5)lCjl!3Czyl!;2yp2W%0V`FAjUsnqu8h;=}gY~|zuA~q`od{Ly0l?15 zl%79qgu3LDaswl|A)G8dhHO1)d}mz?_c488MJ-1Do3xD(*C^}rqbNPU9=$6YRJiYf0j$$j+ zmO;SbTR%YVvaJhD4Gs>T!T9)f2q9Ew`hQ~R7N_U>x>_r_K~TWJ=~JP)ybba~t~~WE zrNsI37o4*}TAd!gwHhA+&(0o03iX^21-^^KLF@jcBv8!ryN#s$$Fo1;pV6y$ zg^K=bjC(>56ja9~hzoi$v)vKcEgMd{jDO~RbLG?N4q(|O3e}8c;H!qJ}a$SnB-VotvY3&*w&V6BRSI_Wdc>wswFMej!r)xQ+ zBb6KL@^^C|ZXdq&gSAt_#g#*fgeWX8Ek@l4i6sEoAt7!KLCVK1<)58B2Ch8dJ~tdq zbVQxxGDAY^JNtc!K5Q`hjoJc#UFY<1=ksr>-?tP02mBmfs6t$@rT_o{07*qoM6N<$ Ef{=t%%m4rY delta 3528 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 delta 1858 zcmV-I2fg^G3(yXbBYy`MNklam!EB)JVS=5b!T8WpCq9hQ-mWDK+BBs^ zs;0>@YS*rb@u598=jNV!?@4lRT6Mpdo7{Z&eBbvw-#!1nFMq)Q9J}Z*ZGL~g8cL@{ zahJYSbs&%rZGL~gr*{yI?grTHHdBqEEE2Y(0|b^pDwVE=9Wu}zU?z$? zKtaH!!1kcg-GD3apEFg*)ek?HeOC}bzXGXLTJbut?rHr--z&TVY>?mTT=hsVCt-6q z4ZUV_IfZ^10e_9|21FuZRRfJcFxagtlU`1ma%DkAKqL}Id~S-zkFpVo=*zTs9K+=J zeZ#LTFbBbfSgax^)zIYeaLFyi=S{h?z$5?wtX34L#a=Dyt1hA0Lo4+#NQ4v5Rm&=tjaO$;uybxHobaXU|`jO+z$-!EQt%VN*#62D@>cia_QVAXqGh z@5F2lr{;VFYHNT7{mZJ&9z)V%Vl1d!d6(N{fG z=R~Lg#d!dMS+4+(gJzyd7DGnBVq!^gWMnkd!g2GAE>!hH(H(az{@NP@d9N>Eir(nV z1b+DLrcAdi0;War+Sad6jpJK?gm`{;-eiy0{4*-{q z&+#ar7bO0}UPK~cw6yxGwsO=$o8O;rX@B)25(&e9*el)VT|{vaz(Ra(YTHR5&R3Gp zWUd6YoFY3al0R%|^#cI2;=@eP&M(AbXg+j=x!a?CVcDo4fK+M#n=7*7MF|~RONj)4 z>XSe_Pi!Ez6)&G#TKy<&u9T%Y%m^s#*|kq_1wl}dpk+8OL3*zh?YtlenkUF!Uw=UJ z41!63-EQNq6RN4Hkw_qsQ;bG;gJy9Q4Z2oHZ8H?Ua|26>1Zrw(xN`?;gJQ**p?&-I zK@bEi#A1lfOyJ(gU8Y!_KsuH=StcEHfx3|X-5msBEXDB|I-n`Gd*rs1e8OjON=F0p*+`b45U@ z%S0urkwC-daH6TX1(W0VD~^ElauV$w$FLBem!;QNR#qhEA4Wx{jq|hOmJjNw zHYNeXLm|bzTD#H_ngqJOxPKZEKs#UOI;gPkQEKzq`B_nWN6WfN@9J1&00ly55(vzW zfF_Se)A>?-Q5^)e8l`3GTn8l*2-3?*sn1cq7>kJ|ymRpib6#KkZCTg(N2w%teo>QvT7SC}J-vfc!c>oh zU&ek^ZL8Frzt%rj)a(EX&QFeyp?~0lZiJ{3@FOda$yZ)P$XnNuvCljCCw z+jvk;fy5}Sh<;ZY#N9@D`S{{z&e3hNbZ*%+T55quC5enK06XoC&CS=yjm3EUB7jLs wX0(F#i**sG=`2f^5t*DW>T_8}Y^TnD0I}-@27`}5KmY&$07*qoM6N<$f)s~)L;wH) diff --git a/Resources/Textures/Structures/Machines/computers.rsi/generic_keyboard.png b/Resources/Textures/Structures/Machines/computers.rsi/generic_keyboard.png index 24428eb4e3682534d7583f152aaa364ea79f9115..b6fad4bba414a59d16d22e50ca33782e119bb539 100644 GIT binary patch delta 972 zcmV;-12g=w3E>BjBYyw^b5ch_0Itp)=>Px&n@L1LRCt{2n=wdRK^VvXmJUg#o0RC% zQc#{*Iy@r?QXM)-2)H;3LYG>d8Z(vB$tiI&wTmD)W+_N;a4;eisu^5TNkHsk9y;Bm zZt2ioc<<%z<-OOt_{94y2X}e@+rn^(WHT?o}rKYGu@ z2&-UotK81aP2=|Np4ZGBNH6khD_wPocnqeQZm%vc3;+=_007+H-J?(}b=C6*;s-xk zkum@P990i6I+k+OeawAAvr!MEzG*dN${-2)#TOJQ(mL|FRKuoJl% z(2Hbp*t5L3zJCg&7g+T2V4J}8DUjzm1>sEdpNYPAypfN7>-nrUUFV|y;c-}WluRavK?o6+el(&)U{^TE zY3wl|G=S(R>Gw3|r4c0@1~APuj;aTp;DViOc0Q0WZzpLs>M+eTcaeQ4xZ5C)-QAr) z!i$Sb+<*G0ZG(1Z?>jYgx4}a2ggjj_5=K2aZ*H<8fbUH3bfpc(s zci#!Hx^+~<9F^q<$ch81jwdS15^FZj|nrdxENj zAB!j0*BOwA$2=3TYPAz&=B9h<$V93E*xyk^=lRP1F)XVkeBQEJsO%r(%jcYDJYZ+L zAg#|*4RBaJ^=z-zPCR!7N@?FSxuqJQS4HP7tL5p>v(>(zMv!U%-t=}aV3!wX!m!Z4 uww(Q$DCZZ2r5LhJ36cHVoJOPR3x5Fn>F=j-dK#q z!=MZbds*kp>cf=k9+W*ag;=o$S|0=vZK*z3`_z{?iqdUDDU3=PMY@c{(5z!ugRZ&N zqTIK}_~;A`|^aNrD@ z`~jj|YcP6D-oBru!bXG6Vp9Lp&Qd$M22h*1dDR8hAkWHk30q=@%~v^0(!`;tmuMW`Q-H~9mK z9bxaDy;%Hx0UnRr@Oh8NjV6BpZS5Uc{r5RhXZFb33R~uaM5XxP4M6=9SV=7-zrIeC zrGKA3!Py@!U^v>ZyMo7Kv6|s%e_$LtMoD^%>JsPshG2|8L-%oDsTOi{TQK}$!Aig|*5w0{5q z;;S*l|BPWx$RL}|89txQ<_K?6s^fT1@bJ+u(9?5VwJw{@nK~L5kLa}`$Mo};xcB4a zrur#`ssSGU_N#7vOY1>XIu9QFOrtxdplSf40h+mgm`p4g>Ns`=)Om{cgVwVz001-7 w6N)xQ(I9}rKPxe!T-+uT^%)EXgBL-G_v8G{&wBN^g8%>k07*qoM6N<$f_#ERwEzGB diff --git a/Resources/Textures/Structures/Machines/computers.rsi/generic_keys.png b/Resources/Textures/Structures/Machines/computers.rsi/generic_keys.png index e03c920a723496c1ec4ccbd85de2e857bc926d05..a98c82cbaab12a6e700735d8024f9848934889b3 100644 GIT binary patch delta 312 zcmV-80muH*0@DJJB!2;OQb$4nuFf3k0003ENkl=y0RR91ShqXigW+MC9pVcB0000< KMNUMnLSTX(UYM8w delta 311 zcmcc2bctz#N)!abyQsaa}=eQ0|{C~UWu1Q(L(GLQQ3~R#E-ts?J55InXddlv# zKipM+-t*jV7bZVHJ$WtTz8pSXzwFP>HG*q{rLx}f?bs4tZxgb!|5|eTO7^eva*R7Y zW%*Wz|GBlMdmHC2I|&2i5agFQ!?fGorC$6yU&Yx^DBS5$8ONW00jcvFDLG^ zd!O~m?V?;%y20u6BB?1IuUAh$;(tRgZ^QJNY#DwLb@DThR%ZyWF;Qq)HcPt9^k(Un z=~LNSjzl;c1mC}wqFDC%VqB7OL+nP)poj8)(+KP1ffvP;9^BV?2;VG^d@yn zhxA?F-Mzc>!h3qb_W^m_JAc1>@0*wR=XbvVkDP&rZUE2x$A3acRKLAdjNQ&xV`Cl5 zdMCWc`+E}Cu`1R#cRSPX-{AV@R&-k^OcaHcMPFSeoq}cMJ4*|*13-cV0D$Y8TNFzh zzIstd?!sMsB}xDQs8uU?@p9BvC+f&uuqc9O>{N{}rf1npMC_pC$;U>I3nNht;3?=a96h1H8}S?LuI zNT2{i!y~Zmrqf|oGNML+$d;9&uR)>&$fQ#+%^c3oegp7#fKuw~1gqoAAY0SSA(KwI z>=PqEy?z7$u&g{RE3fQ1<^4nFSsIN-qj~H&=i-UU>3t{I;u?XQlfNex%qjG)kl|lZ(FtS)HtwtUwye0p~A3D7DYo%3ZZ=Mu{BOuO!BIt-p z2=UpAPGb*^P=K%l1%q`wNRTM|q#zW41t5U`pPFgr0KhkdMMK&!vZz%nF8d^Y`hZ6O z%gUoxt$)BYb54g@+3N(x`>9ncu&lhYNwyb+%bU5%KSoDK{> z#~s2!F*pE;={z8KG4kyBYoQ2NmnX3rEz6HaqtR$I8jVJyQG(Qcc~FuQPgKH_3?Ffj zD!}R4pAOJ{%j->cVs!`AW3U7zFYBATovF9up?~%OFls)P)^4e9hl`~RS2&G_5Q6XD z)*^jm(kXoUyd3C5c2IRN`d{KfDFq<}rkQg^g$*Mclmh4C`sNmfk#*TJUn=5?O7a8v zKqw29_W~b;Q595GB7m%+Iy5}u@})uq>0be$+fX(av|9}rMizyY#n1^50G1YJ2M(&o zD1WRh!Z5NY=~QR}R=s}YN@nIqfPAVsK!98`}(@7L=`p+lKcdheOsQU!==Je%2rVDrU&iXc@0(eU;rQC(f0 x1crtF-CO2uWbZ1IK&i)jN>H*2Xf&F>;V%&HCz#^ww|xKr002ovPDHLkV1l1b=92&b delta 1115 zcmV-h1f=_!2=EAyB!3BTNLh0L01FZT01FZU(%pXi000CcNkl4Nn%8z(xQSSNc3Y5MGqzPLmFrgK@TNJFH1oyf{7LRlOgnj zhz}uDQW&TM>;?Uwoe}+XGgB^ zvf;++joSb?DW%IxJH*hN2&JW`yW-;F0CR!iS1&^H8-H1wx5C2?GdP`2uvx89z`(%3 zz`*(e!9Rv(rvHF$#mb0&40#eE-uRo>>mfPex1@sOdn}}H$dDzqz8?X@svkb%&-xy~ z;S=ZGPOwoD0a_^|Ws{b5>!GT*4b1ta#Nq@UK<1dG?h+u@0$5SWNksRrXph0(A0-aj zK#Tw^J%8mSg0H@$%2Sf=UkW2Y-~hfKhi3~9n3o4iO_BuFM{9h>`1$wRS_NEKl9GCU z)J4ECZ8bo}{KmW#_tKPrJ-LGwl>!b6nCXrH?3UCu+#pVDZfXpOnAFI`ew?@?Lrorl zkn5%6vpW#rV^s>l^!XVW7#J8B7#J8B7#KoU41X;aa>bOtg^(H?i|z*m3v8;AfK8Bv zGI(Ku63KX;L#QKmz$u{80oYE*&TmrkYM*^$_HUBC2C=g))YeFH?8@7(>LsB10tsxX z5f=gW$(WEGY$&)@UnGS$Fno2U7V`407Ib1yvoOWS~Fm4{?qX548~xZ%CZGX;eAJ z-4fRWk}5vAYLFAI4c{F(bb?N&6XgnKw-eB@ hq55YE1_p-ZiT^BZ`yKndhL`{V002ovPDHLkV1g4}{^I}u diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json index 5355f379ab1..0a63d1cdaf3 100644 --- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273. New Computer base & keyboard bases by AftrLite(Github).", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Machines/parts.rsi/0.png b/Resources/Textures/Structures/Machines/parts.rsi/0.png index 1d141cc68859e5c3ca5e98f42bfde934f3667500..287d03d535d25fa701915456b32f416d398c06fe 100644 GIT binary patch delta 1304 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 diff --git a/Resources/Textures/Structures/Machines/parts.rsi/2.png b/Resources/Textures/Structures/Machines/parts.rsi/2.png index f68cef8c041c918f2be44f35093975c0a6540bee..eeba2a36213fc96b03fd5378a67486066b90c2a9 100644 GIT binary patch delta 1417 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 diff --git a/Resources/Textures/Structures/Machines/parts.rsi/3.png b/Resources/Textures/Structures/Machines/parts.rsi/3.png index 9a7da810ea4eff9031863ff2a508b9ae6b7ec7af..93b86b94741d3fb290355a3782a00fc04e788697 100644 GIT binary patch delta 2211 zcmV;U2weBD5xfzQF@JVRL_t(|ob6j*NLyJN|J_E^grVFLM@hs7iQ8^0LI+|jVw?Do z?sP@AE?oxd43sU%?p7bR#;4t7o(cnvfYC4-{lL)WM7xHLx;T{KA&G4{_`I+Bvj)C)W|C`+1C(+SC!B~ zgKE8innDj$5}E94{PD(3Y;SFrrTxaHX8iNPUB$f<@`A%&50-tetbY!By+*N<;j0SQ zKYiwGS*|ol9)B=1^Hf*JYRt?$#pm#gw~$~?hOdhIktYo9eI$|Ka=Ed#x@_qc00cqM z=pqpy2m&}RQ3?C0ipVklyZ-`FU?}knG1#Q?g1c2wua+bAYPq4rGYn>IXl!cM^re{t zcs>n55G)^ujZMv9Syp-*w~%1s9UbDw7vEq%qLkg4uYZFRz>Al5z;hs#cNbT{%Iei} zq+TsY>S?F}fK!)-MZDSofU+15Kx&f^fV^Tm^L0|$VXueR+YZE6fTm`A)dVyGXpCop zre-w0+Q?l=Ie(SpNWDsq)O)?{(j0W^(y+Mqe2QVnkFM@M(d%tTEIMbo@p1%$AtaM4 z_$dA}Zhs-c0J%x<_j|4I`TS+=n}FjIc=+HBbL!HtSmW$!$KLab^s4|d9su?uPZ<8U zgW?D0y!de`iARqfmSqTj^2v34aLy}D_|C3&!d{ra?QQ11x0h#(u~`ua&CEPSfBzM5Tq5^9wirI2UlDTe%-5m&as$yhT>SU15yMaDNpBzq zNZ0%R4;A%lIZ{^35fI}E1VMny<*vwrOzweH0@hZSrQd`ttFFflia0<%LlY9LzE&#U zHw(>IU^M)M}NAy z`$ka#237*Kh@ zVtjU7u0S~;Q$QEw?Y)TqjK=Qwk({rCw@`5Q?JU+jJvjaCEI^S><~K*wpiYA23Wv+N z&?y#j0>a3TArGdzZu!_=N2IW`xBSIA^v z^t30%nXNTYpyhotuge z2f6XF=$!5xsBf7 z(X&N}LNvurpE-*!zbLp0mVe-|*W*ur8C7h}5d?yvqKzMq+}5mgHD7_pj>DoFCm2c9 z;<4jUI)otkIY-IIjzf&3YD?0MW}Ak9!Hlh>P9{AE7|htDw?uo3Wv0+jt%fl>awrL0`m1V)x1KYJBjRzD1xd+&;4MFhql%yNYHh;_W1liOA4pR$= z<;!cU%SDqQ_W%H30iea&vqOysl9&`xW6gMXdiIC?}j={dk;#sfxK!73_2!_xb?9?pWI4*(S zV5eap8UonV0vz_g1IRJT^JyvxB!NLqg5c?av#ULKOdg#p*#p*Amk|htu;6Y5Eu$?E z41sKjsP*LewB!j6dp+3Hg67mnLjW_;qF_>;%^^R-r;$*}IDdd z2=Aoo@II7DSsDVI)9c{R)G3mhnejO*?P063EIa@!i? z1|E>?w!<6G0_@uqcCWV`$z+ZZ;uU%%7=hyw1^-b3F#nGmM#hu>c~GbNdE;3myX`>y z?LAY0kQF5GeA?8h^Y+#zSe7+K!cmOZgXu`H5D9va?|%oFNsh?NjFRV!Cec!j2Mh?H zjaQasB{x=+K*M_?uA?-$T;BejHbCo-r}Xlu=sr$v@DxAeBC l%XLO?_8e@!+Wo&f_&;-MT8$6Hpf~^k002ovPDHLkV1gwEH@pA< delta 2199 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 Hu0mjfFxN)l delta 1960 zcmV;Z2Uqxk4#E$RFnNHqXJ=nM@Jp^N~V<7^z zEMrvMR+ggRI(95oJy^4v-JM;H`w1{G+yQd#@?pin;m6j-r#}inJE&~|Kut?a64iH!Z@pz&Xb|^r1fR#{p zfQEoAft^8}yA}f0)Oh*O1?C{Q7!GgCNj=mzHF3!;Miwl&vcMz&0PJ=UND!ynT+)-_UxG{25fF_YHtps45!&Wzp=3ayWNgdDrJg((k2TE0z6(HBJ(q{ z0jsO4rW@e#`miu3am!l`nE)~kb@%j_bQ)5l;qXyQbnCS(6F{b+Z@&E4G6U|9-NS`T z*A&wbjn2+41Ok3bN$BkC!VM|{nPY%pvzfjVtABL5*efzJ7R+t!20J^uO1c}>9R%we z8j)CunR-b$cngtT2+bedgIx^UCWIKz2`NUu6ta`A9K04VES&l!GQ8 zKw#A?z~i8mIY~7X1T00DH7O&rp%;!@Il7^eCq;K%TKuikeHo9}XNlfWa0)*S-%{vS zM1R1nB%S(T;QH7Px4y8%fHQrU@!8;&Q#`U}rss`vk<3A`wXNM0#l>J@PJ+kl)652D zwXKGR0IPZ*0H!A=@`-c++AXWe=m0QIzG%+{A`z|-wGupg1+%bg&gdv~Sls@&#qGbq za|NzffVDo@O-I~7@iyiaXc5KCyYGDnAb+=tt8>@l#@Cc;x%MizqGvScuHe>^KR;`R$x%GFO5|PLUlI zIX`S{76E`+@nI!s=NH3aG#oz4-0ji6ux!*2Kq@tWtreMiQ9_5-ax@B{^d!*E6Mq|s zZR+K7W3!0d=1NY9S~_6|p-{G4F3;n<0jsH(0p!!*r_lqF|_iIte5KBv;@D!Ltj zkx(@eMXv*lQ0a7`we7h4c{}X@TQx)5X~zgJBEX79pU(&wMwwor0u7$&aet>GfNSdZ zDhGRI1O)TX0z9MnPDKFMOr!FVYYZr~czQRC0lYRVBS2!m0(6R6dKf})?^)D0H6fKs zVQp+9>Nb-Quy{C`#4zWu#nTe458m0*qls#uAzM;vDzRXqwx3KD2kI$fx5 zXvFm7gKbAZVkL&ww&PfgEGUlGS65eM=O2Y6ri}}8Qq~9RH?k7U4us4xV02_ibFado zb%Z8?t}iY{1klb`RUgvW_c*@w?82O6yrX5^q<3{JGJqT*GzkP&M}I(lQfB$GgpSc%EKMtZT3nS{vF5kS}c^E%Jt3)eIl3Qob}^)VZwBjJ_yH_+RA zRwI+|pCW23MVImZl>z3wzVydRUgsajW8CM9hAY7ehYQ_3{qlinJ`#SL_*qv`p=bU^ z|6I|t1IRf)Jvo6heSep=a;lY}G6I6RTAj!77%ChtR5)BX(|4JR1S2O4Iq@YCr-wqF zCj%k?zLg*`fPPSqgx`PtMV5K_wbvC2)q@UCPB1Hzp+{~qkmb`!J5Sp|d}2XE0IA|+ zJ8t>Sr#}ZL@S{Z5l7Mz+*c}&<+5tbqx*I$&IB* Date: Thu, 19 Dec 2024 19:15:04 +1300 Subject: [PATCH 02/40] Conveyors, chairs, computer tweaks, drone! Woo. --- .../Textures/Mobs/Silicon/drone.rsi/drone.png | Bin 2855 -> 3773 bytes .../Mobs/Silicon/drone.rsi/l_hand.png | Bin 654 -> 495 bytes .../Textures/Mobs/Silicon/drone.rsi/meta.json | 30 ++++++++++-------- .../Mobs/Silicon/drone.rsi/r_hand.png | Bin 5373 -> 495 bytes .../Textures/Mobs/Silicon/drone.rsi/shell.png | Bin 942 -> 1004 bytes .../Furniture/chairs.rsi/comfy-overlay.png | Bin 567 -> 445 bytes .../Structures/Furniture/chairs.rsi/comfy.png | Bin 1201 -> 838 bytes .../Structures/Furniture/chairs.rsi/meta.json | 2 +- .../Furniture/chairs.rsi/office-dark.png | Bin 1350 -> 1062 bytes .../Furniture/chairs.rsi/office-white.png | Bin 1428 -> 1084 bytes .../computers.rsi/generic_panel_open.png | Bin 405 -> 451 bytes .../Machines/computers.rsi/meta.json | 2 +- .../conveyor.rsi/conveyor_loose.png | Bin 206 -> 361 bytes .../conveyor.rsi/conveyor_started_ccw.png | Bin 6414 -> 6801 bytes .../conveyor.rsi/conveyor_started_ccw_r.png | Bin 6309 -> 6724 bytes .../conveyor.rsi/conveyor_started_cw.png | Bin 6390 -> 6615 bytes .../conveyor.rsi/conveyor_started_cw_r.png | Bin 3197 -> 6525 bytes .../conveyor.rsi/conveyor_stopped_ccw.png | Bin 2381 -> 2597 bytes .../conveyor.rsi/conveyor_stopped_cw.png | Bin 1271 -> 2534 bytes .../Structures/conveyor.rsi/meta.json | 2 +- .../Structures/conveyor.rsi/switch-fwd.png | Bin 277 -> 397 bytes .../Structures/conveyor.rsi/switch-off.png | Bin 168 -> 218 bytes .../Structures/conveyor.rsi/switch-rev.png | Bin 283 -> 405 bytes .../Structures/conveyor.rsi/switch.png | Bin 168 -> 339 bytes 24 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Resources/Textures/Mobs/Silicon/drone.rsi/drone.png b/Resources/Textures/Mobs/Silicon/drone.rsi/drone.png index 531a2aaa8ed7ecb058554a32321ef9256a56a8d9..4aa402081bd7cfef930f6edc89c9b0227f59e8ff 100644 GIT binary patch literal 3773 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 diff --git a/Resources/Textures/Mobs/Silicon/drone.rsi/l_hand.png b/Resources/Textures/Mobs/Silicon/drone.rsi/l_hand.png index 272f4a066465599e2e86fea27c5568ae78b04545..966aa5bd940c547d4b038275d3c6104ef7d34586 100644 GIT binary patch delta 68 zcmeBUeb2mMGoy{Vr;B4q#hkYX8F?8P7!ED??w`wNz5vKX1`XxR4h{^A{hv+-f`mO? L{an^LB{Ts5sxA^i delta 228 zcmaFQ+{e0MGh;nllDE4H!+#K5uy^@n1_lPs0*}aI1_rJpAk3JS+jIpe$X?><>&pI& ziCLVD?a&*^??9m*PZ!6Kid%1Q8FC#};9grPDk9dk5@AtxB|Rt^aWENs^FL zf#GpRpy~tGp;uS0dOz=RY2tND<96}LP+Q~Q!TVxV?{>!;-n(n5oZ-TwZDm~T^5(bR zpU-wc9YA1kKKy^>>33Xb{+z1I`qWd~qN|n=a=HCI`<82V`M*v8`RWO+cNiGnJY&~! Vv3+{h(bP0l+XkKEC3vJ literal 5373 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 MoZX#DRtN6e{9QAjM>F&9;9`04^_1r_OhK+QT(1 zgI=qnCKD)19K&d!18On>;7m(mB7rAc&z#2(bpW=DR}lb3iKEx*zr`v_+`B*6U337d zO_dMFuO*{dMgwqFN~JegU+MUz_9q}}`?Ylp zfTm?Amk$9~@;85P-wEj{mk-gj%uu}8e`5jw=dFEmdrL?$8NF6V(=rqaI{@T!SpW)! z9Yk+PF`3-n66dXb-@^gsCcV5Lm7jNeeY)43Ustcs{QLrv^ng;S#PaeZy1hR3$4}Un zN%z{7UhMnaHj6VU0It16caKUwSd!7$AeiU^H<8j*$ z+lr39x;Z^o*EXHf%lD3$hO@>EB9IM%vGaeHxTy*JEd=@y{D4^000SaNLh0L01FcU01FcV0GgZ_ z00007bV*G`2j&6+4>B)_CX>@2HM@dak zSAh-}0004oNklr)((CD zntW0g$sS|AML2qDn-uiW0=^YZeW>+4@^HV;Ty9K=M1m6U1%3a|7X4Dn)U8k7ftU!Ou500(6J37Sp|wWJ0x1iOF=?!|rt3PK zbE2+mF<$?vS75Cj#_HpIu~-aRYi6_A!97_nmo!Zy-dp$KBN(f%s%nV4YMMp>|K04p z9p{`F$6wNgi~fPPGZx^prw85kJLJzX3_D(1YM>DbqzAmEyw06?ktJ7lKI?YQN=Cd(nsvdR31v&|r99yK{B-#VS!&1mdK II;Vst0Jny@2LJ#7 literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vnr zPZ!6KiaBp*81^?g2(;c;y&e%YF(W(C`)vG&=fA|)InSJzsXS;*}BaB#`9Kbx4g-PRTBX1%rT=*yBr zG9D*yny^ZAFg|aJ*~2=SQIpZ0acAPRIcK{QE}P8YK65o{V;XbVYSDGqwVyE*Z%r~w z=nFpJq|Ak2_8k@W`W>%l+dd3)r^4+mPO3y!67JWXl zEN$~mmARYmzyB=pq565=Bo6(KlQDYJt3y4K{_KxiFTdYLPhH4=%hqXc(oc4q6^lNO z4~;L9cVNuBoLIZiNbj>=_*`tUr*Y}!8e9=XYHW%~V(UC1xj{1vIaK;KYz#qs+` zjfIzG_~o^bK?=#(B`Iq@`fx`80DioJEP?sB*9=8dICg-*El27fe&}FqCw7T0T)6Pb_=P?gLg+P$+qQ*u zm&70Bp%6k}*R@u6e+CkMmv*2upa>9DRRulQb)CtX5`YNs-hWe!ky1*KQf4OaJ+*C{ z<=h^CBS3P%QWSJuN6tBztkO_@0z~HuZv<)rN}*{QRT+Lf9#9231p!Ud^v*f83_`*w z${;guCNmoW5_X~teG4fiV&*{}4aX(>+A@sTe@nnP?3{BHV}uD{W*T>nXgE&o-)^@- zpSBDW5s5qzy??c@$^mCl2TfHqkmEXVvJK=DopKLDvP{`Is5R1 zh%^_-+pX(*Xoqt#wygo`!y*CVfG9;FGHZ~KQhMt2QRf_NE5`UTyFkhyM8I?)nNrFgTAC870I z-3g*sG29PRXEw?HHWC>ckE@y>iJx}(N#YYqn0pbX{sU_I65fXdaK`J~QCi+(m_G*H} zrq-VLi;#bv29bwy!g%jSNDI}1ga-1tf-_I&z!{NJkDg0rUBM7wLGpT>eTEfQtYqe|viy?Rz%`5`WwlaCLPR>iFg5B~1Zt z0-m0p(*FoI0q5uEU+$fqo$bFrK0dxYTd&t?3K*0Hq~bL)dSI*|93lWpLP4$UA(S60 z2!{xu@>)?z#8@PZ6@k))a0^olS4-aXvSfrbq z8?!?U3g(A4X@B5kNC!S0e@bNVn(b?2s1l%q&t|hR2QB~e*|v!U5)XiUKn7uH4LRij zwy%xBsgR2p?hvUdXo|%|xaJ z@D0GP(YbshWLKLWpOJ*#CVK)c4#K&&EL{K=h&CSiCILGC z=KL~upY1L$FVhfs@_+8Fd*xRNSglrn7eNew(h71GL9iYAXoZ%K3?miNic72T%C8cT zTLI>j&54PL zkRAX6kbh?)r2lITz=E~{^lOa+W7e))f@uMA4$e+%xt7o1tN8A*F`|9FwkGI452y`B zUgvV~7^}qI@=XF-m1voi|!lUgDE#I_&Rt1JA zen|PJ;%GW@oCruq4s%mf{$5U`<{ufiX#v>N6HDA5U-Or{$ylCS6{3?1c>Yw{2K&kI z?nk-^n40o{cT@Ic0oETFM5c1)2Z$`dOaibJmiz5fKxE7=7wEOQaVSK##asl)4i9}` zGJh%$i0loz=KI@WUB>`=*!#kVJOj!i{zqXC0;U)mPyx3ym zzCQ`UPO+>7;64<`{UJpWg8fsTt~;;5up6ciu{}SFTKllp*EA?4_%E;UWN$7%qTs3MdJZ_kVk& zLM_)Ln{7Pu-4@{OP(qqwD_Z){hbn4t5x_iLJ0GA=ZuVM0p%1ybi^%V40l9(cqpJG4 zH%cT7kvV80WIgL~dc4+$byCFxlK`F(kjG~Ascn5mfPn7~Js*HR-~zJW+;UeF;XRw+ vvVhha{db-Z@XGd<$HO)H?>rw6krw?2I|09kFdt7S00000NkvXXu0mjfEvqeV diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json index 0433a854d24..ad5e49a7048 100644 --- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, wooden bench by Ko4erga (discord)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, wooden bench by Ko4erga (discord), new office chair and comfy chair taken from /tg/ wallening at https://github.com/wall-nerds/wallening/blob/9cc72b5b68aba36399b6e74b23aab10d6d031a9d/icons/obj/chairs.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/office-dark.png b/Resources/Textures/Structures/Furniture/chairs.rsi/office-dark.png index 4fe4b7301a898682007e0112ea085986c2cd6d20..7ca9aa5553c361665723fd7e35d4d6ee1a82d108 100644 GIT binary patch delta 1041 zcmV+s1n&FB3Z@8I?M5E95E2(=?{AlVi};>{h>a~+87JKGoM zz~7SC=lI?G^6uT;yAP=GzR}?Q!C){5liH4sj=0}fH9qn@JbxGrLc=g%n&zvvtE(#j z2xTLInSeCs0mSc1MFLj@n5Iep>BM%&aSC^8o?s?`5R&RVFc}7fkiwlx1C7L&a2zLB z4&sV{szIGUKK}KpZF~DWkYo5sLjZODVE=Gt`@#Mpc6NUNoFqs?05EY`$M&@Lhp2;w$Mph*pGZTgA@q&)oKNC&9OZnt-Z1kQbis zO?~DC6Mq4O5aw~^I8Ny`0g?8(H$zn-Za)ad@chYVk$y2nfNk3iR#ru9h?49F!MLz} zX;y+S?Vp}rMECps&AHfzqO?LqX@&Ir`dV-5ntqqbKKCrJvb+jKX@$my0nhhfY#7XY z^)gVledcgkU+abOa@6(h4P2KrG))hCpFT(T$$!%$e*d{HJq$(JXL@jbtrvwBop<9k z08P_FV0x2MCJ7?#GY)V@BpW{W<_G{FrQR7V_ zbFS1hJ>1%|0LUSMp%R{x6PxM0B6B;ew$*q&aG}*7aqYnQ*(F>zdk34k4xlS6S;5l( zM1KP4(U;6n+iE5Wi3HH2FJPkmF-=pr{G})eA<#4pnx+8&)6rdG4v4R-v$R2r1lM(^ zuCt1!sY#GLJ-#}Hkp-;%mbNTj7T!GpOl9$^%i%oW?JE-jH2W{Q1SU(uGYgpnG@DD2 zx2QTC-3NK|3J7DxcKKq9)X1roJD;y+{-Nc;tExXA{b^3lcs015yA LNkvXXu0mjfpKtk2 delta 1331 zcmV-31V95>+fCP5{ZommR3QLZ_B@lN2!~x2VB|icdNNn0Xe~~{l@pGJUYxlLZpHw9{ zPR8?j>=}>EAG6?C5?~e_O9IS-V@W_t<^BErD)xLZ81&4XL4QR66+b*YG~3(TW@BTc z@%-cC!@Rt_;I^(;iii>&&`AJFAUojt`Z`+o^z<~j1Lk59r1CpEJJEWm0}@g?Ac+8s^)@TOvuWV@`Pr+7rjb&=Bs6@LLRD*(eFL;{t^IAq;YfTB>?FB=ys0-#_U3BK~BEddq)Ow9r~nP6hk zjI9zbP+AofB?+=DR96G_93U05y5u)SU^0D@e)K`8$H{cToPR~vOCA+W&gZZHH% zfNfA^8#WaZfS3iOTA-Q$KMLbSB!m}<0z*;g<>h6g&VSk2+1SyjIuwpYVFVkHiv-9$ zIXP)~or{Z$e}({nIt-ZHM67CuDim&81B8IOCL;+NnUlPuvH-2}<21GlvEVEAjuue@ zXo9J5?@Vk3?)}PHRoxNi=jZ0?>Z(ys#v%aRb+$PGA8m^OefSN@1^9N1?Y8gA^6YUy z+XwwfP=7WgXE^-y^u$=BAy+gOL~zUs#2ri4e#m zAy7UgCQ*gL^u^j`X6{%(k^lvLHwY_{byL2r@&Zr@;V7+Dgcme5K7l?SUOa(yMh zcB0L$vwB_m!RQd+xqx{C7f1K^_nmd41ZcCtvj()esw$(w(hX`WPU`@~B>4RN4`O@s z=UyY%5mvL}Na)N7L@hv)K!tc-pbhfCN2P^OI?>+k)Qg%qbyH;HZ5Fbga zK_RG)4R&{Te_TzeZSjYP2f9L}xq4Rih-ZW0^EJLchUDci&jLVszl`@LGoZL}2~R1D z9U#ie?hO5}^8r@D`oBh&=L0izT^Kh$fr()@Gf&_{^a*qWnZze>gT?@H+(0s0{24PWRWzZE3+V37LT{(y z^!D7gm(tj818omI=YE{~ckTxe<9#E+`vXm@5~pW-dtbTV7k@Um0@k!DDVGYcxRiVI z?DC=q?M^pxB%p(3HJ&1hBz)vCUR=t-6VPfjp$12nBlc*dZ} z5C8yBsqBK9$$v7RfBU}2^-eAV+MOfYh zxNhh`Gthp|G)G(+fF1+3Hh0L{#yVyeARkyL;d6s{a#cT zz%(8Jpj;}z+QvF6Q+PoAAJm9HARBNlFn(N)h^fA(wx3 zO}|IUKldy!H#-lKlp@9DBIt$=#pU9gotj7l?SCJgE(^Ilv6rK+ZmwZ4=qD6KCHYUE zt^57Q2l&&w3Oo%(`9~Qp<^Z>P7Dxk~tOaibhPAf3+I}$)oexeLHExVH7NB}+g0eF_aEH34Qt3Ujr)o5C= z0s!jd%CR0`UskeoLDPouSlw!d%z}uQQ;82k`pGF5)7i4}TEl-<1H<9C7IbUJxh=Ui_b(9|3^-O4gNt zx!L)t(g$Gu|GxQ!vUi*YpU>X>oxFw(Dw|=!F#}$NMnpG)4r?;N3Z|G{fRYesWD^2b zE#|rs91fonQPc-urE-zg2LuK5R7IyEH;58Ui}D{CrRX&HkM#inu|B}Mj`abtJ|N&9 hVts%IJ6?$L{}-d<+RidFornMc002ovPDHLkV1g0L^r-*< delta 1409 zcmV-{1%CRx2$TzuB!3BTNLh0L01m_e01m_fl`9S#000F>Nkl+u}VddBwrQ4@|S0cyfAB|uF$rUZl(-r3pFzJK@KZnvez3?c$Z@x8r0 zwX(9J78VvN?_XbE)#KwME{k%hh)B@^jRZjG+S;1h+S+m|5709Zbai!wOC6I0y8~S4 zw*y2L;8UK!-`(Het61P2aBy(oEqiiu65Ih}F$j|K^YioGawr25LOLLb0Q~E9R)BZI zz}wrKnw_034u9b5>#I1L$f<*ffYPjr-@ruzDUbh<%BBJog~Il;ejy@&o0Lt0t$fV? z-vw9zFfgCU)#{qQ}+L0h{NX&5f^769qI243oW(e?bm`9)} z`~LneuHQ=l4?=9XdV>@X4Mu!Gd|?#Q3iEL>dYgBuL}@*s%bS zfNLmdyTRw@=Sta-x$=^X~l8;b11VN#2 z8UAWMAt{L{<_7jOH8xVn7ZJdF9D=CV%h#26xQ}fGDdjg3K&HiKTwFkTt?h4Ok&s%x z$O6c`>MEt@G)<2EE2NY!A|Rx~6yrcj`HcjGm~sjakXrs&EQ_balmIp1m=e%bfUgCP z@_+WXX(!s2m$z7pXiL8H57PwLpB?R4bv`d0-=s+V-`ASdkGkIzi&Zf z;6u;jENy!&0kj8C=GEAm>*R7$78e)Q(a{km zJ~_9HCe#u@>+O^b#bW{=Nck8Zgn!o|kqg2w0m6N00gY<{UJKxx4%8UR7pMbIm>h5n z=$M|&=%y~RBiF~<7?QdtS{66%BxrXSh>#tU!>xe?n6xjnHzjE?at7@$`3FKYNOyZKfso6p0~|) z_TT0QaMO3mH|N}x>41cO<&Rx{KuHRh4H7W&<9YVq=LcXsu;0@d(U1JU948W}dqML^ P00000NkvXXu0mjfta_A8 diff --git a/Resources/Textures/Structures/Machines/computers.rsi/generic_panel_open.png b/Resources/Textures/Structures/Machines/computers.rsi/generic_panel_open.png index ac7f9f66414fd6796d958d8e76b2182ca3fcc238..6f5c9f3f29da1f779831b6b0b3601ef31543b2b0 100644 GIT binary patch delta 425 zcmV;a0apH%1H%K5B!2;OQb$4nuFf3k0004fNklK(J3LY+axr!>A`D# zzv)f)I~=%h?|la#BKpUSbrE|#VB7H9?M==K5tfJ;1TSt}6{5fN=FvEyYOX$1h8 zw)uOm|K9N5?#D%{jdZAf{SOe^KA4Ver^Cb+gvj@A~mx@}- zw$#E?Cky*2fq#(SgsMuV5D^g(5fKp)5osajq*NVgb`O=uDnG;r@^E$WE zCM@^xvG4~K++RaxPd~dRH#^mai9-Qop2CIM4N>YEYjf7T+VJK6ZGom+ReL%AMO(am zoE)F8wHPadR<-ACNzPj9S<^B>I>6dkTpsYwWJ)Oe)xcKI O00f?{elF{r5}E)>S)gYC diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json index 0a63d1cdaf3..07f80d56a3e 100644 --- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273. New Computer base & keyboard bases by AftrLite(Github).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273. New Computer base, keyboard bases, and generic wirepanel by AftrLite(Github).", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png index 60d86646c2fa430498c0211f980255f7827ef65b..9bad9d08a5d79bf90c452c1e2644269160c7f94a 100644 GIT binary patch delta 346 zcmV-g0j2)V0qFve7=H)`0001UdV2H#0004VQb$4nuFf3k0003aNklaT$28UO$Q07*qoM6N<$g8CSl%m4rY delta 190 zcmaFKbdGU?L_G^L0|P^2NcwRgr5NB7;`;x8gSnlTm6Kmoe4>kQw350Wzo2j$14CkB z;!FmHG-HN_qgRc9iWy6S{DK)Ap4|Y-F+_X1IEH9UOiqy4P7D1+z6$|>pY@2_E;4%FkJ7|vU`4MPYBQ+22WQ%mvv4FO#niCKb`;p diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png index 9073e859cf52e14b6214dd472c32e202b35277e0..125d2cfa7462eee5795cabd34806ff4d6908d796 100644 GIT binary patch literal 6801 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 literal 6414 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 diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png index 8cc2cae1f76c6267e6e8fb4da5a76fb467d982e1..4288c9b7853864dbf61de2b339edbd862de478ba 100644 GIT binary patch literal 6724 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 O0dyW2Jgm~N3;RF#ER4Yb literal 6309 zcmW+*c{tQx7azMUjg&PE*|%(sCCu2@vX(tdeoB-zTZXZOB0HmyAq|PKWJ}p)7m_7Q z#=fK)Gec(hHuLKJ$ zZs|S?2*iKi+(`dMWbvfnu zNqp(;L41;n3huo5e6z0>r>4Tid~%J|F|4;`O!8RiE%cbaPHQ%-IYgH8j)p(IQSY;z zPwCXa6=~zfv_gNkZ7)|xY^T8YqK}sGz<9BC=y)+QH2lxe1l{0VCn4};k_+Ajm}*x| zdmR5s=b_b6NnNW?aWr9)R;&lC=)+MW9xp|yMA0Z}_$!;p^{HHQ>Q@h%vpuyM9(%_D z7~Eh$#~k0Yq$=2WodG^3PdEPQ`2Js^{U~jZ_BY6midltS#(VrM_VwHF1hF_7jnS)OL{MtH|Ef8UeW0^U~>I&nG6OyIQLOnB(eiT>l z06>`GeH7^qiK9mAAj5axdLlEHmhqhX4wFbmDzFe8@*cWn{18FtY(uF>E zp<=wMn+AU;Sqg%S1LyAZIK>}rGI>DvVMU&2QNTc>-vN;X!4DpK#=@*y(ag2 zD)W&)VBe zus930n8Xj9o)n5o0(hPp|o2Z0Par2yaa$y%rTTSQ+4ZK(G=~}L5xp+ni+8#fXEX51wNG%sx+Np0|V@_Kq0@I$AEBEMhbU})& zm+=R51Fq>#v4I@aZldzXnNs`OWDW&znzp2BtDx%O3&Vfn)%~{e=nVFz<;%0YvKdvB zcr4S8v?*NXXUDX12bc<&%jrr>i&2X^=has7KKCkp^JbAN<$hR#D}Lxh6e-@hKcyh6 z?+!-h@855TW=+4%^OtQrzpyf}DhM{Foz*?eXxd?D+AIo#ch){X-mm`KxvQOi+#7>>oSe&>ZxV3l6@!k8=&;&1}TB5qVL3^dP53<*u=b+j6X)(r2Cyj93#sx}@$36{eMtKzi&l%V&c-0jY&3I##wIi?NMy3n zKffaxSr?@VI_rPkIr?lrdd=w_FsdzSw^9!7Y*c^pGW5i84l7=~0BD=39Gd$M6d6p3aUviyy5~QXMpUCMT zw_a9Ae`*ij9d>?cbDrft#;g1vnNa+T3{P!KyO}jPzJIu4CuF~G%FgvBA!3bq6no_9 zMjfe7$%~W@py9{sG;mt9@y3acda&A)uduM<zn&r?P7NS-b1`#$E1j@#b{`$(WjTA{oa@CKI)GJkeKHJ? z#Z)4)iRHn=s4ovdp{~uE4`VYvAPjr$9&x3D$7Xu>mN={8F$djl@DaXRCu|EQ5~ss$uVuneYq{_4jo^c^b^s!bK6pqF_v2`vnll#hUN2rE@bFklxsm^2-YCzXJQrAN^4; z-lw;mjCvP*5Vot63KsCT{GJBW`===^wmlV`Obo^BeXN^1(Z1f(QR{R-Cx~%Ot4h`n zg>@RGPt*~%5s0UD8uF*nCSj2`Y!_RVx9~bIDF@YSVSO=)zT7yt6?7W)pC=}F4~3Zz zdtFHdO-7P{VOV`1lV6^@Vuc{{p(qA`rtWT92frp(++=GIld^ftjqWm@tmS6-ih5%C zn2vF2NS2nhPK}wue-#5Wu-?ydd8WSMo0+t9`#tXf4>Q+LZ#mE=d=I)WgTy)SD4)LW zg3K5{6q(x9?0UNWZ3R!ILbQ`sZ^m9XKbfZH;HrUTghM)gzmDD_!12-@hwJ)_-@8tL zLXn@jE)(XafvOG=_bE8Ybhuo50l8sNM{EtU&B7Jk!KSs4_Qf-o&l3oVU7R#iNc+UN zMda9Yk^_Mfr86<@%z1r+<+&k(yn@a^$Bp>*e+i6&_2dCZ1c;RY1V*mh+@4(9X@#LZ z<*4~|*M$GEGAAay`hV1|rd<1APky(qHw0vCpWn(tOb2WOdKoreGSEiJO``B60AIC(Do+J7b z!9Dov=W({5Eo^ocSyot_#kFGeo(d0t=f_7`X}vb^8AW_iD;fF}9Sy1T6OsGYpbxxu z5;4jNc%!NHzXom%l78#0&kI~mEX1e zaFzE5N(ya=huC~*Y^Fj^T_ASJF?QJT5^@k!f4y)nJzq{BOqSgo>^43aq{r0oo~6gfBkVrq2ohmp9MW$?&dkQn`)Szg!O zkaSna#Pt%Kf8b8=qs=41`uvjq-H>>TwZ_&r_mWe=9`=T|W$7wsaxEJ15<<^pkZBna z=7ktVef7&(5sFqLzp4m-Q=Wj~pV-SBCd*k1&qex`xD~n^%Dg;2Dm99|-s!@ZG_^6h zpy=x+$zxA&DLqA-eg(g$@iXC{I#RRb_Y1?IB8FzNZofVV)`>Z(&Nk&dyc0am<+q`v z8dpqgEom9Ycr1#wCa>zG+NfQ8v3|tg%hmV=N(8H1d_aii=ux})GM%&V6r%hT5`-`!<!caIf4(meLyj z*!e$i&s6fhP>2f3VR4A>TGR&8zuHVCeJS9|_=L}vQl>}c!Dgz{qgBl203~V}d$R`x zOn&v2$@l1l953d;_vnYoKbN=e%SisZ2oVvyDBH}2g1nu1QnE0}-l=C(EzrzcX1(Vf zuaq_I!hAheu3BYd8=p)wX@Onld$QIzM+Tt3t{d?Fc+R?uh$10 zvTIys0*PaM1yM2)nvz`zr6sZg<>ps6`PIf+j%FM64O$}nfMDI`l}Pdn;6`!&jvvqi zHOV4}+Fb$?9;Qzo65o4bhT6>Yq(!*AhP;9;W8DWnrBl9cIC6UOSR9Y+RpYVijSM>W zgGiQ@UvgB#73C$R0CK(&$@I*UlBBp^aXabQibz>F726 zO>$dW{z(wuGh|jKY>5n|%y>;o_NQ#WCv@O3YEmmVFVxmoP2wxi z3%{fV#;iN%qAzxFRQL~jd;ln!*2w;iLDgPDNMZNL%lJtTs_p;{i}f8_Ry$kjIdAzx z2!yv-&LM%OfRvb0?9{sbVCgk~!`sYP4qxpo|1Jpn+LyQ$dd2?xrwzJ7{-WC3Ak}2h8K0pr zdhEiSow|Qtq7R2wZ1tb!mT%5Ur};?P#lv}h>okqtJ=$fooY!sc!T@^@GIxi~&J1s> zDC~6%J*XSzjg!7Dt3S@A*IpbZT~h-RExWH}oE3Fi@X_VMZ@RvI22zFo<|6u=fUGD{ zogy_bfvcI(Wn0n`Y2^~LmgZN~lq5X-YI}Ytp!6zkaqkVD|5)Kbz40(fY~x7O@uby( z>UNCLW}L}+=l5|*H>ibG%c)sd6X6n={@k*>4k+OjOPLO|^I>2Z#%Z)a+n!$%0C7u} z!$md=fO+OGep8{%V>XHj{hLn(w2ac<%zO}`G@CI=ni=Q+`7~dZjT;HI5a>u=(_-j0 zNbPeaS;j_qDxAsWj=Rlj$k`W_Zz*Sx+I1x^-!xXs0iFjed)iA9kNT%!@Egy!?`|fQ-|*5^s*-4leF`Af8lQ&2*DASy@%O`G$KF^2n;UNUAy3#XYUu z&|k)u9)D_C+c|!G+9<)5sqkX_3p*;e_)Z@#f=3E+uG%&>O};?N5g}h^&L9)jfPt2= zNGi2d^bLQ}_!PlTvHVZ&!I=;<+4py4a{RV=zc7XRtl1(AY}vD-#T4^OCH|H@>o%|& zu0SDK#k1I4RoVA!fhjMW;ewE8om3AU4wuv=OFtF1o@}**S-^f2t(G8!eETy*_)Fee zZpbW0VukvTjSFZKv9uI@%RAm!+;r)G>MatP?s;PaEm>Xvsdq|b%4VrXnR)Q@Jf1Ek) z{u*!0D=C#l;Js|l1`e83V>bjqF*bI6BPh{9d^Yw!Za-E^GgI8Mx!H>eA$WelO?H1+ zr^DAdt7o<@ZWOGbNA+&UsI(h%DbM@4{*^AwHyY;6y{R_#)z!L}`<8!O>HvpMofV($ z&F#IXW@k2o?yzH|gEld|=5n#=Q=tdH84Jks&vy$80x{02?Alk5y9z(^h~DlUzy+@O zaW&A^kER=s=zk}5(nMdiYzSKHYGv5=Y~0@NB5%4@zZt>#99b>5F)5|_6SXXkUS|hz zc5S<;(0JlnD>pPsNO@rpYHsA&K7F$&4ncsFGV$;%X^3)Q!!KxZ*07e0@3v6iKpw3Y zsN3qp{J8{8g_%1PPIbTeG>#LJ6Rq`nAAI)Ns`bRZ-8BJ_>aP_v3Z0TJEm?`u8(5fw zwe4>J<(!Eju?S{waa&8#3BgHNJ9H#w%xm(-PXvcr29#}JdAos3DCBKKqsQ$+rS$eQ z`;__ya=D}OKQJx`fO61NhjL+@v;k1fH;QBfnbPd`VR<{DOA$UWw5>uK9GC`*_IF%< zBCN;$PDAByarVHakVn@TGkl7{K{8#MqT*amye3c1owjrMy#DoSI7I7xYsOi!_H-@& zARo12Fl&9$bH)B{%MYR)5ajN6DlY7kA0prp)NUQy2cYHrvLi4Tq%-grm<8*?udmnp z0E9ZRKVIx4tonD~s*xo#kc{!Xr4kZM8pWNiYp)xk{E_orZ{~COG#~jcuspwd+v#)F zrFfriACROr35(+j$?mxlX?<>^KCcUmT-kYL&dvozuDI(r&~5n9W=GJL@I1IpLJeJ> zOw;!KRJWO=ilpv{#|T7oK_-CCPQ_Cvc}fn}-nx}(TM8N!?Fn}Mpj)y4UnPc7s{I!LFdYrew911fB0m#b(EHY}b27;7_WHqOc6ZkhC$$?TjzXG+K>~WXo6n&v zoAJSRXRH@P9TXq0v2ZJMmP)}8*fqmD2ZNzEq)%BwLoFc5#(I(dx^ysFyNXLS71CEq zmr+9(nTIPUzb@YM8v5AbZs1pb_P-10tJ5kRf-5$h-Kk^Ml+_guXU88IHcqh9WUgH) zm*2uWaI#yuAYyawee22(M*jd-{#3XTB62tUo~so0fHGM%oAShK5@b3BYI5Pf&|g=z ztLRjj=OkoUY{Ks(a)Uwi$kb$K#?Q-A%wI2g5PWYkQs=Hc6TR$x0g%b6w$%QOGT+Vn!i~AD~$Mrrn>S9oMIWWzwZ?fvY*2jWM z&)>3P{q>bkskdk%=EKv`TG^HxAyv;&IpL;WANop*X}#OvDR^hVnf+XQV$Q5gvOa^5 zJa%fWFVW^sW=?c{>O^NmE$Q_};O;^V<){z?dEXj@n_B;;`7;Id7}K8uR^SKi(`pKO W%U+LcTAqGCfXt1pjA{)$6aELUJEiLY diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png index cab28e89b0c0c89e00ef818bd938c9ad45fe44a4..bf98d8b50d4ab77beb56f516ada388a6c158c630 100644 GIT binary patch literal 6615 zcmYLOXH-*L(>@_IDFy`u>E-IBC=e8o8jz+)k)j9$L5d)~UXT((XeuZugd!cJcj+L# z2L)7m4G?NnAhZNR_~QHL`*CKUwPx?x&t5ZUW}dTOKQz>3W#VB10D$%WJuMUJ*!lNi zq^C-gc{c{?0P;1_y$e*1@NEIW)%W+cG|U1sep?&3Sr7QD{bR$gE+Rarf8(0WO$mp% zocjhj`VKVV|8Qu`i-019WU$)uXqxHRPAh4g_SV}gGp!YE)yy2$#j!$cw$gmuQ4Sml z=xW~9@Yz?FEeh!!Q$EnCU4Es%=D!yxFq)|hbE5od+gaELLGl(`1KJgjvu^o5U;mm0 z1(1EFqlboHN4h-2_CXyzV1Ye@D0PS&B;Sfx~6#IIn*$rL6uIRv1u<=QvW2^O9XD2X{@w7C~Y+$XY zqrIW@%&bq4nJes~W1eF_CZ09>WI6BtXh%dC{1hAH$T{Xs+RaYQWZp)Z?hT-NvTL>7 zTgZ6VvKjb8w5u)PWGMX?qK1hHJJl#E?D5lTX_y?%QVbdeqvxY!Fv+kGHrxQQumNxP ze5f8mPP-C1C_~y(7t)V81MV+@ z+*em4Sim~JL(_8PfIW?u+}eG*bp;?doKTa2wHKpLyvFP}ApZjZbRIl2wI3f4f`9VT z;B^IlfTy9`_H106r*V7Sd3NDG8g|}++!If3aGCUr&>aH#Y7i;=gy*7btrujG^2D6H zYL7S+^A#0(Zht|uAVArKg!R`v0y_)YvnlJmfT`O%g}Ws{?>$K?k&zg^YI~1Wyz9f!Oeby~Ofk2AnPFOD{$k=Y~2 zPVAx`byJ}*{Tr9pTpV0_=WFg5=zZhr5#))L`$ZV&7tt=#i96ItU!-}I_Hp#cT8c$E z>{sjeLY)H*-jIh^BbuO0KRf%$#OAR&@~*`zTFr<_>ByT|L6znK{It|{{7T0vUWuRC z^UMFbwH{LGB*-EXv%Sw0rb>S6rLnD&w^fq3lq`_b$343bvRe-q5Bmd+&zW)lrB}^b z_!66tHT)lB?Si=S5k+GA^2xl(1j9}R-af(mby?q3TRh+zNxtth2?y zyQ&$6Le4xWR`tU!I@B|*1W=sGQ*MpcOMFbiY;iO^ii{(n59`#C&cALKitT_g1fr(H361P8;mKRRx zUbeqr`F3)L;ojB4u}B}2_D1<}T|5nIBIK!p9WL*OV$~Pkh7cv3`r+uTI^PHY;K&= z;&5vsfBU2k0Rt4+`<${vFZZzrhhaXCpW>4Y0zA=&FQ{RQ0n4`UFZ=|?7JDDMZ+JS` zm1iXMKB0M|lLY~64MQ)VK)rLjRAJ{uT>+ky@>@iMH>Hn)EdTX*DPCnB zwxKd=Hl;v_Or3AOFV1xmYc8mAVRZByl%;&i{UzW~7>Kh99pal>jomu`bL43H^n7t5 zW_Nw`#J}|fdmkY7T0Y&z+q4mARbb~aT}zb&6KhXD4IdKLKtJBYCxWsuGBA6vRZ_)8 z2_n&E?YU7FtyaQQVPy5O3s}e=r1TsOh4bD5A)Z*CFPHE ztxBw|JN=He^g5S=>yE%P~aQ%fR_bvv|y}7uR9q8;OLa7XRUNo3+(CN}*CI*$zPAxTBK=h3SQM zQ4gAZBsM) zQ@Ha>7i+)%%~qaFw=2c(Sh^qizEiTf(eziVRsRDx$r^Nmj+jmDnTfZTbr(xICdL71 z!y;$CwW2qI`DCT3nAR)dhqou{!3k2Mp^v!z3*1nbrk{tw{~GXYk2elVNBI`ofshl* za@6lKM-khKtK{1=7L=Y0FCY1EFBQ{gjrd*+M$S*V3f_f?FSUR2Ta!c25?;sCurfHZ;7vMKcG zeSc3T{$4*PbWp&ZBAqKtofr{yt`SI*pp_la+HKnBr;!;AZ#wb_KVKEypvM>m3j&L_ zR*lX&9pNLGh9MRi&Q{T_{S5PHn{sTJv2n6!b6G3hnWhj<}QFze>_`%$`>2uGc9wQUcqaamesOGNvHr^E%RU0iTwwVYDkETViBN7-lV~bBrul*-M|fa zMNr)_8QP2+h0>MwOxHRgrdRvn=^`|y8!^W-=R*t0P8djs-;r*_m1lo&P~yR&=5LXN z3+-z7`1W(RX95`)Pd0}K?r=v+(r3kXSf2Qbo{zuJ-|bzE@0#tO6ru%ny>7xGMPb&o znvqhdl8#XP7O7iF-BDHDbib#J8UX_3k$ECOYCd16Ri{TIGhic2L2T}Fl)JmVP(W?o z2@M9g&i`8Cqv53iWOy`PNbjv!Lv9TjWxub;?OrkrF&JX*tqQuT#+$ieC}3~oU7+6^ zDYF(+q#mU!8d%q;@Z^m-myNSfDnwpE;cdsa5&fQ{h*Pj=j*8#%YkE`xPB&^`L%mss z&Hc3NOvCG==g#U1%rB7X@y>kIOxg=7LMgAc583VjwAselwSNdA*m7Z()(R2GuAmlj zm@8_+9Z^yV$Y9N0?ly8@a=?#VTmq9s(a=q#tY{GiobZ@}En3e{sM9`Pxa@>7(z{4q z%D>s8D{w=TE44sE?98x_Ojb$7>2_ojew>tn@74?OWzX~*?PzQF_7DF93uVZFf@1`+ zIp4KNH7XNwOo``!#Q>o8@|v&Er>Ted2k1+{lW2ggL4&pjDgN+k$)z#8!RmXn+#Z)R zcfu(Tn4y$>UGpKn8=dV4%$w4R>tnKA9`OD9FRRmojEgOkx@&dfH0l=KV?yu^v z#F&P$79TdVt8jAR;(&wOb&^4UC)#GsWUcWk$};;inPKn;n8kj02Q|V7%)dc)ZtN9! z1Eyfx;OFw9K=tvRgDi^BSQV(-$A1Sc3JZOno*rLA63@PmND(gfXA++BBs`)0&=}P}Nrs?ws zZvlA)m};hvnH9g45%S)I$aa(4O<~j#BUHw_8Dns*W2nFvJ@ot12fCiOA4hj+1{kTC zFUPRQn5d%p?(&%Ice&4dr$|@08X-Mrbs1B|gTmOz0&U5^Q2|afyHb0 z7o?EK`R?R{-0kPWW?pZBVeGi+)P8DUlOE7Hykfg@dymLd{s6&VG&CK8Q*eCsZW|PG zQF2|Pv`T{{*5N7LR}ve42}mkhwp-4pRV0GQixy%XTMK=dQCT1{&wIqBFW4TQG$v*y z=WWUYzr_X@t?ugvQt?|K!&fB2W0z>BSU9E_?~*`Yqpyf|d{<`OYUP^4puyR*T#uYh=mDZoH;me!B8*Lr67x>Dw*y^^(;_={2t zZg#j{Li$p{Cxb*ASD@ty8`1~=%Or$H!d1EGK3(!qW|WV3Xq@tTEzj$FGwj52ozwC6 z%-IvpT9~X(C%M_8cZ`#d3K#BQFVNlOSmb0W@}SdFn_%s6_1AelHW7b|HJzq#!pvOe ziA3sS{jwDWIlXTQ=YS3uqvvCzt+D#TmSnZ(`z*;N_$WWM_R0dIW|=}}U{$KSxZ-f> zd^PUC{d0Y0UL7*Y1#iw7T|cTPzA)lEOl2}V1rdNkxu0CNMb8+pMNUIo|O+e9H#d)(~Z#`JthWmY#2?W*4- z%!&97!La;Bm7^6(ytI-;8rXkd)J#+htEr6z2ZU}=C!}{Rosf4=x4u7fbZb7QqTk(b zT#D{nBya)xyxCw++WXmI zJ&HM(J~z94dFbLzv7E{mj#?8N?1Ll#1)2?1LsC0Uo+gucX496At#xA38;_44&0&7N zDr@HbKou)xg+(XyKbN!-q3TRt?8=n4_whyhP&=ak`(kPiJmoPN9#yph;eF4xmBEw; zDN=`&{f^Tv)O^Tk!#y~yRPjnKZ=HY{RYNI19yvuw_Gk1N$BCzBrbSb|aN`TZZ*HMu z{W#`s8%S8=+~G*0QLa^e(Z3_Mk>PJ)|KV?-qQB=8RxccITmz3~PTQd*?{m-vc-8tH z>1_4#uNtk~EK4eW?P7InrD3NNL;XZkV!CkXq)}YMgW2QLOoWSoj%#lww*v2{LK9Dm<9! z(G%6OR^_5!-Q2ttNASON6d#;e2vol;?(_M9F@*wc*ljg2<;w3)j$Ay61>r+_%fo)0Oo$Vu>H=V;*Dk(#G+ zo8fA>xR$OBpJI+b7=M%9H8O_Saw8hHJ#X@jKs(aYP)}?j3NX$-8_I8`Awb0=ceqKL4 zwo|)mPORA7&8sHzwvvO;$kZ{2RT`Y+KRVmEq3vbw?S>H)RY+MvLnezDYTkjGbUkM| zq~t4Kl`$5c^l^($v27E%}}T1}S8D z&9QIY#K9_g*+M6`4>k(>oMm_T)*u#9Yp8s(grLH!>fHlpnJYKr)EwjnFG$`ykB2-B z1*C+aiU?GN|#mV*R7I*k!enUGn9qy(YQK{W~@@Y59nt%_AG^>#A?An)m+v7)wIcRtJ z6C$`~BwU0Uok-ypJ$!nhK|EsC|7T2gDQC^q2utY`6O+F2Ih;8@Y6@F>50oDJX);z` z4NlkR_DxN%K*A;Nu1Hwi=uT~nNa>5)%@^ucny$X2(s(DXU(6}#k^XtSd8Qsx(4ndp z9amnf8(h6y2a5RlPp=JOt;e}Nrcp`zQuE|ZP2#$Z%5bUXyRH{YjDh4DDa$V4ognNY z@A+{;XzhsLfSz#mTz^VO_5L4?QamSsG^L}QTW(0c9uZ^^K>lo@p zhg*@ps=h#44)gkRY(WYOUE{q%$5zK$@M5g=@tJxKxF;{!Ma(P05jyx2VgQ*KV17`Hlx zyjyoz;C-iI`aK&0li#0jpSkPzK{q&fXw{px=WPxYd4CIZ5tZ-v0&3#^{g$}unz~^e zOK-706aZ;!h;D3bEC-Z*xs`3UNz?m~RC0M%gu$I$Xdvuz=GTfUogWwGmU@!zkn#hZ zWEB!rHS{o~+o?IGrUc%S>cz*-Nc-xCP-^}GrvuwAy z3N&PNw?GFJ1!Qmp%HV>6f`UbQHt5&C$%8JRk<1M+tdBMjsJyRfWj8XZhc*fc3uiV2 zW5v|e7ss9M_FhSHmZP8W?2h=ab7@`H$IMm4V$sHpyAQb$H*Q2pYJ2(0|jV(Ea+w(=N! z#zzA}_R}#9L8`hNxH{=@@h?b@e{4FV{$ugl&xg3OYB!O-$9ykBGt=@pM=blSIoUKd z&@rEeIemjv;mW0xtX8<{u0{#uyd^Eu{f?fbb1_8(YP9CcA?4R%xaxQdpq>B!yW#+1 z{N&fo_|QtY?{at0&VI0T3Zb@a>Cn3}HG9FtgPlnCyZan0y1OpU5ldf7y{Q52Ya41+ I-nB*j9}BP)9RL6T literal 6390 zcmXwec|6qL_y3?~CVN7Yr9qU*UKHtVEZMVD8f&R+Wl4oFW8b&zgdv1?#+I>#vBcPk zK}ohTq~7*zhL@S2KHtahk9+QV?(?2|?sm?NF*VlZU=?5mfj}JkdUwoE;`YA*3O=Fc zGtVF(5Uf@Ij)tXQ?wXxR*;C#0s!We_UOew(T(~3iFQ|(3FNJXEixen}Li=w=et-Nn zAy4}=cZ2M7#7IP|mlS7FT%zE4kH;?2B83;8LF-s#^m4h4ZaJk6Sp;5w)R6pz8hJRY zx{(*KUVdw3=HKSMR^JgW9^3|CD=s5`fZ;# zqB*o2u1YhmJ2c}L2{a6W4SqyS632EOtbS?=Kmr}v_zcF@2;Ibj{s$TG5=S)|htPr2 zn>O2Vej8PowSG8X#?g<%XNR-d&vIHR4g%|)+h~8M&*gjiLc?=d25EJ?kYci!gp;Vt z+Pr!2f8C~GNX*I^38}Npo+*l8u-CH994n#u&?lghBU(tbWuT3FqZNHjsRUXngyVNp z_b?3tVY#%xd`2cR$ou`{TYB3gLrD4H9}S*2tC+-ep$Fm{_={nBC(S+WSn_GVv>wnW zlb5jXFpeNqRn?*E)gv8Tr}79$%)gX^tZ8O_z&m%8CvA=hN@PMcsAB=^=`zhIh2D11 zaQ;7nv-BVIIhH6CFiEAUzOpO8%I#%D&@r|lz=Z#2lk2@VhD55J%D$~qv@_=-cM za8Eise0IB`l1W%AzHMLM;f!s=18D5BQ!>}8RG372sfIAiu1CnSM~Lotf#Ex_54wMD zl5gQZvPp#%Eotz%s}iVtj3{E*|g9jqS+M2ot^1hKi^p4h& zq0oeo=1JHUn2$k-q-p z2N0)VTFcqBgXQ@X_Di0l5&>GbGNNcEF}I)2CXczj{BvNlvQj*7<>Bb*={ea+ewD;o zK*-==d~!C)MiqI*PVGz^=e)I|j*VCVG0Jm|BZq9VmDc`QedmL75JnNYE(~wmORNjH z_dFlXeYbR?LNbW(3T@mR$kW2MWUV*@5{m07>)QDGHfmEr{RcoYu5w|o-tB!X6v#e$ z1BoBsQ3&pO7<|NhW>ePmf7N~hFZfrKV83B^UKcB$}l zASK3XT&Re*iP}!1r*q`gJ|E8t0g03jNC$JEaKT@;`*ob$CrmexZJeXBCn%rVkkCZI zFrDM=>ke6WD?66)*l=6NiY6Lzv)%Vzhcy=MbFi5W58CYb8Zd|UxjCbJzB9=lGaAT| zOird^>7_rt)^(r`S_gGgZkt$3S}WVB(>@-1gb9Y7_UY5n@V%e9!(5eiNDSKQ+pfwR zqs8ch`9qcMLXg5xZ`9cxAMye=Hz{2v4OJL$;mh%DA_8H>Q0p5F1wJKjQ>r*;W2P2bXYfJKaASJjLXVsR zHV)BjKjX1vkhB&3>luZ_k_Evy`r^qtmKN{;C2DtZwAZ*iyS<++SHU0phUn_hpuFcp zT*bcQn#-IuDtQ}_A@*wj{%t;s6bWL99Zh%}o)FM-+G{X$l1MPn+xpC;Ov*wXMTMbS zBhI=UqaWF;(2JP{*U}q2>|<~=<2N+NdD)@vI8T#np_T{4Ls^Q6K>LjM^puQokb4{X zp4x8E^EH#BorBo`PctY9GZ%$PFFr8zOXBuYUqXE18~q4|H&}i+0p@n-&3F|Li8056ZCO z{4=(XU5oUjQgUp;a0-mriII&{V=eV}-=y$$X0d((j zg%?8NlO*P@R?g|p)vqmHJuY?$AAmlXFXe$>v3ONS$7cRe z;^&P`B7X`M!~7<1GfA|^xid)0;*WXZ#3m!kSB`dt(5IiD>Phl(nBT2Ia+D*B<;9yH ziWX8+#y*~$)dOHj;k--}1b^k4dx(34a`zNz7eT$Hex>b|EZp?ADLrk`$1YbOczwik z?%O|#o$9=VJF5yOJN4XLbH)e~I1ZDdykX4!JWqeIG7{z=D8RtiFY4YgHl=4lZYL!< z^=RfBXu0O2DJ9q{dO^*&gTE`aKt=7yu%5d4Zt8W{)5ZKq`1X&hYHCI|xB0qDF?~G* zf9IRGZMfl>bcaZ?{4<({_12FCpl~~E45IN}ChFf&*Iqw+mSx7ou}xHeQo5QXbCGRjI_mw zJ!ddvcw7E1cug2POFP;cucj18qe|-MC#ML*%WMp`)fchC(J3|>wEN&uRkhZg19B2k z+fJFf!8X{$g!}rAvHS4u-tg9H9s!O4j$Q!d?bpzROO4(uU3*J&-+ufNsPW*~9Ma&= zpMHaP4QcVBEG(T-Icsv87WV;=vp;^B!N`{T>DJHag6BS9p(Q;EJJf_}jJSXcyUwWa zu1#4?{s|YEI~&QJ5PU2dJg8Cr#aU=iG`@}JKr7D?B&xaT6HdaU=?N6mHW%76YYW}~M8t}4 zYjx$~DG-m}jMNl|fPWD)syk*+Y(+SvRkz8IiJqvc3(;qiW4V%;Sh;k#8Icpl&D7BQ zVlv;pf7e$NMxxUo@t~dgh$}6uHmPvli~USKAxLAO!`{aI&!sKhCMR0Yi)jB2Tinup zL3REA&fC6oUF*M-3 z`ZsAryONosE$W@%@slSrR6<-=R_!*#mfFtZ>XrDwQloqj<~)*b)X#N{9*o;DfrKl< zbJTni;RLo=X!?BvG{B+g1m?h~r(f>nTK!u2Rgso7`jXu-M(R7W1&Slbp(37%@7XYS z=NAsKd2l>ae{=!}i4{m9ZD*F!M*2LJz#L@&LaV_4Yk$=>&>A8XhM-j8C5+Fd>U@%r z&GfZBG9AtpJEh~@E>f)F`0w7rQiqaaCZ{Z0@E5FGkaNZC($d7meMEIA3n zW2mA@Dx?FX--MDPT$Z$up+spyg3lJ`Q@{iKqalivB3egq$BQ8*70SR6ekvIox=mSH z0S^d7tKbLeE@=+uVETg47|orEbgb9}52#K?le2tU7J3j`tDT&jYGzQ?0Oas9b&;5t zqVY!Eo7IwD~M$h9+ zhc2ua@6jY&;zi_R)k_!TrJt0Ug{q^%sRLU!1xm7U0K)4widHUaN`K4b_{5;wjaW^R zFXi1@&=R}qEh~+EqI8Rx#FqXpqF_`&Lp`>j?-J$imP@)w0l!B7C1UnsjX;GsCieQ1 zXZ$pav+v_jpn-?oC~dqznl=rGOS>$`e+fFMXp4|G7!5_j2;VK~qz0*UhbJI}b}H|0 z%M$9QMXRanQZSF+b#Bz9URvkUHeyKKHC=ttL?b6;OrXP(o~%&ELrVoG3wjxJPMZGT z@n6^@XBIdRg|9z_a49{OtWYWh^JlxUHzJmk9iB0j)l!;y1iCXnh`LT^Sh*xD+K|Vc z^df8rpdUWWbwZ_A8|0Y{4=t8%CNRAav=Z-*GHX=i$UbK(5N-H%V6kd9%lJ%6%4AN2 zzJ__|B#@F)`3|UH@@f+aDbJJWCRWxq`Q%877_CXC74J&?R2Xm*FL-L`_#mNv$&78l zP4WL{&KA76idRLH?1GFJB%GC-`Tlp0n2`~5(8+9F?=Trk;U>5z!?G= zlaoqR{5e4Z+5?vMem13RRzQxy$dlXLmx{-;aq0Pw+)@+M`NX_!{0*8FsdgO5s1#Y@ z_1e3Xm8B^(m;Q;?zXWA(osQ;==c_0gV{z1aIdd*n%gIqI*KpORx>D2lnA)T$^KleU z!~G>PE{4VCD zE-JhY|6_m7g23C7Ro_VN{{;G&&c#W1r0V;t$isU{y5 z#ZC*^wb_TgCTEZ9Wp3 zL1nl#-7s^u;Q+Au5nJ=rn>Vn3ana3|+&LE_%u<&h^L8Exq861FE6u8b8{Cpia+$co zgfOd<4?wSrAe5+czZ7)9?Rno)LV3kmwNx8pfN75Z5Sddv)=QoWj&Z>BHOi7)-+0<_ zGvYp^&fERYJyrXk?G~8LHt8%QQb(uEiJe8RO!x`*J@#0SW}2xx8cj_DB* zBfK8b_o%v=k@v$Pu@D6*`#zKvI=OH|d^ZDAsh}YgZeZVLo*YJ^KbIjaQKU|*RPVz` zY!6d->gakhk2uk9ykjdO}0pA^?; zY){Q^oGmvJoV;B6OoGgmu*hP5D??CM!a2meH|X08WGs-KgYeQoUth-hD#rDB=|UCX zCCgBWd<%mP!~U-KR0-m5f^G1K5xT33xy5o|2e7wuJgy;zTn(n>ElX6Hx0e;2!Ar)?`X%lO^ST;N z`U~3E5YPYIu<6^-kCjz+W2#uVY`}LTeR(F%6l7Xa9%ouu9Z}os5U|+6^BFnSopqHE zL74P){;a-hohPI$A$crs%I3oR@b?9C6?K_1g>as!B--Xf~inTjX74K~hfgIUPHvvm0XwJm9 za@{gF-ohTYXR!`WP^EiLhD%j=0c=?DDDLOI;@wi%jEjJ!`L#EkGLe?QQZ(-@&-=dZnb z!8%yJWV%@g5*L+64hQy2agRj->9Soml&BWdq~0`upWdG4>BxRte%r^sSRrA?qaryg zBD-jLWGkxYkD8lvqwSDis!Dq9#~{NSO-m?nrA|0N`o(6r?IWX!o4#4FZIsZZOe?Kx zQ+(Z~O>^(nr{NFH9~CdB&*xqn{UCTAjYEk$vnx7Ki%8q$BYh@2r$^Kukkl*V?(9TJ z!EvFQbx-5W&9r6A^ycMOcWm}ed94!4J(!1;pXnrKr{p+F6?^b3o$-vWY-$phK&}aB zdl;Sn!fHEgdvlef@p41*CZ~#==+%WQbee*d2a4VJAVHnzFs&^JQ_qbIAaiY$IV>NN zLlnTk*3AuINs_d86}Dc)LU))OlR7g6=ZaUj;{lEF?!{aQH;QDe5jb{?-m;$Q?1QJT zw}uVDaFkMm=pCp|`%Y2~tI5TY=jsZ3gyZG)-@-!v{;$@Ip;e>qODZ4?xV;GQL7}_x zLJSvyw8)Di$L3pyu6Hq1>Q)$~(@GaT)18cNWDCXY-VMv*iiTX;BFlo;1AL~m#3U^h z>$3<{Pry@%%bAl#mdo%5@@_@Zv{$0BD5R*zv(VRNki)5$ZB?AbYjh}&wurD} zDk_lEA@wh3fXkgg{`P}w3$=gkmtnoSEm}>j+t^w+k~N_*eupWS0d4-oBQL#0+uBR{ z#EjZXVlVIwq?Xp(KksLBrbk_8owpXy887g`9hQtrffJpwVew2EF!*fEGv1>Cx4c0w z)3LH}JUDpz30nE3YJQhZ>YR6r0*vJgb(0Zv{3KP~ytmnF6xSK|u<_l*Rkc8oIF0Iy zpq&L>VC1u?G%W1*^*7}7-3|-;)B>Pd9INRX==Ylw6wB35SVTLvX#TR61%pkmtKF^) zs(~91`#xqxE*H{&C0|j_6Q|q#fD=!^T-lS&4})`y8mnRW`d=k!YVvJc^B17@*&ZOy z_z;~Q8CSVEQXcJ2he~wFwv)u5Kj$*l;+>`oz0pp?$K$t`klf>skM&nsEXZVEi^xab z*olihI!(&h&3Akz2=83>6W6Ig3B<)%ypGiQ7JIeDYD-H@zXF4$G({+C>PiCfV#{ zKD6-@4vDH@a&dPz?lAl;mNB#|bbdJXfFX>C|Ddsz|E;_q8>Yy?8t@43`UX2^7HY=k zSdOsh$Hw+mmdD8Sq?x00 zc7tuigd}q6=k|J%R;V%?NmZ?73P{X2X-1-Mq9oGY9`{!n`Sw2);?$jQR<~H}vRK+@ z)&tQ~a^_a(!l-Je;Ii<4?9Pf|R$VEaQQ(T}wjZhg{dET{cgz`)yHd0E!cHDqi4snu z%+d;KEnOUr;S$|ZzS4pfOwtIo7N_s91g1xWgH}R&y8B#a(cYvvv5_xXe`-F9+5I3+ n%Buxj{`u;}WeODyXFwz#3GZG+=dGXoXMpszjqg-yI)?r~QaiBJ diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png index ce21cbb30ffc25f25009859c0263c12d228d8a4a..261318469e29d173892010356129e881f970375a 100644 GIT binary patch literal 6525 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 literal 3197 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 delta 1263 zcmVLQaK+g<4-> zd3kwZVPOvu6PW-2W-|cH00960fa|Rx^#A|>0d!JMQvg8b*k%9#0B?F!Sad{Xb7OL8 zaCB*JZU6vyoKseCa&`CgQ*iP1HbPM1q@nk~qoL8t|XwD;e z&Cd|ji`iz&l7GV8vZO|aj7guWcSlmDXv#mWhZ3zrO81d>$GfALW!ZzzL3vpq=ajMB}yA31>XVaR{7e0yLEP-~Y|BZYXfEHeLsMp}-W!RbEw9UREV` zrn>;mF$sbLfPqdp<1RKt0)Jt2=(UT4N;}vP86D2J6MwMx3Na8yZ_=&%dZ`o6c%WF? z;?}0u4&kMJ_hEl8#XvK950P=r3_D0H{o_7tsY_;XYRtlX`-MMdHZbdzE&^uDXJeks z{D)Z@GhDoF-G|x3Pct`{mvj6vXIF2D;@hm|v!`d2oE!cbUZ;R){QA;EPh=VTV|sj( ztp8Dq&wr1tE!JRL+gkqPHmKO)H4ts2ke~o^;6NY^An)fTcI)$FBk+lUQ2|xyRJv#Z z!2W>1_eu%Wr>bKu3dRN?aYj%R2}rPB4p?8Iv>FKv4N#>POjI^>HUJVB0F52;Qssd) zm2#_*AQeF6ihAtVs>NsvNT>no78`8Hc{$+$et&I=7JyBV*6*~Kwu7S8t)+4cSfgnu zEYapxc)AE({Q0MDp219@#yI+ipzos|X$)HWq;(4}=e%3HuX zL2dxp?<7xdbuawBqyg#VvD~i!*%o}7Vu$20qAjqBtt2p3lI1DQrXe6(yfoH=<*kt} zS$|!A+$Q&7gz`4QJm3;ae!fkuFzM^urSJ-{Ic^Z(`oA>axtwGDA1=OV5?Ag6D||mV zMPRnLH|D|2`M@|^o}OLh6B5-fcJ7vse4t#KYwTvWoY(aq%lYscf_9SKJ>2{E*hSzD z4~)A0|Gs)VzKMXRNB>sA01{0yI@y=0fL=YI$T zg?*$TX#;;y(GuDNg?qveS^!!?`_QN#q=BAx6Y|L++yp$Pe+huAD67ms7iy!*G+^s4 z=?u!dRe~?`Nw+eAZqI8#fImpmZY4t6Ge6ju7NAo(LRg>!tKdol9LtK%LG6G#w%Tl< z+KYtH6YC|h4d8%QS}FpLe11UNK4^eTF{S&Y($QB@C)5UjvP_M}1Q?g&ZGgRS(@s?C zBNp@{JR}^5n21JcZD(HAgXxta#)+mis(D9Pcyf175sG#Gi(!4LkEd*#xheZ2* Z;SU2Px&Jm7-HHGJ002ovPDHLkV1gE2OX&ar diff --git a/Resources/Textures/Structures/conveyor.rsi/meta.json b/Resources/Textures/Structures/conveyor.rsi/meta.json index 7dab3d111b0..0160b6d828f 100644 --- a/Resources/Textures/Structures/conveyor.rsi/meta.json +++ b/Resources/Textures/Structures/conveyor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and modified by Swept", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and modified by Swept, and taken from cev-eris at https://github.com/discordia-space/CEV-Eris and modified by AftrLite(Github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/conveyor.rsi/switch-fwd.png b/Resources/Textures/Structures/conveyor.rsi/switch-fwd.png index c13ef62ccc88f0f2d07bf53920ef1fa53288ca2b..12271b1fd7cdde9d626b2f999155c732e6fef6c0 100644 GIT binary patch delta 370 zcmV-&0ge8Z0*wQZB!2;OQb$4nuFf3k0003;Nkl6JKELuS*T}o-1 zOz|W16NKX0rBKjK!Pzh4s35qwO6gSUQgsjRk0G1^#50I$_a&dyJ$)oTQA6XGbElf#Nykjh_Q{H!LE14xTS$_M=+{oc(&PoV)+ z<%I^&krx&~R}QePD+IF9(v^e87<#Qv^89qq*GI_C?mi92rnFZA;PT>%$A_NMt}0!e z%JY;fbpWQ{?`xDR^@SrRL#qXc?Jn+t{i`PYfVAKgfRP;g|Nn2mE5CfX+W*Y#T!xSD z-x4&Ri539>vYc2zbq9ca528Q3%OxswsqO$$d{1=;JbRY0m%>f|a zA3S)FAu{q7NjYnHgaEm|rgTe~ HDWM4fp%Oy5 delta 110 zcmcb`xPozl1SbnK0|P^2Nc!=Kdb&}JB|(0{3=Yq3qyYsjJY5_^G$tk|NMtnxGWs@f z#x`u=N@JYF8nHq_K&k6gdZ?h6gJ1#|Z>U3PprLFiYj%{>Du!N0h6!6(Tg`c{_ZAM*eJ diff --git a/Resources/Textures/Structures/conveyor.rsi/switch-rev.png b/Resources/Textures/Structures/conveyor.rsi/switch-rev.png index f75304683312fc94d6c32f4a69f5a4ad698c391d..f350fe75c38927774547e0b05976bde507a79db5 100644 GIT binary patch delta 378 zcmV-=0fqjX0+j=hB!2;OQb$4nuFf3k0003`NklAov@c9oz*MSCLGmE`o#LAjy=Z4ld$fh(o!e7j1L3>2%K& z-pjr3lf3r<27|$%AcUI<;b!ZqS5=GG8#Y6Kz`7)=Y9NghMt{M0Z4wnVAdA);Hffwt zZ`cI)H@Wv##fBP)qQ{Dq82SU6Ee9YgOCr|-DIuR1tGrGxJMh{7 zG+Pdr7gsB9$HHV~OB6~}rbOW+Wl3lyP$kYz&VlKc1(p)ho*;yq4gCQCqhL%LCwzXq z0kE^Xr!ArV2XmgE9@yO4p2cKwiLONMAS!~p-$pq0k608Y+}&Pl=h7B9?Di3kO%x`) zPbL7=ENd#%?ayLG`Sm3Hi!@GV#Z{tkI+n)yv3V@j0!huX{xcoWT!clh=kIrk!C+X# Y7bk*&Gg9B!^#A|>07*qoM6N<$g5RpBf&c&j delta 255 zcmVAKgfRPycmn~cNKQlX*;lsOJyy_Vl z8%XvJ6ETWFmeUFlCARsjPKegRKlmi%O7z#u?02B(>u3TbRzFdu}p+K|) zXaz`efRxm1MtggEs)oYQ3IPThgu;M_01G*qAfb@@fBABT|9IE0Uk8gdH8B%as#3)P zb#;ILXJkOwlcr1q)6bs={wKC*r`Q27OFDC00?~e@PR==oRdL8+yKlT1*2dTkOdeR7ytrSM`gUaqqqP7002ovPDHLk FV1jJXXjT9K diff --git a/Resources/Textures/Structures/conveyor.rsi/switch.png b/Resources/Textures/Structures/conveyor.rsi/switch.png index a89901f190e931593ad446d404400e4ef28c9715..b912a66dbfc4994ed307d2d8103f18d8ee96b6ba 100644 GIT binary patch delta 324 zcmV-K0lWUF0n-AI7=H)`0001UdV2H#0004VQb$4nuFf3k0003ENkl3-b z6o5ZV|AfnVPU+gA;8N*y99>-w1iMvm_Ad!tT&3J3b}2Xr9m-|8oDN;YziRbm-CvXnDfEVxrRsuqF%Ht1Ek*hz=>E8sRI4O7A4FKO?8S``jz;3%C ziW6fAqZS&)Nx52nRPp`8BSo&zLV7HHf2*DM)BKmfv4GxO zW{RKn8h~aH96f}3{c5Z(Mm136s@nV%nH}a#yQ9?=XqrLbvK%lh!n#k*_W#i1xlZ=v Wnpcyat@4Zj0000C@WU+LV-(l9Cb^ z-)K#JlL85cUZ6_Gk|4ie28U-i(tsQbPZ!4!jfu$#5?Kv_jJ^$=u?-uz(ikVPMyyZ} zQ0h9B9xCYNAeg|#8|n}mXeb-XnjIyzilLX0VZs(x!B%sgDc^vGFnGH9xvX Date: Fri, 20 Dec 2024 16:49:31 +1300 Subject: [PATCH 03/40] happy pill --- .../Specific/Chemistry/pills.rsi/meta.json | 15 +++++++++++++++ .../Specific/Chemistry/pills.rsi/pill22.png | Bin 0 -> 221 bytes 2 files changed, 15 insertions(+) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill22.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json index baf498cff33..71ef846a044 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json @@ -73,6 +73,21 @@ { "name": "pill17" }, + { + "name": "pill18" + }, + { + "name": "pill19" + }, + { + "name": "pill20" + }, + { + "name": "pill21" + }, + { + "name": "pill22" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill22.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill22.png new file mode 100644 index 0000000000000000000000000000000000000000..426d4019cc687f3ceda7314f19e53749aa14b7af GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(>+}rLn2y} z6C_v{Cy4Yk1sZU%Nf=C8_3-QK>pa`1N&Rsb5AWW0KtoH*OE&x=v%9*-|N6?%Z~J%e zw&toWX)8-hkGi&e_~gl`vn1=ruF0(n&wb`{e(RFIBVz9J zu(q|<457-|rJ`_19C-7XNa5W`fF&L$2vBCUd(T)BwAJ$C`nm&)#6$5+k`( Qpc5H9UHx3vIVCg!0Pi7CEdT%j literal 0 HcmV?d00001 From 7595b88964acaaa4f7762dbcf116eecfe3145028 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Fri, 20 Dec 2024 18:37:48 +1300 Subject: [PATCH 04/40] storage tank tweaks.. --- .../Storage/tanks.rsi/fueltank-2.png | Bin 974 -> 1025 bytes .../Structures/Storage/tanks.rsi/fueltank.png | Bin 974 -> 1000 bytes .../Storage/tanks.rsi/highfueltank-2.png | Bin 858 -> 894 bytes .../Storage/tanks.rsi/highwatertank-2.png | Bin 806 -> 861 bytes .../Storage/tanks.rsi/watertank-2.png | Bin 942 -> 960 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png index 8dd4ed80e2734419bc98654357fc2030e2b7426d..0cddb366d3f5eeedaab536675f6462a95bd22344 100644 GIT binary patch delta 990 zcmV<410np*2Z0EXF@L*BL_t(oh3%GKXj@er$3I!JHEqHi*ngoyHf9|+^r4Y!=pJe( zbPs_($|yoX#3v2v$nZr+Q|6Ofm`XN$a54}i^GR8u4;k1v&{0E@hcuTm!y2$;Z8Nyl z^zQ=kp*^?v-rW3Q`Zm9Cx#ynqJ-_ew{Lb$l4*ZYj9k%}>NPjFA!#@`-x8h}j;qFi< zRBs>_iy1monPRP7aoO*+`RAhLp~=&~wc_UDg|nGpxLd@(ee0^tVJ4+A#oF}cFk9O@ zEycS!oy=T`*8K2fcVuj$<3Vz^5qEcFY=U^<3HH9)^yN31xe^6HGay{aa)7Pv9j;!x zfh-4_8hGQ}YkyX&Wbli3CdBu{kG`E9nmldbY;Er#%K>iRIxvvR6l<~^z&|XJ$tnmV z{$Z(Q78;>hHuN|m8vbF4FRy=9N62IqPMmOS?RLd;@dCMcp(VGj2CSf}6*5_cRBEAR zRz$kZX@6z|LeM`f{i`i`W&`b_<3VzEcVuj$**I{vp?`r)R^h{oACSo^bagr{E8L8( zPA9S);Lg{x5HBzU4GS+9FL38iC$AjLGZ;{mJX?Qn@XOB$HY%Gfh4r|5_eaj?MB3r& z-wuGOw}Q6szMs=hzf@|WZ3C*RVt01EsP=jd>GzKIQ@sD!z_pjxQB{>xY5`SM4-E(t z0D2>^pMRaT)fMf#w{HMR@)-i}RjasM?nCj{Jpi~|6%(%ncH;spi%?PWnusL%n3{T9 z8`EbeIiH}nZ-8SC2b-G}ZRP5Km!nHLx?go0vT)2%FIU%N-VQ~{lblaz<5n2}xR+mN z+}Fd?Ged@cu@(37>sD)R{TnvRfF9$%9=xOdJbwj_F6AiRe~fpuUo$a&VA6~u<_>cW z2vPCq5x(?ET|glY)D@u>>I?u{iYHGcw6|5;Y^af7Gb5G;^q4%AApYpQp)J1kaJk&L zTyDzg3clbVE|(i$aFBAkqK#RhX$|OwtV9L&s#Sja{So879su%l4-IeF-~YX8we@ef zwtu>UB>7O3d^2wbq&i*#;Mb)lBzwO>T%0Wq0C7EH@YgmM((sIP(IT;Z_7SkKRaZ6G2 zJiVF4^aeLCyuf1G+O*{s09^X`(`gaJDtNoFnt$!{&t~AT_MUJ20}9W(HW9cE!2kdN M07*qoM6N<$g0HLUxBvhE delta 939 zcmV;c162Hh2+jwPF@K0jL_t(oh3%J5Xd6cq#($g2amb2ZS`{unjvpeuVUUx|U#eXE4rZK*~+6uCJIF}wu zrBb~DG)=R0u5WC1`X&G9gZHHI?bX)U`S@;-Z8@t?J)BDqiTQu|`Mwl#8m(_^b`};c zFgltDB(GL0tZ&@wj4QMcCTHdc3p-n0wg;0l^JMk*`o?DG+O_Lkz4|!-rU2)vZ{N8a zD8LQntj@@di+}Ut|Km^ZZjGIf_XrmV339P&p$uR;Iq6H5%NIPy{GwsS3DFoGP4LO( z4_!$_I{XNo}(xO&dmFb z15=&?s?`eLtbJ=1;m3;?`y&3Xrt|%ury#2{2A+ji&VL@;4Px8kA%J$%AeS$Y%NNXc zKM?l3`I00E?WRGsTIu=;0n6znX=U}M?HuS=1i%}oPDh@dQElN@lTqsVhTX2!gunl> z&26S&IlUwSIEB<}x~Uc*qQp>#?G=7_bc8I2Uy@J14S+1~JM8}I5${@rrDBeWbJN|) zhT|+OTz@dftm;d}8~`UnA)Y_)lBvlk&tfVAkID>9gl$nc843YM{sNrosMmCE920?i z1OOgXn#?8?Uc5VI>ldkbP-(iYHFz8PMZk*Lgo2uk@&XumRHmM9peCcHh}mP2fdW=m zZ+0R|%+}{c8c|}l`oKaC*hF~Ygj=Tw@ujo7=6}Vx_{1z2(E>@K%{o$6^j zA@LLZNB}PQC_t`#5HBGY>p*kEl--4nL zoqwX-wxqD}^KUl|YEOQXdcKN3I4zNcWxayGcFR7B9tzf{bzoL-Vrsg!#P8hb{j zRLo@n-hZdV55G&SEe>$`j?pur6YZv9{=EDfdqzgsdlq41&&WjIie&)S76-V$a|lQ_ z=f#2sPzvnyX%ClR8286vusnBNbb6W*Y zOiooBC0>}Hb*+qqO1J34zD% zJh*>Pdw=gZ)rBO54HF+$D)@Z7!i5QKOz%!& zIZnr^E>5`J?Cg}am8)Grj&EdXd)aSr;e@-EuBPYa>XJ+Ef}-R|EXTERD+d6s<+d0K zxAW*suc2RT#kJg))moj8VLb=*7z(!&9O&c`aDRLw%iZgn1P3}b5kpTznsLnBVXgr| zDt>xg{P3fi2?aS&Q-oHi5ddfwkB8#g)2eM2WJg#}h@}8M#zS#ph4Y5Cc-O<{^W*dR zDW%GUhkNk({Dg;lD5c8Um=)^QfS$;TRN$~u;paaJ429bP$o+E5@Px z@&rVlm`CL8@2Z!eP7xN1cV@(7b7L;nQ$E|kNlQ{YQGvkenf25*b7Rl3p0XBg`^UuN nZJjo+$cfwvR{3J}&j9cbHwv3g$^tG$00000NkvXXu0mjf0g>Xd delta 939 zcmV;c162Iz2hInOF@K0jL_t(oh3%J5Xd6cq#($g2amb2ZS`{unjvpeuVUUx|U#eXE4rZK*~+6uCJIF}wu zrBb~DG)=R0u5WC1`X&G9gZHHI?bX)U`S@;-Z8@t?J)BDqiTQu|`Mwl#8m(_^b`};c zFgltDB(GL0tZ&@wj4QMcCTHdc3p-n0wg;0l^JMk*`o?DG+O_Lkz4|!-rU2)vZ{N8a zD8LQntj@@di+}Ut|Km^ZZjGIf_XrmV339P&p$uR;Iq6H5%NIPy{GwsS3DFoGP4LO( z4_!$_I{XNo}(xO&dmFb z15=&?s?`eLtbJ=1;m3;?`y&3Xrt|%ury#2{2A+ji&VL@;4Px8kA%J$%AeS$Y%NNXc zKM?l3`I00E?WRGsTIu=;0n6znX=U}M?HuS=1i%}oPDh@dQElN@lTqsVhTX2!gunl> z&26S&IlUwSIEB<}x~Uc*qQp>#?G=7_bc8I2Uy@J14S+1~JM8}I5${@rrDBeWbJN|) zhT|+OTz@dftm;d}8~`UnA)Y_)lBvlk&tfVAkID>9gl$nc843YM{sNrosMmCE920?i z1OOgXn#?8?Uc5VI>ldkbP-(iYHFz8PMZk*Lgo2uk@&XumRHmM9peCcHh}mP2fdW=m zZ+0R|%+}{c8c|}l`oKaC*hF~Ygj=Tw@ujo7=6}Vx_{1z2(E>@K%{o$6^j zA@LLZNB}PQC_t`#5HBGY>p*kEl--4nL zoqwX-wxqD}^KUl|YEOQXdcKN3I4zNcWxayGcFR7B9tzf{bzoL-Vrsg!#P8hb{j zRLo@n-hZdV55G&SEe>$`j?pur6YZv9{=EDfdqzgsdlq41&&WjIie&)S76-V$a|lQ_ z=f#2sPzvnyX%ClR8286&IeU_O)?PvWcw;pEze(Y%8XC;_h z7iOjPnf9}O0PI>(bL90lF!O!Z%sDkz59tlwpSasydtkF^BN2Ay`z&5>L)JhrJeKi# z8>p{y6CPBpet!gI1AX0=K#8or1NC)ou3foK)9yW%fTQD8;@2Aj-z$alMCr1P5DvHh^3sbEy=v>{t+NasnXB38Sd= zbv|F5ol8YQT6nko3Rc+dB$Ek}$pjVK9mF@dNG7JK*zVBt$z+0bI!!vA7GhV}jdNf0 zGkhA!Zh!C3ZMBBHtFg*ZFO?NG(Bi4o1(v@XGMuTav5FQ?<&s!o16t$?E*`AkVTBA7 z5;4n{!U`FXWe2kCAQnpC@zo&94m`dZVxfdylOzdAl7!gBVfj})mrC*E?MMCWB0cX7 zPcROa2s@Wb89u{21CtZuxZNHAf@K>4c=gW0rGHdqcrD82G@qOp&l=D!iQ3&zRU^6y zueTv{HfjYYPrxG&&k^IyVJ0f#J{;u)1K=#cOlT42Pz;xql7Aq5Qh(5dfSzeWqO#FcU5% k%rq`tIDc*_T7O^s0!0?jF$bypLI3~&07*qoM6N<$g8u56ivR!s delta 822 zcmV-61IhgU2HFOYF@F?EL_t(oh3%G4NRx3G$3JWH551$yTp0_dEDeU2j6x6EMFO!? zCn1E$i-w0_(xs$@c?pFMFX^QWPj)F1L69y^q>(f)GH5nZ>LqnsNNrGSV;%H;eP7+) z_oqRJ>VdKC`F-B+@B2Q_^S=DxfBfrVGh38pnX@w^Nh^`1_J2TCUtb>!9ks%&!GJ8w zT4H=+ssQlz&8%&qqc+*l>3eM@x;zr&=hE8A6jYQa3EV^r8d}6B5 z)peEndOrgLw|~uUf{O6mv?*{vR;xgLy`LLB*KoN#rh?0papBEHScfIC6KV-dmHn`6 z(INbkVOfES@Z7Z7bno=J`Jn7R1F=|?M`KS7L-_1dB}~R?fRe+sJQ?5SK%A}Eo;l4x zDxnaX4-=XXYri9lAx<6Jy-+kn*i=Fx7K@TfDBA}51Ao1?;gQk8UeI27)U|coYbdF= zrJA+*bt9Kd03ghM{Z42;4Cq?WALz9K=#6A^IV8!sE7*Dx07*(4MeSd9^44rN_u25@ z^eHHJILKtuWHM>08l7x;ykyefsA_a-`AjBFKA$I_&kM2T4&&TgK8CNN+vWXvrooW+ zwp1I|4}Z!E8));pHG#5s%Z8qMTdHaEyAQ<*8&E?pxOcFAhZQnVN~Bo+Agqu9Npd1d zPLh!{{`NW~$%((cj$|aQt=a8%>~^~lyEjZ<#o1hrmx~{?-bH6t4BucJED<)F%ZV9q zxjlq|)TY9V&5ve24PnK)+#X!ISu`9hN+<^R-WuP&e5pGv#;WK z^m4BSUkXKtFMJ`cSH9>)6f$20z0NnG6H6JnNXtLW70d%Iox~aw9XIFgzg;hmJMXsp zHxH=_L$jI;j#>OWY0Jwjt=AKeIVO%RaHa@|O3=cqLpto<3 z>Fpb2Y_<+0lBt4=Ju?we0nbcCwvZM!kxap6>tJsISGdh;!J3~`YU0$z&p?~if@e>k zVH=1{3L9_5Xz~mr$KZ)Emm>}|D;rRU~)6+R+{d~&8Qo|^!KNW^1!|85SkLmB`u zHT4=m6MvyrX<^yi>`@N@ON-M4Zro)!V0CpF6h*;c)PL8S4GGbfwziw_*++>IhRWHE z)XGv6#n<3(!P4S10RUG8MzXmKj8)a51jedr7^{v%Yb81zA5&wqxs2$$;t-bV%RnE- zMIF(HaWr4ni8}jv#1_%Qmg>upNej#?832ILhfjRME9Z_oY;8A*;>EI>4K&`o#-FeJ zU^^6cB!7$-!)i8=ul%9M4+8i!zYSWw7yP zPV(My5)PIYR`oI5jf7yav;Y8@^cQ5(!1mi!C7&V{!|p~x(mOzs>%0k@tpfo2cI09J z__&;eTz(E=T=G}(g^O0k-q{V3T*q!C#IM&kG=IWkX(?Ejk{rved*|n{{moD4q%KaS zQ`p~+cG7el{mlnhiI&6VAnGnalI!o&FER<4#EDtBR{#J207*qoM6N<$ Eg1TRhr~m)} delta 770 zcmV+d1O5En2Brp(Fn3F<2N0r4NE2 zL`2|I2!SsezBvLZX|a3>eY@mdVzJkvhs(fN?7^8d8V*9(!<~W>CpNB=z&{V0c6*rj zde3(MZG{ij55~^U?{mNB`#a}%?=J8^{`Fvtk{rk3ExER9CVw)k42tlgA2jp5NQ>ibWznoW3~VY&l+ZZBrk-F$8@24J9G zw#I-UWbrEe26J;yl;qJ`90`m7Kuk|Gv0T8>TD&r@gY|m*&I}Yqg5+un$<>rH&ZLuY zU%97TXf>>`MUg-dvM7qAVjwUx#Vjl?N!4I$i`{jp^?!)kQlGyAUo$@_jM0Cob8lAo3kBl&J${`$!1e>W^DPmMEy2wLWjK>hX?yqMTZCb z==IvD%6^_y7O}!Q?9H@!BLe_HKBW}F{>x_-`urVKzFyX{0ru8SWt{$AsZd>!I$sZK z*+6wvH-FXdvX%|VVm^O|W_LHrnm!5DoxLfXXwGZh1$t~<2Fk}J2p>Lbo}C=(#LLQy1?`|ci3&AeWvT6?TKpGhYXn3-ZUk04(l!Av?C1c3X! z65ekz2v0aL`I^*-X+=>a%12KlUm!uipa=2=61>>O1_2;E;Xr()1b|U4JY@`b0RYT2 zG>-rP0*{|QQwzwZOjk58q1IS<`QmvaT7O^s0>TK6Tdbs^*Z=?k07*qoM6N<$f}h=I AasU7T diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2.png index 83d2b80cb98b0dcf51a9dd2e9a0b505a9357e4dd..ae51e89698e73f7e357a5dc07a02449b3f1132b3 100644 GIT binary patch delta 925 zcmV;O17iHH2fzoAF@JhVL_t(oh3!{eNK;`Lepb`w{OMq#EFqLMINofIjVkRF0|hr(|8&cRc6p zJ3H&|DxaJ4?fu@L=X=ikew+a(_}`)XTZ!y#o;58WPp3UgX@Aqx92=Wjqlp&o@9Wap z+dOL(RXHEDy*+E5PJ0%~-{04ziy_e1)EaHS--5{Qo@P2@iU9zkL14YMFtcW8abrZy zx3(~|#_bHRKYjKxT3vMw9SkSIV{ahwg2-92;cEw;u5%CUJ_$-JHzO1W<@e? zXBZV#IWnKf?tdOQ&W8TJp9C74TB96iL$QU0Kfr?!DYmehD*P!z&b5g~+Xx{kI8_g2fj0pS+TU6i5U^ ziyI@gg_$++_5oZ`CEyS6xP7M?{s0eSihbuVRL&&v#=Dy!><73iA56gKYr=~V0v;?hpW}%?dSE*BuqdM z1Q=5F=S+r(On$SK!K_b^`G(HuAqWDz-Wdpja7;iX0pPNP2ymp%YB(hR&d$jN%NEHJ zfBSxb)PJ;enJqOf9jR%DF@8!=n~>+{#Udj4N%fOX!P3GZ)&9!_q{Y+<14rYv z@Y*Ho10_NeQ;Ch?YB&UzEdtNa$KxhLbpI0$_JQCVZ^AL;Zqd94$X5}0--H-#6s7UR zM}HYF-3L^@it{g8qW1Di)mu<$S3=E?*gfMe1V0CKsss#1rrl)9a{$1tg0JXV%0O?O z4mV%OCv;_H*`bUjaRelew$% delta 907 zcmV;619ber2d)Q@F@I=DL_t(oh3!{gNK;W9{;q8*s4$$v>Jkp7g9IH61`6hj5D4N! z;FB1YAsV9>rI(Tx)=MZ9Tv8%i7(E$13}IpHp{Y0;4oup^)zL=W*kw)x|2$~29_(E2 zpR;>!(wlv7+2NeuIp24Fzweyg3;f4f2lFo$;W!SnLer*ETz?O{R^#{kwE{SfQ*;Jr zLItzrH?MayvqIBmM`!J_QEVhEw)U`VHDvvjFY}B=9Tc1i75e&m;dVC~lJk5L!I^i3 z%8sUdcSChoXnkw0SZsGgbyp-T=7Te#!r0gojE>$107wGVyM8tO+E4%uk+6v8cP~p~ zB4H67owXX_1b-GnPIgU{0YLke7G1LFLhMu`o@c<1xpEONQ(ydPWsRfWS7?tC+FqHu_2(53;bvIOZ>5T(uEh>QLlXx-pMl#{; z{#&Mq-=@Up&fZ~W-03e?e5Pw~WA-WKg+GarF9hZC(i4pQS z0X&~XJ|~1jmgy~ z;!yyA)qhfoz1^IK=ZQnOKa0gL5MwG8}%fZ5`Q4aK=U$Qer?sX)i`$j@w34nNsqjr z23-%x$%?gsb&gkV&UBWAe0T(ka*-EDrZpkj)ABvGHDK zJI9_;`%Cds%5j{+gmq4r^e;$^s1`-@0g2I@pU(+MfB(j4-inC`udiMA7EH+Q2HH+Z z27hVu6Y(fUhKCrx-%l?=Rulq>cr*Y2*Xj%Su)$!e--^L$L9?J5`J5m<#pY*4Awc4b znlLL0f%CO&005@?t(gCO0Dw_U&WiLqfWT-zK>08s-v}f39z2vULPY5@>WGlfAAkDz h5df$^QqCrR1MT*&^;CPs{r~^~07*qoL Date: Fri, 20 Dec 2024 17:17:19 +1100 Subject: [PATCH 05/40] shutle --- .../Shuttles/cosmic_cult_reinforcements.yml | 1454 +++++++++++++++++ 1 file changed, 1454 insertions(+) create mode 100644 Resources/Maps/_Impstation/Shuttles/cosmic_cult_reinforcements.yml diff --git a/Resources/Maps/_Impstation/Shuttles/cosmic_cult_reinforcements.yml b/Resources/Maps/_Impstation/Shuttles/cosmic_cult_reinforcements.yml new file mode 100644 index 00000000000..11b198a34cf --- /dev/null +++ b/Resources/Maps/_Impstation/Shuttles/cosmic_cult_reinforcements.yml @@ -0,0 +1,1454 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 35: FloorCosmicSmooth + 94: FloorShuttleBlue + 103: FloorSteel + 136: Lattice + 137: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: grid + - type: Transform + pos: 54.17709,5.9132805 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: iQAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAXgAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAXgAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAiQAAAAAAiQAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAiAAAAAAAZwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAIwAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAZwAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAiAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAZwAAAAAAZwAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAiQAAAAAAIwAAAAAAIwAAAAAAZwAAAAAAIwAAAAAAIwAAAAAAZwAAAAAAiAAAAAAAAAAAAAAAiAAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAZwAAAAAAZwAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAZwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAZwAAAAAAiQAAAAAAIwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAZwAAAAAAIwAAAAAAiAAAAAAAiQAAAAAAiAAAAAAAAAAAAAAAZwAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAiQAAAAAAZwAAAAAAZwAAAAAAIwAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAiQAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAZwAAAAAAIwAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAZwAAAAAAZwAAAAAAiQAAAAAAiAAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAiAAAAAAAZwAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAiAAAAAAAiAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAiQAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiQAAAAAAiQAAAAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-2: + ind: 0,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance +- proto: AirlockShuttleAssembly + entities: + - uid: 32 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-6.5 + parent: 1 + - uid: 33 + components: + - type: Transform + pos: -0.5,-8.5 + parent: 1 +- proto: AlwaysPoweredWallLight + entities: + - uid: 132 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,0.5 + parent: 1 + - uid: 133 + components: + - type: Transform + pos: 8.5,-13.5 + parent: 1 + - uid: 134 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-12.5 + parent: 1 + - uid: 135 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 1 + - uid: 136 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 137 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 +- proto: BlastDoor + entities: + - uid: 12 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 18 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-2.5 + parent: 1 +- proto: BookCosmicCult + entities: + - uid: 153 + components: + - type: Transform + pos: 4.345524,-9.444105 + parent: 1 +- proto: CargoPallet + entities: + - uid: 11 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-3.5 + parent: 1 + - uid: 20 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-3.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-4.5 + parent: 1 + - uid: 26 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + - uid: 28 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,-6.5 + parent: 1 + - uid: 29 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-6.5 + parent: 1 + - uid: 31 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 1 + - uid: 35 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-12.5 + parent: 1 + - uid: 36 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-12.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-7.5 + parent: 1 +- proto: ComputerBroken + entities: + - uid: 46 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,1.5 + parent: 1 +- proto: ConveyorBelt + entities: + - uid: 21 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-4.5 + parent: 1 + - uid: 22 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-4.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-5.5 + parent: 1 + - uid: 24 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-5.5 + parent: 1 + - uid: 34 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-11.5 + parent: 1 + - uid: 125 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-11.5 + parent: 1 +- proto: CosmicChair + entities: + - uid: 107 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-5.5 + parent: 1 + - uid: 108 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-6.5 + parent: 1 + - uid: 109 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-7.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-7.5 + parent: 1 + - uid: 111 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-5.5 + parent: 1 + - uid: 120 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-4.5 + parent: 1 +- proto: CosmicLamp + entities: + - uid: 121 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-9.5 + parent: 1 + - uid: 122 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-6.5 + parent: 1 + - uid: 123 + components: + - type: Transform + pos: 6.5,-9.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: 6.5,-6.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 6.5,-1.5 + parent: 1 + - uid: 128 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-1.5 + parent: 1 + - uid: 129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-5.5 + parent: 1 + - uid: 130 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-12.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: 5.5,-13.5 + parent: 1 + - uid: 150 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-3.5 + parent: 1 + - uid: 156 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-0.5 + parent: 1 + - uid: 160 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 +- proto: CosmicObelisk + entities: + - uid: 97 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 + - uid: 114 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-2.5 + parent: 1 + - uid: 115 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-1.5 + parent: 1 + - uid: 116 + components: + - type: Transform + pos: 9.5,-6.5 + parent: 1 + - uid: 117 + components: + - type: Transform + pos: 1.5,-13.5 + parent: 1 +- proto: CosmicShuttleCore + entities: + - uid: 119 + components: + - type: Transform + pos: 4.5,-3.5 + parent: 1 + - type: PointLight + enabled: True +- proto: CosmicThruster + entities: + - uid: 27 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-4.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 + - uid: 78 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-16.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 + - uid: 93 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-9.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 + - uid: 94 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-8.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 + - uid: 95 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-8.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 + - uid: 96 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,0.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 + - uid: 151 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-2.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 + - uid: 155 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-3.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 + - uid: 158 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 + - uid: 159 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.45,-0.45 + - 0.45,-0.45 + - 0.45,0.45 + - -0.45,0.45 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - TableLayer + - LowImpassable + - BulletImpassable + - Opaque + density: 60 + hard: True + restitution: 0 + friction: 0.4 + thruster-burn: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,0.5 + - 0.4,0.5 + - 0.1,1.2 + - -0.1,1.2 + mask: [] + layer: + - Impassable + - TableLayer + - HighImpassable + - LowImpassable + - InteractImpassable + density: 1 + hard: False + restitution: 0 + friction: 0.4 +- proto: DoorCosmicCult + entities: + - uid: 112 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,-5.5 + parent: 1 + - uid: 113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-4.5 + parent: 1 +- proto: FloorCosmicDecay + entities: + - uid: 69 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-14.5 + parent: 1 + - uid: 76 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-10.5 + parent: 1 + - uid: 77 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-11.5 + parent: 1 + - uid: 79 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-1.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-0.5 + parent: 1 + - uid: 81 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-0.5 + parent: 1 + - uid: 82 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 + - uid: 83 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-6.5 + parent: 1 + - uid: 84 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-8.5 + parent: 1 + - uid: 85 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-8.5 + parent: 1 + - uid: 86 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-7.5 + parent: 1 + - uid: 87 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-8.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-8.5 + parent: 1 + - uid: 89 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-7.5 + parent: 1 +- proto: Grille + entities: + - uid: 42 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,1.5 + parent: 1 + - uid: 43 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,2.5 + parent: 1 + - uid: 44 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,3.5 + parent: 1 + - uid: 45 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,3.5 + parent: 1 +- proto: PlushieCosmicCult + entities: + - uid: 154 + components: + - type: Transform + pos: 4.736149,-9.27223 + parent: 1 +- proto: RustedThruster + entities: + - uid: 2 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-0.5 + parent: 1 + - uid: 19 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,1.5 + parent: 1 + - uid: 52 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-11.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-14.5 + parent: 1 + - uid: 60 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-15.5 + parent: 1 + - uid: 61 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-14.5 + parent: 1 +- proto: ShuttleWindow + entities: + - uid: 38 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,3.5 + parent: 1 + - uid: 39 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,3.5 + parent: 1 + - uid: 40 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,2.5 + parent: 1 + - uid: 41 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,1.5 + parent: 1 +- proto: Table + entities: + - uid: 152 + components: + - type: Transform + pos: 4.5,-9.5 + parent: 1 +- proto: WallCosmicCult + entities: + - uid: 90 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-8.5 + parent: 1 + - uid: 140 + components: + - type: Transform + pos: 5.5,-4.5 + parent: 1 + - uid: 141 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 + - uid: 142 + components: + - type: Transform + pos: 6.5,-5.5 + parent: 1 + - uid: 143 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 144 + components: + - type: Transform + pos: 5.5,-9.5 + parent: 1 + - uid: 145 + components: + - type: Transform + pos: 5.5,-10.5 + parent: 1 + - uid: 146 + components: + - type: Transform + pos: 4.5,-10.5 + parent: 1 + - uid: 147 + components: + - type: Transform + pos: 3.5,-10.5 + parent: 1 + - uid: 148 + components: + - type: Transform + pos: 3.5,-9.5 + parent: 1 + - uid: 149 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-4.5 + parent: 1 +- proto: WallCosmicCultTrimmed + entities: + - uid: 5 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - uid: 15 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,0.5 + parent: 1 + - uid: 91 + components: + - type: Transform + pos: 10.5,-7.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: 11.5,-7.5 + parent: 1 + - uid: 105 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 106 + components: + - type: Transform + pos: 6.5,-4.5 + parent: 1 + - uid: 118 + components: + - type: Transform + pos: 3.5,-15.5 + parent: 1 + - uid: 127 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-2.5 + parent: 1 + - uid: 157 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,2.5 + parent: 1 +- proto: WallShuttle + entities: + - uid: 3 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 4 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 + - uid: 6 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,0.5 + parent: 1 + - uid: 7 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 8 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,2.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,2.5 + parent: 1 + - uid: 10 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 13 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,1.5 + parent: 1 + - uid: 14 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-0.5 + parent: 1 + - uid: 17 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-3.5 + parent: 1 + - uid: 30 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-7.5 + parent: 1 + - uid: 37 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-9.5 + parent: 1 + - uid: 47 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-10.5 + parent: 1 + - uid: 48 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-10.5 + parent: 1 + - uid: 49 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-11.5 + parent: 1 + - uid: 50 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-12.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-12.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-13.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-14.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-14.5 + parent: 1 + - uid: 57 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-14.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-15.5 + parent: 1 + - uid: 59 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-15.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-13.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-14.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-15.5 + parent: 1 + - uid: 66 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-15.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-15.5 + parent: 1 + - uid: 68 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-14.5 + parent: 1 + - uid: 70 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-4.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-3.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + - uid: 73 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 74 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,3.5 + parent: 1 + - uid: 75 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,2.5 + parent: 1 +- proto: WindowCosmicCult + entities: + - uid: 98 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-2.5 + parent: 1 + - uid: 99 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 100 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-2.5 + parent: 1 + - uid: 101 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-3.5 + parent: 1 + - uid: 102 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 139 + components: + - type: Transform + pos: 5.5,-3.5 + parent: 1 +- proto: WindowCosmicCultDiagonal + entities: + - uid: 103 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 104 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-2.5 + parent: 1 +... From 1d6b8fc5b0916d9179ca7abe0d1cf01783a2bbc7 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 00:14:52 +1300 Subject: [PATCH 06/40] Tools. Nuke. Medstuff. So many resprites, such little time. --- .../Objects/Devices/nuke.rsi/meta.json | 2 +- .../Devices/nuke.rsi/nuclearbomb_base.png | Bin 1324 -> 1303 bytes .../Devices/nuke.rsi/nuclearbomb_deployed.png | Bin 1328 -> 1269 bytes .../nuke.rsi/nuclearbomb_deployed_unlit.png | Bin 108 -> 211 bytes .../nuke.rsi/nuclearbomb_exploding.png | Bin 372 -> 484 bytes .../Devices/nuke.rsi/nuclearbomb_timing.png | Bin 113 -> 282 bytes .../Specific/Atmos/gasanalyzer.rsi/icon.png | Bin 487 -> 537 bytes .../Specific/Atmos/gasanalyzer.rsi/meta.json | 2 +- .../Atmos/gasanalyzer.rsi/working.png | Bin 1019 -> 925 bytes .../Medical/medical.rsi/bloodpack-blue.png | Bin 1530 -> 394 bytes .../Medical/medical.rsi/bloodpack-empty.png | Bin 1423 -> 349 bytes .../Medical/medical.rsi/bloodpack.png | Bin 1522 -> 390 bytes .../Medical/medical.rsi/brutepack.png | Bin 213 -> 709 bytes .../Specific/Medical/medical.rsi/gauze.png | Bin 339 -> 392 bytes .../Specific/Medical/medical.rsi/meta.json | 2 ++ .../Specific/Medical/medical.rsi/ointment.png | Bin 197 -> 593 bytes .../Objects/Tools/appraisal-tool.rsi/icon.png | Bin 231 -> 514 bytes .../Tools/appraisal-tool.rsi/meta.json | 2 +- .../Objects/Tools/drill.rsi/drill_bolt.png | Bin 886 -> 706 bytes .../Objects/Tools/drill.rsi/drill_screw.png | Bin 887 -> 695 bytes .../Objects/Tools/drill.rsi/meta.json | 2 +- .../Tools/flashlight.rsi/flashlight-on.png | Bin 538 -> 519 bytes .../flashlight.rsi/flashlight-overlay.png | Bin 361 -> 242 bytes .../Tools/flashlight.rsi/flashlight.png | Bin 492 -> 527 bytes .../Objects/Tools/flashlight.rsi/meta.json | 2 +- .../Objects/Tools/geiger.rsi/geiger_base.png | Bin 427 -> 443 bytes .../Tools/geiger.rsi/geiger_on_ext.png | Bin 228 -> 365 bytes .../Tools/geiger.rsi/geiger_on_high.png | Bin 176 -> 218 bytes .../Tools/geiger.rsi/geiger_on_idle.png | Bin 173 -> 199 bytes .../Tools/geiger.rsi/geiger_on_low.png | Bin 176 -> 211 bytes .../Tools/geiger.rsi/geiger_on_med.png | Bin 176 -> 216 bytes .../Objects/Tools/geiger.rsi/meta.json | 2 +- .../Tools/handheld_mass_scanner.rsi/icon.png | Bin 2357 -> 1077 bytes .../Tools/handheld_mass_scanner.rsi/meta.json | 2 +- .../handheld_mass_scanner.rsi/scanner.png | Bin 248 -> 268 bytes .../Tools/multitool.rsi/green-unlit.png | Bin 123 -> 140 bytes .../Objects/Tools/multitool.rsi/icon.png | Bin 359 -> 427 bytes .../Objects/Tools/multitool.rsi/meta.json | 2 +- .../Objects/Tools/multitool.rsi/red-unlit.png | Bin 117 -> 138 bytes .../Tools/multitool.rsi/yellow-unlit.png | Bin 121 -> 136 bytes .../Textures/Objects/Tools/rcd.rsi/icon.png | Bin 638 -> 935 bytes .../Textures/Objects/Tools/rcd.rsi/meta.json | 2 +- .../Objects/Tools/screwdriver.rsi/meta.json | 2 +- .../Tools/screwdriver.rsi/screwdriver-map.png | Bin 262 -> 319 bytes .../screwdriver-screwybits.png | Bin 152 -> 223 bytes .../Tools/screwdriver.rsi/screwdriver.png | Bin 227 -> 202 bytes .../Objects/Tools/seclite.rsi/meta.json | 2 +- .../Objects/Tools/seclite.rsi/seclite-on.png | Bin 287 -> 521 bytes .../Tools/seclite.rsi/seclite-overlay.png | Bin 121 -> 290 bytes .../Objects/Tools/seclite.rsi/seclite.png | Bin 286 -> 527 bytes .../Objects/Tools/t-ray.rsi/meta.json | 2 +- .../Objects/Tools/t-ray.rsi/tray-off.png | Bin 1394 -> 547 bytes .../Objects/Tools/t-ray.rsi/tray-on.png | Bin 1629 -> 758 bytes .../wirecutters.rsi/cutters-cutty-thingy.png | Bin 217 -> 291 bytes .../Tools/wirecutters.rsi/cutters-map.png | Bin 331 -> 375 bytes .../Objects/Tools/wirecutters.rsi/cutters.png | Bin 228 -> 229 bytes .../Objects/Tools/wirecutters.rsi/meta.json | 2 +- .../Structures/Furniture/chairs.rsi/meta.json | 2 +- 58 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json index 5ba8a2d753c..a09d3bb9560 100644 --- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github), nuclearbomb_gay by PJB3005", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github), nuclearbomb_gay by PJB3005. New sprite by AftrLite(Github).", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png index f0b41b5bf171fd70fee580db632b82b4d2c2d814..d33e9aa71c243300a633ec80a6415066d4a8de20 100644 GIT binary patch delta 1283 zcmV+e1^oJ~3YQ9yB!2;OQb$4nuFf3k000EhNklN1J^A=GQpwy^v;9Z(qr$l|RZIAD@}J_uEuyNj z6q~I|#cj4K9)GPd>HUiHb$Y&UMlLBV~evEzSp^?O;3Kes>&z z9nE_&E-S!pF{!p*Ms)fx*Kk!xfJ4@j&=K$kM|3CF21~{3))cU#c`pDPn%3Ysf0KIq zN}Y{X&#msq=@5C7By;%cjjEYGVPYT1XQp#*^3UKu9?7#$TD9TjlY z4}jFtP=75u9TMC7rL+M|t&C{FQq6?hEhhEk&F5!WyR(ce&kH-4J#uB;#6@P@Iu|(SK@$||Z>xr}J6(zMgga&I7 z?h{vZua}Vi?h%^2W_H^{7_3Dc7|MpB8M^uw^VrFK`29ZIXS#rH)o1ylr*YNQVzX7z z^3B_b=4x+%jsSpb_417GKviWaUs*?K>NHa;PqBX4EoEcbB)fq6x?1Y%YGErpo8o&T zJbwHjz#E+f?6!vhI5t#FSKnd){HuJl9qdXY ztsbhbmS`+N{yYh7avgz4AP$wK3(ml9dx)CcQUG3_8wI{EI9vJjU@@JaJtmeEGaSTSWb+E(lCK*Wg(kP@r3=vSV)gSwL~DKTRyE59QylHaZGMUNYQ;F6RL@cZl> zGx6W*XA={wvrW+*&84+5kIr*98GOAFWHvEDYhxZiUA)CQ+Z1Q7O{w^7V&X4tGT~Rl zp>2Q6P5-R^8eR>DwuyCXV;+}!;yV0NPn_1qJhb-OZy}pI;c5#29>{<2BY;PY=53h_ t7s9o2H@?$}o7;5+v?Ts%5y}4*@+T5_qXaeUF|Yst002ovPDHLkV1n2Nb=Cj? delta 1305 zcmV+!1?Kvf3ako{B!3BTNLh0L01m_e01m_fl`9S#000EuNklK#IBy1q~tV>Qds9nDPvfCFzB!mD3-TcIckj&TR zNg?2Bw$G<0<9`YxX4EB+#^&kKo4P)C*ePq(5Cqh~m%kqsPHJY_HAIN4e`o^6?DR13 zXx9J7G;$dMQj?h=5uyOSoc7G~zI)QkAC&~P^{=&KZ0t`y&a25r$LV_BxBohg$Ddjo z6?`KpSYj3=12H*?Wsf0|psaUR9Ks79Rq(kIoAR#woqtm}e*8#GaBcQvR9y#dF$asoI2^mzWs{C)NiVj&}{XK?7!71tF@Q} z2JCzAS;EKIGC7C6YchiY1Mfe4e-*Zu5Apu)9m?rA`}tq|xzKCDE3eM;`X^;5YApB{ z*{^Z}JvZ+J2~=0VF8A6_hY?u2s}+q;11Tpq;C~Qv*kWKrd@`DkGz7AJTdeKs_JsJ7 z5^T?N!u=dLXaw$XC<-MIcz(VGy|xJQ^krhck9FP}MJppwd^-cpZ4Ib@vmHf6+fntL zBr;bCQ0A(Ay>EsqfCo)t?&K#j_E-AR^4=W3o)cWI36z$WqP(OE_G{fC1n9gvZwBkv z>3_b9ZLB5mfq@H*zZ}B)hxMP*LQqTg&*wmBDl3CEWq>Y{Sl8 z1m+l#7flKvffI?k#&i5kYvrdtk*I6D#m9OD)VP~&nJ|tiWe>z6LCWAR;Mz2SVK&w( zkg^&a$l4->WUhjfISuK^(g2fHvCDQa@P9QBr{I_0`gp67piSA{)+7RXrj3w{%H6-a zVm*5f;K0G=03i4^P4|L&m2>cbYMrc&H{8b2f((p&H-ni)25Zm}(2}UEd|AvjwH$-q znj34;)pH%YW)%1H@S@@HOI)pyVdXRt817e&Utuo&CJXQzhTu0;5KzBPKWo-iUPA-fs2=vE161wEF&KAkdK}Fc67We0*}li>`#gcULddb`N8#ju`vv6YRDHd_IQ^#ctuMctX3=bcv9goo1=dV;(z!Vm(*Za zefYP`W>YSlqplz0;9BM?F24Ge=zp)45^#NN0aDt^|42vj85|sh-EI&6M-<7v@hO{S zN3K`Qk(6rvVwv7Y-T7MZm;}09_Bb=E5ji*{vs_kI21~Vt*H0fLlIeYDvpU#SVV0Db z%Mu`P?bu?mi2AM6v_6y&)m(2;320eTpJgHI=VRGQeOA1qRto%2ef|dfO%gdzf1-|B P00000NkvXXu0mjf)0lv> diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png index 4a01cf2d68fcba38e737bc652d4bc17c9199de74..2f47ba58e3e13e77db27403e161ee11ebeb13c45 100644 GIT binary patch delta 1236 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 delta 332 zcmV-S0ki((1M~urF@G*eL_t(&f$f-0Zp0uAMn9@K82j8LJx_8I_T0=}FsPGa!jD`z z5`NKa0@yEu;sAiLI*z?deh08IEdef`k^--4au-Vh@&Ulf_HV<=Uj^=x-z9DJPh$ee zZ#9t=G(BM}NNDzJ$Job{=fM&b5>kOjB~%4c-u-K896$t+fPca^B_M{2TUiHs#?=bg z1iJsg69g8Ae6T4`F$ZP(UUw6mY|T33Op*IDvwG~_jEy|`mrae004(Aw3nC@^eY&FzP+*w>pr~8Dlh=|YPYo{V2m-QNSW;lH3_p_ z;q~`PvRxGb(qy|rO~P!C5pcE}W6WZBKH&L)=L5zVW28Qy@U26rS)lN-Lqx@~ATa3= qIR$`ehsb#aA3H>D0e1*v{*Na`mRQ^7hGI?t0000CF(jk$?HNN}1_lo14Xpp?wR6f%3Ud%Px$(@8`@R9J=WmcL6IVHn3hmSBcP9D;&V z0+JItg%EKGcocg7LbV7wI7o@ubP^og+Tvgq5r+<~i0S0+6-2>7Q9@8ey(B{xI|!+A zS#k*1L2^d?!98azE!=lG?s=d4-uKJ%KJW8_4pQMR1SA5iQkA8z-yFBCfJnel{}t)cV?r_Q!JJxAXCZsV{Lg0)01%34e0iUvP^sTp zi${V?FAf7a*MEFs0kxt|p;D*3(m~hhFDHK9*8?LawW2QKdr}*=0-glKBSBI8F^Ee5 zpbfUej0J?7qSkf%ZwOEl9VFh~?F4E4L3j|oR(kDtB>1RPeaoUysk32}TYnG%q%&dX z9B4Rhv}QUJMoGZf&1PR47YDJyEWC0^@I(a__NWHt1(8&eBjqCm04d-1O zZ0E;bfbG>zjJzr06HmjBZ(iByO!(e4BX2UdY`U&Lc-RALzq>j5uG|_(R;k*Q@lwR+ zsSPK_$L<};jZrLtxCC&0FSzac29nE&4gBYy#|Nkl&uONvx<5Q=TE4yBa-fH>F-jc9t8o`R4Mj^lXm-uK<* zy?X&d{5MFl;z+XM@QSw@WK%km!@P)PM6Iznr&QIM*h9PzUVlC7bS6h!oOL0JwqdLU z5wnooY_=S7T1i%%imp2qUH7cbX3I&bD)ntpDJ20vw-_XgNk6@HowOY)KBrm9%8y9A{vYN z`VI#JMBaMf-jq_RN?NY(kYt5_GXg$)eq>`4LR3-)X(8|{p(4~|+sqDq2rq(de zX>zT_6L#ObDF0*M^e1nB?|r^mi~(aERe_*|=q2_tx;gj<+3hg`lV7zJNLgsu5pI>)BC6R-{oKVpe?T8 z^Mhr^0sD%{k3Za<=%lfrR6gLuk}0=t_r8~0k?ZDHxBYMQ&x0pAuYb&rWn9`BSN~uh zw}Na|>Hn?ejgudL_sssim1~0Z%i|}WHXAqk)&KMQqJ4Kw%n9DgR-aclyu$5wM?~E} zdi+<^?fe#%UsKmNeDblH!TwwH`|`A>Gfj$=4_tZ6do@q^b@(qKy_6uJPZwTYkyP?r z_f_{<2R??!;r~~ZEcdx#UzvGs#s1ji>utE}KdpXu-Y%+F%S(7~#pku`-0ROT+IJ&F zuBEU3>2=A)|H@?de|r98Zuj%OpL~8@$o+a$O>S>a*^|%VtKxrJKe&6&@=wjgZkq{3 z;oF_7=LEhrx>&b1^TpYf((QJWzRDjhlk%)v>unlcvM1x}_m@xl6~72Ofnps*OmI<3 zt=(6jY5$qA?e7_OiEqa82{+EyG$g_Wj-O(m)AIG_w%^H5nVAePs+HL(>~Y(F`}OC> z7gDvt|Ndv%^D+KpFu!%LbU*)R#;{*A`3>Hr+a1^tZ!NC?GOaXCOpUi-eh0;l$8#z`BDfDEuApd9b&dmxoSf)}Qo7plks;^WSv@e3anhrDBL Roy-6Pp00i_>zoo8n*g3Uy3_yw delta 998 zcmVv1=1y7>9p~YY{1EC9MP^6jEYKM;$6imKG^p zn&OgzTNj~7J18RPQpr#q#37(@5L>5GoI;@;nxU;FMJfsvf^9GkrPTfb=U^}7N=WYe z?k?|rZ{7#ON4PKdT<*>F(#!kf06`E0bBM(gRxF;d#P1L1b$?zoG(3jdjcD~w;pD%d zGI=nWw2sRa{5kmLcs?{dW>2v$M!K+_&!5xT81Xle7dE#nyV|jM!pdZ`RwkQuJTGi+ zS%b->@1I7lepi*US9mX#!p;7HhI0!$MSNIT007@U32p7SD}TBXt{!JzBmM@sItLVX zirCKQarw?&On=SHHk|wV#T>Tt%P6E$ZdUCI&VHqnur2?wQ>?qZw|@XrGqZTQvaGV& zw)QI(z?P@SN0D1xLVA4Eu`IW^gx)59BfY}SuT%iL^0~z&$5?Mp5ODM>9|2*&{^Xtg z6xQ1zVfPzZfZ8|Os+}H`-^c<`Lv{r0?(U+mudnHxpnnL9ztIt(>UVW9?#sr8D?#nD z+Sho6v)}clh~shvCs(8B>h5khw{mcRj^8Etc~Pp}{nd>)z2w^P5sN1RyBNmN@47;< zc*5$q)QLz>6aa9g`gy$0u70JHaHJ=S@_wl*0)XQBDh6)d zu8xtOD1W{m9jdI>lYi)C8fy=7)zLJ+)-Phu9{t6_+xq~3k%>vi*a~X>dzm%IXqsQE z0B_#k!1R+90Kn&u?;K+*2$TPLXP0ACMXLbi{ZjQ1q&Nb?+Q6qvl z0dn^1Y-qEuSb@BG@e6_=2!bF8g3z{b>(8h5OMgCq*f042Q~X@}^Qrxk4+y)Tdw)K) zU-ALOe#r+A`<1_j+Wqms{~pQON06=IwSJvtVf7oC5AZrCOn$BIXzKoaPG}W?x<8*2 zas&{gl@IWr8O$p;YoB_Cjbzq%0|`}3*&k`EyEd(HwhN`4rvJ#r0Jb*H?YL*1Xx z9V7AqoG~gNz!9x{fX*_ZK1v0k?$76l)?Ytjf`3Q>h>-#iqf`Jlz3)Nx=X1n}d;n*R z$Oj0Z@6YFoG5G+l77_CK@bE%5Crf113En- U@9zfit^fc407*qoM6N<$f}z&*q5uE@ diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-blue.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-blue.png index ae03304c2a893c1a96e52cc94ad03014e9731cf3..81e8ef745630909cb7b2fe8d0c9f0b27557c4549 100644 GIT binary patch delta 355 zcmV-p0i6E&3yK4fFn<9=NklkeiCgIQE-*P(LC;Pke8Hhw8e@sFVX|4Bi zV~q4QX_|`NoO4bxa75k=%!Z2HwZ2-*Pv*j_#ytR;&{uz{cntnY5XIfoF!ZMhJ_ z#qHB$uz}zS_+L^=xfeqT+X0}}xy8?a%z&MM-|??bz;;`fB{=6Ueuv&W(3f5l7y|kP zRvPD1U_F~5%Um)5A5XALaz6o98W@j;HPAH8mx)_V*ApN=K~)rUmt64f=<9|uz!(#Z zF<}p{&Q7~yQOvEDY9RO**h?xv`Z4sZNF?$vcn59AcfPlGj9>r&002ovPDHLkV1gZ- Br3C;0 literal 1530 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|_Dw42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#TlIr;f11&PVox=A^usW$o$wWwx5L{W{l(Z}Kn z8<5|vB7;(k^K(i;p>JnoW?};l5fo8GJV10rVAX*vimoFdBflgcn68R4lRfiFQi}?T zfN2b3Bh)_JD$vbBSRR^}Sz>1dH2_T*Nf%NaSveM!l;;;^hk)Y)Juq=9gc=43Sftbn z$qL{|0OkcdE*pJ#zOv)e(A>oY%)tLWT^vIqINyfY`ZGBS%yo6l?p1J4UN|?ZaqdZ1 z-j1cb*JiC?T|4nm+YN_5j8eU8+YZ$yD49xms)!s>Ze-#~SYTXN`1-8}-#Op5{(Wz^`C-P0{-+I357d`8@FX4h`BGDN>givh{VE5qef#DR;WS;sFnRCpy;Doe zave2Q_qDc4PZJhBr2F8{o1S}1gN&2|xmd+`&VRWg@@}tPe2~kL4U9{Vx2<~h{OP5V zqGL~)oWwUy3gB|NS~pAo`!?}_d07u?-!fi$+7Zp5$dWCuJyp+O?UY)P2kTk3L~5Ft zeJfo3HO{|ZweQQ;6Nl7-&SXhe>WDQLSn$l!7U(~2c+I(bQ9#6b-31{!FIZldNNu{Q zSgcW|+->bGX@K?!>c)1FF@|`s`2HVehir+S=st zlmo^u8xBt`6~1%utLT)~^9|xP4}Uz#X|DI3XM;J5bYsw0W;6XB+eEcfBJ;X2l4<}>!{GegrX6D&Vm=c{2X*tm=#^-tnlP`T^r L>gTe~DWM4fv8o#q diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-empty.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack-empty.png index 87143528ccb23ee4b79fe149bf4b9d2a682828f5..3a9f5eaf01f99c980d2ddadef22750edde656413 100644 GIT binary patch delta 310 zcmV-60m=T43*7>cFn<9TNklb^l5Ji8YT)?$^7nTpf5op4BI1k%!1P)RRh&Fl7dGDRX#HU1@h<3%<6cIsdy?=W}hYYa5nRSe41^{51 zrtdrA7wLY@9bj>#6pS%t%8fB4-ZOU#aR=%r>72WYQbZj9usJzXub*asJ5Znar5)hY zT5F+{D)BEIo`Itr>cAO@IzU915JGus*4j<}DF#wX0DyU(ABw~nOMMH?SCCRdj1e)$ zB2-7II3WBFtS{^8#&JYS3Af_1ECy)*4~U15MfPH+)A^VD0P&rmi#vr;YybcN07*qo IM6N<$f>UpdVgLXD literal 1423 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|=rG42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#TlIr;f11&PVoMX4z^`Vf_xyBOoKcBp;ZniZYWu^GZ^S3W|U! z3}PeHKHMtM%|cinnwME(X9P6>O&CcRQVdx+7L}Ce7iEWlV*@oPaVmov1qoK9lnTiP z;3xp*13NAoeR!U-<7!Z`6ai-58J;eVArYK!LmmB^9Yp?0d=*G_-s60?{Axv$+<_Z; z4bmC`woby{8`&SQ+{(Lg*_2yo)`O;dOc(5DDsEYNAU#!S@`3q3jsNdGKAVx@*EQ=4 z)*tT6PS_=}A#UxbCj}Z_PY*K4Ex+s+u|!G5Ev$aKF<05Wo$`EZbuwuqc$x@59e<-q3)OSj%<>RXpNEAjTWsi~4LcEuIET6OECt^&8i z>0OgVv%F<5iFKUUy_PQH;vzHc`OlJM1x}60cRuFt?}$Ai*k4lgY}v^=4$nyvn{=X= z3o^$0Om68kee!Kzgn{C@qLYu>b2odiz2dH7uVVk##B8r&-1f+SdW$8fF!Xfwb6Mw< G&;$VEFY40( diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/bloodpack.png index 6a667099191a21fa7aa0ec11969125110f68f0f5..5f2d73de06c426a380d6e63a23c0a0d26c72ad28 100644 GIT binary patch delta 351 zcmV-l0igc!3x)%bFn<9+Nkl`Fz z(liyPYtA_-z$MA$ZCn&ZucozDLqR4BV69bdM!p1Lqt+Xf;s@8cXEfn{;>eA1OADBwFB<7Wm$rA-s*Q4Jp*GI)qyD>cfcF~ z+~#=M?2u&{fLPBfIOQpw!5o13)B&2NX+xMiC;KUouV5+V+I{n6Sbg7Q0T^R~F(%y4 xub+o?DdpOEsR4ptf!hR9DqlnY6^TUt1s|)bdliAEg9-ou002ovPDHLkV1lciqo)7> literal 1522 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|_Dw42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#TlIr;f11&PVox=A^usW$o$wWwx5L{W{l(Z}Kn z8<5|vB7;(k^K(i;p>JnoW?};l5fo8GJV10rVAX*vimoFdBflgcn68R4lRfiFQi}?T zfN2b3Bh)_JD$vbBSRR^}Sz>1dH2_T*Nf%NaSveM!l;;;^hk)Y)Juq=9gc=43Sftbn z$qL{|0OkcdE*pJ#zOv)e(A>oY%)sA0T^vIqINyf&dNVmn)E&3;Ym{(igkS${tF+2-?^b4(Uz3l9`N*l+F7X1JiDBExK!Z}!VQ=h>q--Ux^Y>YgAGxqkh+ zknXuMfVUy-BzfVv73tsLscL@CP(B7z!QRGFl#FIm{=DE!;H_iNA>gC0tB=9R`9xt2Q z`Fl)vzj_sK-g;^E1e@7soowXToj9HpS&A9You}bFF~L2;;qk&e$1p9?6=AC<_$^nQ z>Eom#l&G{J;X_pvcaGH~cY}++pI!JCwDO2!-T9p-?S&HAe_3pe>U|q=z4Tebs#Q8! zv##k+>^j6$@O=AZ;|p)gJ{~{p!KPftZ~kDK(($B+$`v_VKTKyouHC&M{@MWpo({Lg zZ(J8FPGGnf&k!NY$6=Ppxa08lGU;=gA0ib#Fwff&^QGz3eU^vH4sKVyAH06{S<2_t ziB;|L!Y7xoY%xm~EG0@0gd51(YUu*y97e8k+GJ-Jhax!~=auStvKgBw0a z95?JyisWy-;n{NSTErcW_DC7l>CG=K9#|L@vD-0r{+s<=MLlW>sJ!)b^>bP0l+XkK DMxq-h diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png index 1bd215195f0ebc1bb5d8df8f0fc4c0ad3685f53c..b782305b07988ef9ba22c804ab8ac66b7371a337 100644 GIT binary patch delta 697 zcmV;q0!IDS0mTK77=H)`0001UdV2H#0004VQb$4nuFf3k0007iNklaym*%Zz}?)BZ>d+D9&*8G-y-*>9<2bAM%-k$Yqx;{*rEmy&fcX+`VIBbhU>aRiOPVJ>m5gIy`v>u} zu_%{E|GI_IBA5c)iGpxwL2EBxd-xBZKL+MA#ODg|Q~aQHmwxYgo_~ID2OF7b>-4Q< zK~>fM9k4;Soqre4#-g6*^4KWkR006d)7voH9r8?n|HJ|y_!2NE?Ba4Nfu7!mC@Vm* z0^oo>V53#rS3Z6*!iW4wi|+Sv`v9lvmv%VA!bcavAS*YWMiea+uaOknc-IS;2yk6G!^x$1!rQUCw|0d!JMQvg8b*k%9#0A)!;K~yM_V_+ESfKdQVK*$hPgwaUZ z5LLj%$rwe6V5o}{ihyWXh$D)Q(6rP*2KELdBf>%j7|ILa0zSejuAu_#(-B&Pl}sFw z6)-RgD;YAhqnIj;?sP_m_UR3%LhbEn0`vs{fj|zyK0X0^00000NkvXXu0mjf-3Ly6 diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/gauze.png index 49a1d598408f6aebebc97bc69e2b3f0423b8c382..015977a28d88b21676bddc81705c82584bec2be7 100644 GIT binary patch delta 352 zcmV-m0iXWU0*C{UF@HiyL_t(oh3%BTPQp+Whd+$Z(F6vPE;(%B|zdnEvUV3?Tp_RWcKTei|W(GP=KXu&!>(z!hi2xY+W9)V_ClA8~Ez3p*tvU}! zcY&0*ESrbnJtKdtlpoGRnJ}fcVau{}&no%;6@JbPT@dXONI@7bviGh#P|8)vIVlRF z?7-*ptpTJ`Dp`?X;v^zYqO3cr5OR2D(|O_dqifW0`nf&+9V~|sUiQz;?R8EbZFkJ3 ybAsTx&{g{^SA~&5bn-t%2ru35jKN?qsQ3b_`HMvrBC6p40000s3R7i8tWxSXHo84RfkfFXW8-{45!_qSIRFd+yvK4e7POTjLLmgw z9@4nvjvNVBu#>ll^K)n}ghtx?T^e2Tg@bqRe*E6&zVE%?4}TU~=szna39eRZ+EA%W zV}@>@_q*>x=e;Ree0gP+QZajJT)Wc)&|x7$0|0oAjpx`T)0rudcBhBu*phTIfWgq6 zg1M-n+y86qwE$S%Rt(Ulp-84P0MtJn1Mu?UoiV^*=mxQ&bR#tCggnQlRLm03o5b@b zrDAsMh-7gwfPd9(#SE2VePaz}CQyaZVe<&$Gc6$D`~2z0pj z5znz%8of99#?bAvys|3JC8}D5Tv-F$yZ>OyYD1;?`hVp!AghLA2TVf&@Z#08@xdz< zvosqYFbyT%0cXUaIyXX0004WQchC(T|iJkNdZ-bv1<~l5|c0$ z6eUcqNiI$(0%7VU<;Y5ylHAM7QIx2;l$W@mC`kvZ2trl@G%iCG#b%}yr!Z8vsi~ql jjVTRP0Rw{)!%zbN_P!2Ov|mL?00000NkvXXu0mjfC0|6S diff --git a/Resources/Textures/Objects/Tools/appraisal-tool.rsi/icon.png b/Resources/Textures/Objects/Tools/appraisal-tool.rsi/icon.png index d6c31c488911d92a91148fb28315447bf0d3baac..1d9845477c721de08066eaf0d7c7afe5072c0faa 100644 GIT binary patch delta 500 zcmVlgamE<1=SR^1r04KG&dwP6bfMoK^PIFfuisT zB5)`}k{awb_@g9B-!+ineWuI3@0|0!=brZk9UYzjMmQY)wtt>q@Q9`eC>K8roeNnJ zMy&xZm#eC{-DU;AZnH{tqUEQ9`2~+q)jI$jtxo`q54AJByavFTe+OT@cpkmHW^rY? z6zLIx1FxZB0RS6Yo7`Sqad)&|Dc(Ig1;B{Y&9<}non?58^<6(@!CLrHKV-T8d4SwP+Gvf5{bqxFf4H#1Ni%tR*7Xipo7Odf!6GOnrpngol;BWl5jqV&t8kQeavrfr>FmWGN$4Iii_L;;}!)=39| zka-5FC-_Sm5}=sgD>f~Q)Z_x}F3pG$r<-KS5o4(wiA-MeuP8kOzIY4DOBxs`IiQ(r q;Z<`U=?=iBCzO%(0v#Qlrt$%62BbLl*Q+l80000gy$(hcwlaXoP0!1X!8hK7cr!NFRZnl4UGl9H0{?(PcO z4ssesHa0feT3VTznI0Y7N>a8W~H1{DK)Ap4~_Taxy$!978lFCMQTdap34Z zpYf(aYeCYhmP6q|T!n>&o(-R8_B1=4^>!9y%2~EBVAVp$ERU!l=gXHaO%>3RxDjKc zwqdCv=Y}=63>lA#J)gl6!Wgb1eZVTGf8nmlswOO<4brgBl#u= PXeooItDnm{r-UW|kb_ET diff --git a/Resources/Textures/Objects/Tools/appraisal-tool.rsi/meta.json b/Resources/Textures/Objects/Tools/appraisal-tool.rsi/meta.json index 3a6e8e9d8e9..175e1182b02 100644 --- a/Resources/Textures/Objects/Tools/appraisal-tool.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/appraisal-tool.rsi/meta.json @@ -1,5 +1,5 @@ { - "copyright" : "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/device.dmi state export_scanner at commit 7544e865d0771d9bd917461e9da16d301fe40fc3. In-hand sprites made by obscenelytinyshark for use in SS14.", + "copyright" : "New sprite by AftrLite(Github). In-hand sprites made by obscenelytinyshark for use in SS14.", "license" : "CC-BY-SA-3.0", "size" : { "x" : 32, diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png index 6fb3b4ab8e659efb01b14ea9eeced1fc55ef8f2c..df94cdc4e80e0d9f0865921aca912fb949bd4a40 100644 GIT binary patch delta 670 zcmV;P0%8632Eql9FnO=MEKuLm(|e6rDowKxmC^xO8YFB;^JraG>YVe#hm!w)dyv z(r5YZ?!9}T=id9?=UzC+e}*JUlCK9cQ;*E$xmIAp*+o?XFn>)GfQVO8ah%I4q?M0> z$ory06qhiC2!Mz^xmwxiDTj#VvI^81bK-2aB&<~ncKvdx*$Z`^BS!guV0#-M-dW^`o z6WTE`F=57HF$M;cEYG!27Uuc!t;CDhH_)^_^n<3`XMe>mz>^amhiJF%vo8To95-N;$_Dk}=~Ky_ z{{_zi#57dW4cGW?vqMAQ^P0|ruZbuu>~Al8;1?W!0Ik~vuY$8u=>Px#07*qoM6N<$ Ef^mI7Bme*a delta 851 zcmV-Z1FZbQ1@;DzFnInD(2OxQts!k}GcG1G$z&$U z#4L2-x4Gw@Iro0woO|vA{^LLXGK5Bg`}_OV(>oqDOmh6na(`7Gj}ube_WS)D9r9X( z@>4bE2oY1OiSU#Y0LZc|loR{?ek4gE9*+a?>-(L0nk_hTR3L=gR)hy&aB#5Pr|Q0N zI7~DerK_upa5xM=!LR8Zy57g=#R*eeiP1|Fph8}7b2zYUE5ZXHNs{3R1Oj9-86-(U zQ4|1XW@Ze#@PD(EFx@Wqm7_3U@-O1zVAnFCVY3KNDwSe#a?&&~m&-9eHin`oh@!~1 zA~`@|4vSrwgOPJjtpdtoQ*)5Xx=FoRHpO@VlF6juh(scQw)W|C8i3y3USe_W6Iz3^t1q=`+pOO1Oo#DOigK(K7R65u}Vs4 zS*f*O(k0)9j$&WX{{G!()j|#q&Vh0v05|u4w8U)RqP6$c8w7(v0MhBS5&J%cEjc(i z2P!l2KBY}Mw_77S)Bb|!J1sWqiyGu!uh)pJM(#*JrI6`jzklhO3b1ucDJGmyOk-*h z>u@<0P=5`353R(v4Sd_Qz9@=xbaaqNB&e(}J2=ijC1hC^Lc?wq+-%xftis9KW9-mW z21Z^Tqwm`GW~OL<34o?VG$lZmWx?n30dVSe0D#bi2%;zgII4p`u7OJ28+yXJ%@V9n z61o7hAL4Xh-B@>=qX&srZ1(8hD6np`gsZ)UrGLdw#;mT~dS*YwdGuHtT5U_#6%ZPB zs|Wga*?w~^CCTT$*iNce*bnb6HGUM|I^kA#?s3t+23EJisuozt*WKDC6jXui0%WrA z^11ags#^nDMWuBCR;5WT~U1=C8HLw5x002ovPDHLkV1n+6nj`=K diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png index c51ae6332b212cb66cd2b9d58ffe841152d0d747..24691f6fc5d85d0e49e8d8007980a77c3f7fe141 100644 GIT binary patch delta 659 zcmV;E0&M;F2Db%}Fn~qdD@2t~ zj?6vYN%HFm4PqpKW}JvCL~qKJk5os-Mk%RP@*tkP`YfFSF#f607~oz!ruX|JR~!S> zKE9){+tuH7fcfx(NW>Km%N5k>A#(UOhvf?28chJoN2=bw`*Y7Rz@RLhfwPp(1;`{D zea}ISIkD`@Gr*zn>z=6iO6;)G%6Sj3ZKu% z_(X_IvVoFX<;T|oFW=lkRqM3BpO|ecMgUh)(CKsl7=NE|K8LFn0GOSf6#zHn`?gl$ zTvh;}*=$NZ0K}-VX7acN&{W!cFQsz6q37wxYny)T%t*NqnIM z#q1U$nTW^D(sr@V0u15ADF;qQjlE)NBi2P-hhwh21XIsil$TgZF}E0IeD-w7aI? tD<>^#?Yh1uos%^ax>0(fl;B6z_h^Vzgu~6D7 z-l4V@Z@6^bT@_tO1^o$L7a~O(NUY$-Si2~c3L;`9A-eEJg7z3=Z5!IgHsfMC(`06n zOw2+TzMFH-%zM7?nKS1G|Mg#gSyDOXj*brX^o~bmCpmt3v43EmDkn+xx}qo??eE6p0XI0PzWBsYiK7i}S2dh(v09$H&l@pwEmG&JDz`4B=N zgkW@Z)Tn1?RDZHF8icttD?6=uv(qZ`lP(T6La@)BXRZQBCXDB;PFNd8z?y~^gKOSacQmg-%hBuKc=L7k_py2XoZhvl80TPJ>ot>Qw4{I}h@Z_r; zR87?@wem}9`PqiLrM9Gf{kzYqC3#T*I}m^y`#)Md+qY=tJ@q<)KmdSLDrI=zC$UWq z4)%ei-(!HhPijG@c5BJbcwP{Fr+K6PsFB?3^%~wn$sGZhK}MF^9SdVBz}79xo^V3s z^(mHEmw(GCKq2itv=aX|@Nd)FvMf_qS4Sd|Fh;GI9FKrmp-@QD*0h^VTbE|xv-0Cq zGy?svj?s2?dnF+%{{=ur5ETK0LLtfT_XBY1RyzQ}-UzZR12~!oe>?}wy4(GPb(?*# zeu7{xOn!*dbY)}7evU3A<^v>GO&cZFZT8{vRDZKD|H+8znqAN2hd7TOYh4R1$&vuU zKDTdrkbJZoTe4Xmn$xlGBWou{lSk)DH} zX?XeEdKi_Q18JdBGY2bbAX8RqT`Kc)ke;@GTNI%GYZGhJYmHf5Utj-62!TQEfU2#n zWlecAcK`qoi^UK^Fm&m4-gAA~IhB4undNvHS~nYE>nm4|?gRQ=pb~k#UgJb93qXgc e6u>U|KcU}Fxn=bu4hl8^0000Px$!AV3xR9J=Wl))q0Ln&kSN4V!Ww$s8n|2#>n7z=BgZ3=#ILz#?*)_kh zR!-(~nb&)7-tYVS{oeaQKtRBMCnO748yf%&q|Pn3Kis_nz<>RKA^o?mg`N75dXjs4 z`h;yNQ2++BR0%5^$*Mdzc|9kDL$&z21h@;eDz@Dcw}p(4b^!2nm?5v{q#H1msK_1M z$HF;%Ujc2~I~G79kr2L^Q=}GCSwLO%jse7+?^UKq*+>e%RKRKE*t$80F|zdJr;)2n zk&;#*9?6h8@qa#nTC(a?D0G+h7tp_a#{1no01vlWz`g=)|61g{q}KuH9NQwV=g6v4 zKWKTQ5pl;pZ=*yVGCN>y(Y2 kh6OY-ssRB30Rex?Cm|Y@@y_J}0RR9107*qoM6N<$g2hwl3DcdP&J8X2+!a5AD4M7 z_$;%xw+GV)4<3YDj_k|XH4;c6_?Ur#K>|g8YRl>Wu#h0j0e{EAo;EHqp>DJf+ZoiEPy6NkmdVsD1hZYzI};e8M-5o0myO& z93>%91rY<&aYkv=TCAlRK8r`eC>RB!U=$Dp3=9ka&3U-bdk+!!00000NkvXXu0mjf D3f|@J diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight-overlay.png b/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight-overlay.png index e00af6680d86f291d3e3a11d5844373c8ddd94d5..5df2097a1d1f3f3b34d9245fe0fbcae25b0bbb28 100644 GIT binary patch delta 215 zcmV;|04V?I0`dWnBYyw^b5ch_0Itp)=>Px#tVu*cR9J=W(jgAQFc^m6mzF>_g+<~J z2#^SFfa3@#?tt8Nu!NvU5Xe~!*xg_xOS)njGSd>8CYb+8e$h5x`-y@OLWn=>#f0>J zssQZ-g| z7?4u1U|?W40p>y25ODtROosCeYy>R_0fLF}`?mw&Xn+NOY`hBNiN}@<&mUc25SP^l zt9$tv)uAx)dq{_JD09Gp0|yxF?d{AIE hM!_f;Sir!*001KFVyfucrwRZ7002ovPDHLkV1lVKmqh>o diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight.png b/Resources/Textures/Objects/Tools/flashlight.rsi/flashlight.png index b2a0eaa270b8955306cfd8cfa572db5d319cd24b..aeed43ae358d793a5b8d392cedcf0d77d3938b3c 100644 GIT binary patch delta 502 zcmV1CIodBYyw^b5ch_0Itp)=>Px$$w@>(R9J=Wl)p4ouFX9rGdb87H1_0c0wTCfpC?A;ViDZGTjw|f(ghSqS<1@-WHq2khPHf z0g|=YWY~=}#vg?s`)T&^-rG0dnR#y@A|fKG529!8XGt@R#$XRPV2%qJ~1kW%{sXUWQ>~c*6~kdbw$V3Qp_f@ zv~5#434pRml>+{r|5Fyzt3Lt12ULp$#f<#%^aj=)z;EH>0$LXa`C^XVwH+$dw>nH^ zQV$k(wXzsd;S1QoSl{Y|@}vTOXOpp+y=v%Ad)GF}v@H8|#8rWt&2O)IZe{eX&huZw sV5fH*I}9B8WITnJj%q|iM8x~%9`hfR#AQ{44*&oF07*qoM6N<$f+uh8)c^nh delta 467 zcmV;^0WAKH1ndKlBYy$2NklMli;ehn@WXCUF!XdFZ|G_*LhNDe`UG{i{}6mfJ8S&5tC#d~`C9`{RIdp~g8bI@ArA1 z_qi7g27~eM@i-Mg&F3xs{-UgI?H=0BYrNfoi*9T7bF~O%&ws1wcr4cQPI>~gI1$nx z`dhaN>xnG*%bset-jt(SF4un-3PW*vmrtoWRlzzCF;3s8K-DYpw*)ANxIeIrz+xQe ze1QwCX#!*f5z))8@0`TB=$zpQtZ?oDwZCDW=QSgf$w0jJArPDg7fX$o`Sd6Ws~&Kz z01;28)0!=c;(s6s0IwCx@vWccc!>>gtN_PxLvfu_sWhwvq0{Y|=3R8pwfAXq2Upcm zV>BO+OnR;r2#3QapCm~D67U6=@cpS6VzUc8az%* zLChQix)p;%|BIUhCrdX+2iHQS=p;CGa1yc?Mny@KvwOp&A+002*fV7)1{infkTrW5qrR3%9RtT)AG8)~`^)*FJE zO7;e{iiS}TY>fk7*&6`jFWzLEso$_ieZlFJFbaaiaylg`1EdP{-36MW2&Yp{oDsOfrKeoIzGq5`dk4*=`Kw+&=w2AHY9u;Tu& z4ws$&71Aw;r+y9~p8i(D2NQH1atqQhtaA2$!sdAqM<>l4`B!uYGy|lo^TIfe%=%$! z-u0Jw^FB$MQY~=(<<4gcB)6P%++AHpY5Ciy=Ynn9(i&!Ra{edZX^(^4BTJdh00000 LNkvXXu0mjfCX2zg delta 401 zcmV;C0dD@g1FHj&B!3BTNLh0L01m_e01m_fl`9S#00049NklVz0qp{iB!2;OQb$4nuFf3k0003eNklSYI&;>n8sSL0BKpXn59zVYaP21P%KG-V@}xfnl<64Z@WnhI>$7@cY5S zJ>#DHaaMK#BBKA!l59G)0u{NwUO&9O;7Tn;y*4C=U+(O}JAc^LwWfLoo}eTli~~fj zkGyG-R-d)JX%V?T&@D~dnFj!X)Ef;ZkX9cdBt+lsVslTW-bkPZ}u5UgGKN%KnU# zMaak^B-`c%P^i$;#W5t~-rMWGTn!2WZ4U*T^d3kuDZj55SbV~G2fyNmT6^wxjgIe; zbq4axyCek}4jlJ+>+mvVhiX6op=iuKvGc}CMG@7dOH`sC+oMxemdKI;Vst08yw#6d{un726if7^SIKR*dTMD*_(&7pI%%hpJlZ|{gP zPpYhq=JLz7$KkXuyGM8eFJw)L>H^jXd`xg*+4-1YjR5mh8#h;9005kHs~2$LTS7zi sZ$o>`PP#Jtm~fr%sw^TRBBG!B0F8+xtyeF=-2eap07*qoM6N<$g1+=sod5s; delta 148 zcmcb`xPftkNPZ}u5UgGKN%KnU# zMMzijYJ`#oP{`KP#W5t}aB_kK>*55Fo~A&9ON`2vv;M6%{Bzvkg;-_U#tDmGTJ7c# pyJ)`nq9vExK@FHf2QdZ)6FHVAC4m!od4VP|c)I$ztaD0e0sy?mFOdKM diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png index 6c83622e3499372750fe4422db2b3c96b105af87..2aca4e8fe7a573bf6e36885f4c8ae276c3920352 100644 GIT binary patch delta 171 zcmV;c096020mlK5B!2;OQb$4nuFf3k0001iNkl6!|r{TQN(ud zyUc(bA~baX0|Ntts}pJnz#Ksr2Rv;)!?>G);Xk_NPn*e010R9; Z4glgMAe!-77f=8I002ovPDHLkV1nt@L{b0% delta 145 zcmX@kxR!B(NPZ}u5UgGKN%KnU# zMM&9%k0tmrP{_*D#W5t}@Y{=qybKBg%nlv~4Y4c>1mtzz^fPRW-zhzNi?=u9gL2cW sU4ri~`Q&c(S-Jjm%I%p944&dA6j{$Tsh!x&z`zCMy85}Sb4q9e0OKz&;Q#;t diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png index 015059c73086a48fdeb54267325ebdd96b2e5d4b..8814f0620e412cea3b0faa41319feef7536b86bf 100644 GIT binary patch delta 183 zcmdnMc$sm6NGZx^prw85kIPJzX3_B3hFZBv=^jELD5BiUjGVT-JFo?z~w&h!&ThLK^ zyRgmCHN2xS@hp2#uku|+9w3O3Q`1mnC}y#2NMZN5dOx|w;Mjo=@^_0?{;Ez{+8AiS h<#td5YBwW0gFds;^2TLi4}dOX@O1TaS?83{1OVT)NG$*W delta 148 zcmcc2xPftkNPZ}u5UgGKN%KnU# zMMy<&kGf4BP{`KP#W5t}@Y{p_eCCcKA%CNX%r`njxgN@xNA*Sj!@ diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png index c88de643eb4ea1034032af998a560bd16f27aad9..2ecc34916f9222408d934286e8da624169d48ec3 100644 GIT binary patch delta 188 zcmdnMc!P0*NGZx^prw85kHQdAc};M6@O+NU$zW5b0@}$R}~~;uY1CpW}mr z1zopr0L))c&j0`b delta 148 zcmcb?xPftkNPZ}u5UgGKN%KnU# zMMzbsE4Xk4P{`KP#W5t}aB_kK>*55Fo~A&9ON`2vv;O6${pe4epkJA`al+!4$Gj7D q7UjDyE(R;$ayzI2RNbJ%z|ixL^>|Zc6mK%nBnD4cKbLh*2~7a{OfhNz diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json index 10968b47768..87537b88d5d 100644 --- a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from wallening at https://github.com/wall-nerds/wallening/commit/cff5df2e3d45a18afe5619a8c130e1ba50ab4ef5.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/icon.png b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/icon.png index 2aea25dd6848b53dc086cecd6ac89bd63d65572d..6d9faa9416d13e40d0848e442c0866f2b1e85765 100644 GIT binary patch delta 1049 zcmV+!1m^p-6151B83+ad0047(di0SY7Jrd_kvmAkP!xv$rbGY| zs#pXIrLEAagUL-_(4-+rad8w}3l2UOs}3&Cx;nTDg5U$h(aA~CMM^w3DYS_3z~O%U z_xy)*&jo}=g{fxO1fXh`k&4H}Y;IKyyuybOC+8$)>WTDX2A=VCPn8sR5#GzY?tjnd zQ}QMQd?Im_>4rtTK|Hf*>74h8L#!kz#OK801`SC3$aUG}H_kQ4cWK#3QA!4!E z!Ey()lA#h$6NeR5qy9qHWrgz=XSGsetvUG%gL!Qw&2`FQ#Ib|~k`N)IhB7L!5TR2e z#YBqkV;=q?$DbsZOs+B*ITlcb3V+G*ga5(r-I|4|Nw-rl26VsJ_Qxm?*aez(+x|Yb z?dA#Ke+I6!w!hi{WoO54hX`2A_1vkQ~WRDHIC8`x$*x4j8xv zde_{&weE5H0Ay%a%QwKmAuv{?-s>Lk?&;jyzcsD>{Q$jJa>Y!KDiHtx0)K2tL_t(o zh3%HhOB+!X#(!zMXfcrl`Y87|5!A<=m zx+$havXp`@YEl!5Gmcm$)8hlQ;Z7!v)jK7jn|zy@d(X!?-#zEt2XyhD;gca{ zvsveVX>p+rP&utRbHQFe0DrGuziIN9NF*-weMLrqJ9s>%5>)~e&8jmm#!HI}^*=?l zO@Ih)T4hYDOzEWJ*i0)3Ks=^;79lO5a$3W*$`tmGSYBOg2{1Q1(^8tY3ILo{&&|%% zMcv&&-C1e7fMBnmcubYzdMSexDf!@D{l&8w>8(SQaEPc9XyFviDu1R`MhS90wo+`dTR1aTXY28z5hs52{1i1$;$c$JNd$eK0OIAtuia?8|QMON`TpyZy6pO zkn$-lK}RZRLdLDU00D8(i1dS95)r&~QXy0MO0Kls83AsHl^eR=H19P7QcWmU z)N>pr{^)AM@ck1H?_O{4KKRM_>-O>e+oZP+F|D#Qc7JoFZO^;F^GPUz zfx9FPbfgECSJ!;@i)XyWCaz{t7Oy?v=~XPAUFV_y=MeMj^FEM!6?f4^7rz0gLk91; TLAA920000Ppt8JXAf zs;AesH#J4?8qs~YPiT;Tm+>z0A>N4mz;)_%l*vD;6jq-`Ai)pL&?tibz!+jDK|lB&sB+f!Rk?A*a# zZoGrO#7v}YkmT8k2>F>8GDcu`Yrf}{n3Ev`l(8bR_4;!#0t045p)AtmC*E_~93p^D_j z7O+0j7cB<$N?D5zs#?keVoQU_Nm#+dW76~EJXBDDDWGvR95MK~8%qfD@ZAa%7@B~X z4Q{N)=SPb*9iWVjv5|O5Txq5-D1xH-x+L?Jp3)%^_~pjxO*6_9L@XAw#b}$RhX^~z zaRf;b6oo?sZY++NLL846GX_P5WIVtSbtP&lS_HLZg`n1Cx-po?V1jDY=Nnd!7(;!4 z9UG@W8AQw(NxCEsbE8dqI8lWp z5+Dpz2s7Yl_Ti!Cczyn1v{iLTQKJb4?C>zkROEkpb4xzfKZ*2{gG1V|-Yv*vofZ%_ zgZF4+la-IxM)Yb zNP^_VWrksK#zg`=$gu#ITpa1390G9A5{615U#jV<0H;h*g%BX3kr0Mjo#hMtUN=VB zV6ur%e^@YO2!;MuB9ay}hT;K51y!bCwa)HfXqKZ~b|=j-9L)?Ns)24mZ&_k?(ni7T zt
  • dDue1vK^!*O5%%kAefpS(6q1{vxY@2PSUN=uY>(BQw)e&oLC8H;!3QCD$saS zXvp1R1x=Kh*{&(|1(>(3GwT^tk+9YrGT0U_*TMpuG+FS=W?gSg| z-0%zXl81ryHGH6e2sES)j|=L4wGAFMtG%AWfUDx0HK#M%&{3t`MC8hK;-1_rby36n z1(zA$#a7#EkM}&Xx9yAPkwt)$F q>-g@m+@_p;xq4vjl*euTJMTDGH+}4}wSB49LFg?h_jDH3E&Ch99x0yy diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json index edae9c38c41..6d38c5fea75 100644 --- a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Frontier Station, created by Tem Armoff https://github.com/new-frontiers-14/frontier-station-14/pull/484/files", + "copyright": "Taken from wallening at https://github.com/wall-nerds/wallening/commit/cff5df2e3d45a18afe5619a8c130e1ba50ab4ef5.", "states": [ { "name": "scanner", diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/scanner.png b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/scanner.png index 46d1c847feaa78d24705538f7329a92c8b4541b1..e3c9fdc5c9734082c607f0d8ffdc16ce5a86fff5 100644 GIT binary patch delta 251 zcmeyt*uykIvYw5Bfnm|yx)vbCSRCZ;#IWw1%u68Wn5T$;Q+m${hGgZjwx+OnC+hwR3s_pb#3l59^0t)v`#%{3LExvm`fJAe z`n|;;GIlS0)9cJEE_~^8+P?QM{%roraQJ!MAq$fkze_lCw=1yc?_I_9d8RGj*=04w z%o6jO+q*d}e|+k&HJI!YJX xOc@-0R*DCg{t(ksi;=s2_>-#(2t1iy%g~;d!*kK(s3Fix44$rjF6*2UngFH&YrOyf delta 231 zcmeBS`oTCsvYwfNfnln1-!>q{SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@20z$e7D zEmGoeqw=v$>I@T)0mWuJp47D^9w~z?1`ZxQW(kP|MTY4MBc4vQ?C}ve!0~i3^O{d9*bIz~4Idjf zNOF9TYB$VjIE diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png index fccc17e9193e7371d0b0630e1eb19d25699ad886..6cb8fd2b677963627cb09b9a92f4e3787eba9e81 100644 GIT binary patch delta 110 zcmV-!0FnQDi~*1&XaRFlM?wIu&K&6g002fwL_t(oh3(8S5x^i61kojvE7!uK%EWx@sL8PZC(143g${;A^|NmA03(S(GBhw6dOE@+JEQa%BYyw^b5ch_0Itp)=>Px$Wl2OqR9J=Wl_6`xKorOSDHDU5LI)d^ zz*LzSp=J;j?o*VQK;0rHBKHvrF%c7)3!KRp$i&n^O=SoXlZ8-NU}8|ynq5UmY1zc? z1vYa(l^n-=Ki+$H2WT{!f5uSREQC0G4^~Wu;vRSB&zQL45Pyd;rXFdPB^ zilPAL0e}diX@$~Uk!BzahbWyIrBkE#a0$;_Q^L>%TKdiyeP`Sy1WlkQicU#83B08d zI3MBbsm5lyz<*}C0Ouo!B~3tS2tTidF<3GAQ7*x`eIf;*xsYO}BtUAx#jSnv-<}K# z9ReWB7cQ1V z2*l1|m^ej{VaE>A%pp4wQVUR&1_ZBsq1YK@Ibh?)_Y4!K++kqIQGttr_#knbJ3wB3 zCL<^z-napE1QdYy_wV0iaBw)l$iP5{f{0pxYzJs)K(b>U}oXkrG1_l>T7srr@*5m{U*2M`TJxzfITqhXLo;~}YzpMM8 zp=z4pq}3l6?6^^%%f}J@Kfnzk|bp- tk^2+Y$^CLy&Hg}(43Bp`BuUb*fDJgg0_WdhT?zmI002ovPDHLkV1k`@C2s%# diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png index f890dbd413ae102ef91ec7bd277c61418e501d93..0c9a0eb89bbfd1c7b042f1aec81c5268db52eb2a 100644 GIT binary patch delta 106 zcmV-w0G0oFhyjo!WC3$hM?wIu&K&6g002TsL_t(oh3(9-6@VZR1ksTv_CXP(6mLpL zCKB1eUBq*Kw8<<;lK$?9hR+=Dx37MOf6izKP+KYoprjupNs@NA05=u{GL%_M(*OVf M07*qoM6N<$g00ahH2?qr delta 91 zcmV-h0Hptj0eO%lRX|BZK~z|U?a;9e03ZlN(Zjfr`;Xu@lqOiYfS6GDUv&*|K>z?$ xv&{X75ht6?t6i=713feBzTPzf004iIv;nEo2J8>CYB~S_002ovPDHLkV1f$CCC~r> diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/icon.png b/Resources/Textures/Objects/Tools/rcd.rsi/icon.png index cb62979010f4ddc12341edfdbc08a6cd69426857..54f78b3df1fcd7976d7df157706bc4d7ae9366cf 100644 GIT binary patch delta 914 zcmV;D18w~N1g8g(BYyw^b5ch_0Itp)=>Px&VM#A+YlyU$RfWkis8#5M`7pOVB*ID_9Cc3?UoueZ9xOUR%CHmiBwmY< zf`N`K+|cWaisdGo1}cl8-NZ!8^&!c%>CK;Q_+~y&_x{fB+<)^u-}5`a3r(6d`M)EW z0zxqq9O=^~uLXe1Ne=+0U2(=PBu#T36kXSi=SONKNnQ)?aX$cOeIo$44s`Ps=>LU? zh5`WY{v-pi^26f*^gJ!&9`_TB77TY9(MYUGfXg#l@@Ku~B*|-`*KNbxwW5*!nYrlE?t? zWwwPu_j89AM(a7wpo1X7{5$7MB0!@ZR5P?`WmHqty^{ zWj2ZLg`3QOEnIAP1TN30E{b-v(t9qOsTg0mo@DD@(RwAZjHXGYyk%ZLvclS>JrHmh z`Ju=Ga(~$j;kShQtASiLgR*1MGX3{110Y8WD5*T(zTb(}d4yM9{FJS>HZEQfgd1JE z_2Zvx0kCg>2j$JA*3_!sGzqY^nUnTBc@sI>Z@eq1JWx7kWCpui2`{PwfOhK+wnLq4 z{!!eFM)6j`sGf{}V{*YHKvh*!lBx>0JYBjd+J8A4I7Qd>BulY4p-7q;)(Oo{z?peH zytpd(1wlYn>2~~E$o1HDKS`8!F+Akqd|;YG&$<{M@*s+KX@nA<5knagI-v^1h< z-`3r->leSWGs*aM%Gc{T43rF8pj794HjH(e?m=gfqk&AII*pAgH@v&Rx zjli!=P1=m+Qw^(AB60OvMeKncDC2WF^ug}dikOnhvop3G$!lTkLQ>e?2_ITOHKtGM oH7oyMC%pNtU~0upnl$+bIrBxPEHOa^01E&B07*qoM6N<$f(&lG+5i9m delta 614 zcmV-s0-61%2mS<*BYy%#NklljQ6oo${78KPehM{Q?n4v8l3~IZQVyS|O zOe`f+7Pk5iutfX@vmhjtF$*lsT5uay7lDV!K>`m{S-_DTMU`00@Ng2>aS~7 z=RPOz%elvnCCjpyr!LHO_XWTLU;zMJOj`&}^e{R;Q>p-5@_)<7TbA@+08T!^<6T(W zfNt(S084E+IM%~iLZku!w7!YjJNp7a#)IOHfRLs{SlS#9n*cBjBLsM~J^qW=t_pW1 zsov1TaS$UN&@>JEhYIci0C`pPduoGLv+&!6fkTm2uZep6QPiC~@USo*B5@U%rYSj& zgXej?wl!=QPJiDQ`s+Ql(Lc7``0Mi!(33p@;x+|D_roC66CE&3Ge&Dw^$-f=?~2X4 zxl2wH!fFKCaG%XSCnE>cz zOR610WnVviOaMU;jOZ@QHjT^!83fy{-4Czb({zh|uBwGM10Ok(x3+A2KBmwPTod5s;07*qoM6N<$g5zQw A-~a#s diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json b/Resources/Textures/Objects/Tools/rcd.rsi/meta.json index 8f64ec726d0..919506aa693 100644 --- a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/rcd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/ce025775f73b66934ca96f3a8edc30993ea70b4d and modified by Swept", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/ce025775f73b66934ca96f3a8edc30993ea70b4d and modified by Swept and taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/9753fa6770f036733c2c10c2c4cce0a711eeaffe.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json index 17ec25991ac..7cd668123fd 100644 --- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/9753fa6770f036733c2c10c2c4cce0a711eeaffe.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png index 2bede8bc3b0708beedbacbd88aa4a50e20c463aa..da93cfda23ba873f855ef10199f34ec1b550c152 100644 GIT binary patch delta 292 zcmV+<0o(qD0>1)~B!2;OQb$4nuFf3k0002_Nkl zLLp0?m96lP@gMQrKhn*+kQcRMBt=JI2#h5tl|>Lq5SdO6&aQ~J4!zH5-tKSaJ(vL@ zgb?DtQ%<22#ahb%#HE*9csQ>EuzbB!fX!~}V;N)Y+S~n6tbeskp&S7a-+E-dJzdxw zK%pG5PBqo&%AQ!MoF8od*zY>S=DPr%e@PfD_I}UStB=0ZG;Z7w20q`@8DZe>JKhX> z4|WJ=fXyNSV4Z3@ll&F@%)gx6NvZ)zlCjMs?QwRS<6V#3Yj+BzIE|VH;EdAIEMm%7|7681arT;-RBP%yt?Emkt zC~BCwL>WFDEMr7g|M_$`R`c)y7HpR1xIl!>jCA1Qr_P;)v*$exMR6#XW+cPU#|OxY zObi$ESvCA;lQ4luvT(u0|Nr@h(-3AJDTcpao-zD-afZQ?_hUF*Tv%8bMV*+K7=xsw zBtv<5Iow{15C8>rs`^nd+sw!qE{-h(zFl7qra>X_=lv~)PsbV@~ diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png index 565ebc24f66a0a622c01e1fca2073a35928b7c33..372174b1fa0417c7431e856cd7e0a8e664f07928 100644 GIT binary patch delta 195 zcmV;!06hPg0p9_TB!2;OQb$4nuFf3k0001)Nklc+kxU* zoDL8d6~Su|GC;P})XJPeTvUYNRB!U=$1~005O`B$8sUdO-jH002ovPDHLkV1ldNP#^#R delta 123 zcmcc5ID>J5N=dw@i(^PcYqA9E;slYNra%KOw}TGMZaLq=!@~ZtUrcj5RHfE18RbX1go-)fq?-7 Y!_NOgELr)JzcK)Ur>mdKI;Vst00mYvu>b%7 diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png index 9d0d820ddaa8a7610582061de5121e0fe779d51c..a64a953b6c557a3d5642a210fe11e6e739752438 100644 GIT binary patch delta 174 zcmV;f08#(r0m=c8B!2;OQb$4nuFf3k0001lNkl4~zfIN$Nf;m^BBBEkK}3v*7+3w-6OoVEZ#|BMyN{gnGCX_k zK4#r}zcc^5z@(~|;pcZ%MQiPM3vAm40L!att*2Z{>DKU<1t-i*N-4`forBFx0N`Dg ch=}NK?3Z{mcF*tm0ssI207*qoM6N<$f=;7Pxc~qF delta 199 zcmV;&067230pkIXB!8+&L_t(og<}{6qhJ(_f>AIEMm%7|763gxJ^w*8FE1}#?DOZ( zC~71nB^jclqZyIamz0!XHIF0!GYlX2{{8!Z5C*9QVGw)Os#OH_VFMU0o;h>oe>*!n zFq?;m2QL2Q%NLx6C@3f}Jb3Vc;n1N&4C(3VB!vPCx&SDsH9$2r@frg1F^HZzbt;&j zot@2a`SN9wEeCRB!U=)l3x&j6U1_0jGM}pJKMX>+?002ovPDHLkV1g(7 BPssoP diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json index 86f25b0b7a1..d35b42dfb37 100644 --- a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/52cbeaf94322209d4c6596818dda9fb3654729d3 and modified by Swept", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/9753fa6770f036733c2c10c2c4cce0a711eeaffe", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png index 317e638c18c679b0a0ee848973c731e7a901d786..51fc9d8ad1772e3d3ca8b6857c99d1418b987c30 100644 GIT binary patch delta 495 zcmVA#%(u;=@HVxgw zLWBQ`6hul_#EaBR5fwx~fCxSJ(xa3;^yWwC#ShTZgL~*@L0Cl8(jqLB1e0AA4QRrG zr3lsC=^^V#lCACD3Z3UN^Ul1y?=LgI2`Cf_h2nolOD>3F5r5;@5_7px05<%6?w8j9 z$QpX8!0zmHs>YoSi^W*nn@li{E%El{6pO97Fi>#qz z+D%#GTlPW<4ugiAcM_WtFqa#Z%>fpNO;+3Uk)elN)8vY%+2cVI+d1RVb1A%sXMgrZj?$+JVbGvZDhm>)o)Yjo>fQk@O>mXDrZn<}*2)a?uTMFxAEE(O z$H#K}WPbI5Pu)9^@zcUHo($#K`&_yE1pbEBgawstz={d{`tx2a?ldOpO2Col(#i@&Id$QnqQFg%Znn|2e2 zOQ3DSAj(OaQ2Wyr1o@g~yhH3Ho?!@t!CovkYv{PkOIuvY1yba(&&002ovPDHLkV1myx^NRog delta 259 zcmV+e0sQ`n1fK$sB!A{fL_t(oh3%A~4ue1phPwrE5=nx~C5ZnmCyuQ`$6Jbn}M2xQx1xTPn*qs!Sd7i!9L;=PaXCs1naV?x9!!Rtl z6v<7_=0M;r;D?Y3Qy1UD51}Uj*fpfWdtJl7|A-VtQ4S6OJOD(+qr8+RilzVn002ov JPDHLkV1nnpbWQ*O diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png index a5e9f773ed55bfbc12fbbdce978c3733689ff043..1d52d887d61c8d7a3bc2c5a38f8cd29f1724099a 100644 GIT binary patch delta 261 zcmV+g0s8)Vq5_a4e*tq+M?wIu&K&6g007)cL_t(oh3(U!3c^4f$MNqrL1t1AVR1>@ zqS$-@mwW(|!FMnie2oPkz~l=E2J@N*lVKnTrY)UkIfiaQP|@K31An;tbMXIh+<_26 zh<|4l8+taQdGvMY1pus)m~%8Lo%@tZvC%yGdOq$mY_|aDf9@MhS?F^#vYcth1{_lW z3Q%gkyS^I0E;d3h$cFZaVgFrNwVgag!c)lSr8kN~xB2LRyO^I@}nXKt?a z2A)tr>Z}i**{7!WveFH#l9=WGl<)7?W>^MXOl9u|`1v;!LI@#l5A8iI?$7tC00000 LNkvXXu0mjft%P_1 delta 91 zcmZ3)R5?K<)WOrmF(jh(?L|W_1_d6LgWdn@m(11os7=aN_HbyC^{CHbVPGhmd3amt vF0Hp;+1IhT^lxIR7mE;#<7Z%4(6)rL*jZtbwErhd1|aZs^>bP0l+XkK0`DLq diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png index d8ace36de984710ee0aa9095539bc689fc209fa8..da4fadaac736ad148f4da4361701e21829569259 100644 GIT binary patch delta 501 zcmVx zYE;G?f}=Gch@giJya+pZ^gr;hKVbb+cHCjGi-!&LVi86ns8EoWG)67-(1eIG1Zxuy zZBm;Qr#E5mbIE%@9^c>hz4v_qfj}S-{O?H7f?p^wvTOMHw0{DC)-cG_jsZx?$(Vq) zz8cebvSFdnGarmD2%694)OJA!4fr(nrsL2@@;v}7%Vg@?4?iU*$&_26#%bz0H0;=J zIPPaQX5ex2<@qF_f(~%boH7dc_t0zt@NQD2bY^3nRmpF!uyL^0Q5ojv(ki7&o%N4d zc77FcY?u7bo_|l|)MEyM#``C3I4TthCr);0Y5kH|0#W8)Cf4X&f3j7@3uSO5S307*qo IM6N<$f;L!pQ~&?~ diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json b/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json index e79ca362989..f63459a35c8 100644 --- a/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "/tg/station, 'icons/obj/device.dmi' commit 2b8b045d, redrawn by Ubaser.", + "copyright": "taken from wallening at https://github.com/wall-nerds/wallening/commit/cff5df2e3d45a18afe5619a8c130e1ba50ab4ef5.", "size": { "x": 32, "y": 32 }, "states": [ { "name": "tray-on" , "delays": [[0.1, 1.0]]}, diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png index 9ca7ff2ca4ccfe9228d05c99db4b2d802232df36..a1e0d1491afcaa3d52c9937746a59f3ea6078529 100644 GIT binary patch delta 509 zcmVOb+3{o zg${+#lpYFk%95p17Kb7jDmZ2dG$2*PK)5arwRDgS+6V>`I7l55P^Z}I5OQ1~srQbg zrI_FH-uu4qeecivJ{}LojCt(1>;`I@X3m?dZ;jn&PtA4w^nV9apLWb#kx0b00JrT( z3x_wieEoikZ`Oz2(3!t+6LXRXm=N8Nd;ZD*$meq|>)5r6;^+nn-Zq73%m9c+V+LM$ z(Q=eZTtLCw#y9K3FG;4YRW#@R)< z2`{GOq*5sqMd>;GVmc1jXQJus3(y-n{sjmGJ>0XwQOn|7StJ0QS2}Sb*e*f$$pt89 z-_ZK}-t>KGB>Kh;Re%-0BvGr^0nknoDDo28N#cQB{dRHmfd33_G8yX3rI{^`KPHi8 zwrDp;*aKDqK~K*-5X=Id9vGznTPbd0U|`P642dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#UlzV7ixrWWQl`Vdv9x*?*dhT7<3vEK&dYpckh z)Z+Y{Qc$?t8JU^bfWrbs6cGau9T8Y{Ad8~w2*}7U$p@yWqReE^ypq(Sf+Aq*g4hVP z54Q?*vk;bt=4F=H89@y|6Gqa76gyUqMJ46=McETsxW;J_TmlW=|K#kO_h~9iQ@oC@BoJs$E-zxoU&e+7mkd>qq{@A`-Ld5&x&m*(Ew=s8YZJ1ys z=EPNS@_u3TQG;IH7yW&W%%@EjC}p>Y^6;n^tURXc7q*D;=a}+ieu7Zh9|`np8EMs(CK)`H9^^fk$E0R`!wdHcGS7#_Hyr c;L^sx@O?*m$fM`RKA`f>)78&qol`;+0K{(8F#rGn diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png index 5c4ba77cfed8b7656be34c6f82efca1178dfa015..df3a2b692d04c9eff8c8e02ffaae77fbdbb1bf10 100644 GIT binary patch delta 722 zcmV;@0xkXB4E6<(Fn+)jKBFhg#-uvFm_ka1`_g)?WY;0_7Y>qAtJ)OQjynmo(A0H?6nVnsHxqgk* z&%Jqv8>dc^diT(GoPF?Fmv2du4()SkZoo4AV|qHR_9Y!NJG;;>UwXokU0y;#QIK6; zf-gN$)xO%7)FrMLEA{_rmO_Du8jC-w>BH;w>KcHa45)`0`YlF;1;MBOS)QDHZtAQz zN}oCag5Xm-PJeg6$uPuLP!tG)Pi;gH%+}Yn2WW&xb1FYPT_p|xPKE(LJdN;ZPObB( zDOjOTodJ2dgy5Z9;5d%hGMNm<-&jT*D6+bbA*V`41-B;iO@JTNB zvw}+f*?+xzm`ww~!QI6g)7QNODi0aC#C>eP93gFUoBo>p%)}~v>dzohK6n%q1ppu| z`oVKoAuak3dCEM@)Hn1M_~wq_gu7g3+Q*Q78V1uoh95=i_W-l?4F$l(wpNv0Yyv=e z4K@NZ^{E2T!gk`K`%K;Tyxa-k7yT%js81DutxI$auVioC_TriZ+ze6;pxOF{Ho@YW z^w+x8n5j?wM`*x5UiYMxOazHPtNsX?t#4yvV{@eW4I?IL!pnll$N&HU07*qoM6N<$ Ef^(N(1^@s6 literal 1629 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a`;jsJkxxA z8MJ_G4j=}BOTm+YBxiv~WHAGS#w-wK6t_~`#K6Fuml+aK65;D(m7Jfemza{Dl&V*e zTL9K&Q(*;U=BAb;Dpcg=MLA$w zQj+ykb5e6t^Gb^K4fPE5vFR(xOhdRZuNWE}z<|*Q$pEz(VAbYXP?Br{3@O(NpnIVH z13EMrY;SQ%iawG8eIo+{3ta;vT_a0oQqvMkb4rx#Jbm5cjZ7`fZS*0kP<2B@Q4O`x$6~(?$k$ep zL8-<0Ii;X*w=*&`u>pq#iYOumAUYzj>OdAn*AbABUy=_@QAL@_o_QsyMFmB`)CI8- zY9DSD=w=}-56#Ogu`_}ifF_Kj3n_N29E(cI^NX@Wz%hXcMx08Z#z2A;DTP9kKREb- z>EDjaMjxJ+?6`I`Equzrz?A3d;uw;_nw%iPx>(UbiU~#}IX6soXar=NdI`pHK*Zu+Z|J>$IEPx-X$N9&*W zD6}`|xQVx~Txiyt#~=H4f9UaV|L42%NF26dD`M#3oy@$lxifGw+sxnBjj9g3IsQug z3B!R^4ab_M+&b^l`MY7-|7(T?2@9?WKH0^XqQ63B!I8R2rx_+BJBt1LStES-uFjrU zDWWbCY=Qy{mi<*>XE^ie&><(D^l#t48(**zNceVsW(?=H|2O_w@`UwiCX{*QS)cs2 zIpIfB1B1ph$9d&NO(BghPB}I@cr$F0e^M#wn!3T1%Rl8|&IAh$0S`uzsf$^=L#{Jtk~g|&X*-58fN}H`1ZKUZPy^Kj^19? zRdwoNvMblM&g4GzIc-~{zBOy{>bhGf(@Qtbn__n;d1cnkSvhVQXs(VRL+`w}4}U zFMGq?e|`(j7JF=(yN2OM&40aFsy#eT4(IE4@p}qpObU7K^oCtDz9ULfIeHKs!-n_7?+UFHYF4zsh%e})-=VHk#C{*3ta169+h zE3PP$&io{f1OO0Ge*umc(0Dj{nX_0fTCwz)A}l1LVsPX}z z5|)<*vh4cs_HsVexrhC(U-yL&ou+C!t=1tqUO=j**H+!hxsDgqf(P#ks4B2spJd-O zENsIK0Khb?dIqMmImxHoE#QYU0JP`eD>KmK*%koZo6y_>hG7_nxd9CBTII4g2EzaV O002ovPDHLkU;%=acY3w} delta 189 zcmV;u07Czx0@(qOB!8euL_t(oh3%6u4#OY}MV*c;%t+k8Gxt9QH{b#+tW=KD$Z--R znyKo462c(aAAf)V004krr|XeY>UPhJ6U(dtF~-Y6g7yJ|s>)Libbp?{Vb<$N=dqHuawKhhz)>E#ywK;guoqhwh r1Iv}TI>c9+BOd<(0001g4iUWpLT6C@$#bFA00000NkvXXu0mjfKh9Nh diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png index a68f4c12577f44b8d8cce23be32ec1556b0f85ca..b13f165ed14dae97be943f85dc81c9841f6ed9be 100644 GIT binary patch delta 349 zcmV-j0iyoP0`~%tBYyw^b5ch_0Itp)=>Px$F-b&0R9J;$U>F6XU=)mkQ83a0BMOI+ zks+Rs>pw9X@BaS7aOC?hM#3twga7{_*03N8#`AIg7iVT7(g+p?1_p-z&t;Ub%F4V1I~RIDLWP$+M>n2lnk? zgoOY`6xeXG;f(?oODBc{`*tuoIC=bMU|>LDGcYi~9roneQ-;TnAE4;Hd;11l?f$*n zF{6)>k&$eyqNe%3chZ#qj?SL{Rn#=$7$%3T*3sD$?qH%4;oaYV2!?=+lr+QflSdh3 zWfd4?q@;-s0ag?TB=B=%O@!!af|xYGz<`+!2&MsI6Cn)T{r!glS1w>+z@8Iexd3M( vv}52QsvP*o`HL#$z$h36qhJ(_f&m8r_lt=Xa>?E_00000NkvXXu0mjfcBP?s delta 305 zcmV-10nYyS0?PuBBYy!BNklZq}6o!9jvcSL;DQ{AyrhZ6db(>kO|<5cF2(TEzbu0-v54VgJBqkxqAZFfH%Mz0207& zadox!ue3?lfPIbUSc*p+PZbsqp*Ozo_9UW%)*4xs`K0tjw|@_)`{#I$Llr=Tb})W? z{a_>IX!ayYyguZ4-V@Q8kPANhskkvFkWyOu-W^l%D2h;)-i)Hwo0{~xLq~t8wZM_==IdNWsK?6oxBG~gpZ-(j)-2JsBZVP}jRTHAe>k$yi00000NkvXXu0mjf D$>fqg diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png index 3f79cb157cacf02c6412154c488d2af8c68a7928..4068052ffc2d05557d1cbea4a9db96c6069b31d5 100644 GIT binary patch delta 201 zcmV;)05<>R0p$UZB!2;OQb$4nuFf3k0001=Nkl80B{_~asHjKpTrnJRr^e$hyXK(*4k15xSyzMC!$aC zd(JsrhfNkBB0xk?N;yqRDJ^aKwg6@h0C3uZ)f11rIB>;k&q7CVTsV?YM4sbYZ@|nB zB^;f&&4F17&8%o%(mIagIKRyUSIR!*tMQJF00000NkvXXu0mjf Digi|& delta 200 zcmV;(05|{T0ptOYB!8<(L_t(oh3%BR4Fe$zg?&*f^&}7`lI>Cfk6-gD5bu$0tyu(Lap_> z^F5^uaHs#Y6*MK`y??0GAonZyoqs?O1VK0i0Js3744v#$-R?I40000 Date: Sat, 21 Dec 2024 00:21:42 +1300 Subject: [PATCH 07/40] YAML linter obliteration --- .../Objects/Specific/Chemistry/pills.rsi/meta.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json index 71ef846a044..7c3e3af8b64 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json @@ -28,18 +28,6 @@ { "name": "pill6" }, - { - "name": "pill18" - }, - { - "name": "pill19" - }, - { - "name": "pill20" - }, - { - "name": "pill21" - }, { "name": "pill7" }, From a3d5267f93c10354947269e6a151188b070e32b2 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 01:02:04 +1300 Subject: [PATCH 08/40] fix to thermomachine sprites in the worst way possible --- .../Structures/Piping/Atmospherics/unary.yml | 555 ++++++++---------- 1 file changed, 242 insertions(+), 313 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index 6a61cfc0a0c..d4dab562f15 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -5,20 +5,20 @@ placement: mode: SnapgridCenter components: - - type: AtmosDevice - - type: Tag - tags: - - Unstackable - - type: SubFloorHide - blockInteractions: false - blockAmbience: false - - type: NodeContainer - nodes: - pipe: - !type:PipeNode - nodeGroupID: Pipe - pipeDirection: South - - type: CollideOnAnchor + - type: AtmosDevice + - type: Tag + tags: + - Unstackable + - type: SubFloorHide + blockInteractions: false + blockAmbience: false + - type: NodeContainer + nodes: + pipe: + !type:PipeNode + nodeGroupID: Pipe + pipeDirection: South + - type: CollideOnAnchor - type: entity parent: [GasUnaryBase, AirSensorBase] @@ -28,53 +28,48 @@ placement: mode: SnapgridCenter components: - - type: Weldable - time: 3 - - type: VentCrawTube - containerId: VentCrawTube - - type: VentCrawEntry - - type: ContainerContainer - containers: - VentCrawTube: !type:Container - - type: ApcPowerReceiver - - type: ExtensionCableReceiver - - type: DeviceNetwork - prefix: device-address-prefix-vent - - type: Tag - tags: - - GasVent - - Unstackable - - type: Sprite - drawdepth: FloorObjects - sprite: Structures/Piping/Atmospherics/vent.rsi - layers: - - sprite: Structures/Piping/Atmospherics/pipe.rsi - state: pipeHalf - map: [ "enum.PipeVisualLayers.Pipe" ] - - state: vent_off - map: [ "enabled", "enum.SubfloorLayers.FirstLayer" ] - - type: Appearance - - type: PipeColorVisuals - - type: GenericVisualizer - visuals: - enum.VentPumpVisuals.State: - enabled: - Off: { state: vent_off } - In: { state: vent_in } - Out: { state: vent_out } - Welded: { state: vent_welded } - Lockout: { state: vent_lockout } - - type: GasVentPump - - type: Construction - graph: GasUnary - node: ventpump - - type: VentCritterSpawnLocation - - type: AmbientSound - enabled: true - volume: -12 - range: 5 - sound: - path: /Audio/Ambience/Objects/gas_vent.ogg + - type: ApcPowerReceiver + - type: ExtensionCableReceiver + - type: DeviceNetwork + prefix: device-address-prefix-vent + - type: Tag + tags: + - GasVent + - Unstackable + - type: Sprite + drawdepth: FloorObjects + sprite: Structures/Piping/Atmospherics/vent.rsi + layers: + - sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeHalf + map: [ "enum.PipeVisualLayers.Pipe" ] + - state: vent_off + map: [ "enabled", "enum.SubfloorLayers.FirstLayer" ] + - type: Appearance + - type: PipeColorVisuals + - type: GenericVisualizer + visuals: + enum.VentPumpVisuals.State: + enabled: + Off: { state: vent_off } + In: { state: vent_in } + Out: { state: vent_out } + Welded: { state: vent_welded } + Lockout: { state: vent_lockout } + - type: GasVentPump + - type: Construction + graph: GasUnary + node: ventpump + - type: VentCritterSpawnLocation + - type: AmbientSound + enabled: true + volume: -12 + range: 5 + sound: + path: /Audio/Ambience/Objects/gas_vent.ogg + - type: Weldable + - type: AtmosMonitoringConsoleDevice + navMapBlip: GasVentOpening - type: entity parent: GasUnaryBase @@ -84,24 +79,23 @@ placement: mode: SnapgridCenter components: - - type: VentCrawTube - containerId: VentCrawTube - - type: VentCrawEntry - - type: Sprite - drawdepth: FloorObjects - sprite: Structures/Piping/Atmospherics/vent.rsi - layers: - - sprite: Structures/Piping/Atmospherics/pipe.rsi - state: pipeHalf - map: [ "enum.PipeVisualLayers.Pipe" ] - - state: vent_passive - map: [ "enum.SubfloorLayers.FirstLayer" ] - - type: Appearance - - type: PipeColorVisuals - - type: GasPassiveVent - - type: Construction - graph: GasUnary - node: passivevent + - type: Sprite + drawdepth: FloorObjects + sprite: Structures/Piping/Atmospherics/vent.rsi + layers: + - sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeHalf + map: [ "enum.PipeVisualLayers.Pipe" ] + - state: vent_passive + map: [ "enum.SubfloorLayers.FirstLayer" ] + - type: Appearance + - type: PipeColorVisuals + - type: GasPassiveVent + - type: Construction + graph: GasUnary + node: passivevent + - type: AtmosMonitoringConsoleDevice + navMapBlip: GasVentOpening - type: entity parent: [GasUnaryBase, AirSensorBase] @@ -111,53 +105,48 @@ placement: mode: SnapgridCenter components: - - type: Weldable - time: 3 - - type: VentCrawTube - containerId: VentCrawTube - - type: VentCrawEntry - - type: ContainerContainer - containers: - VentCrawTube: !type:Container - - type: ApcPowerReceiver - - type: ExtensionCableReceiver - - type: DeviceNetwork - prefix: device-address-prefix-scrubber - - type: Tag - tags: - - GasScrubber - - Unstackable - - type: Sprite - drawdepth: FloorObjects - sprite: Structures/Piping/Atmospherics/scrubber.rsi - layers: - - sprite: Structures/Piping/Atmospherics/pipe.rsi - state: pipeHalf - map: [ "enum.PipeVisualLayers.Pipe" ] - - state: scrub_off - map: [ "enabled", "enum.SubfloorLayers.FirstLayer" ] - - type: Appearance - - type: PipeColorVisuals - - type: GenericVisualizer - visuals: - enum.ScrubberVisuals.State: - enabled: - Off: { state: scrub_off } - Scrub: { state: scrub_on } - Siphon: { state: scrub_purge } - WideScrub: { state: scrub_wide } - Welded: { state: scrub_welded } - - type: AtmosDevice - - type: GasVentScrubber - - type: Construction - graph: GasUnary - node: ventscrubber - - type: AmbientSound - enabled: true - volume: -12 - range: 5 - sound: - path: /Audio/Ambience/Objects/gas_vent.ogg + - type: ApcPowerReceiver + - type: ExtensionCableReceiver + - type: DeviceNetwork + prefix: device-address-prefix-scrubber + - type: Tag + tags: + - GasScrubber + - Unstackable + - type: Sprite + drawdepth: FloorObjects + sprite: Structures/Piping/Atmospherics/scrubber.rsi + layers: + - sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeHalf + map: [ "enum.PipeVisualLayers.Pipe" ] + - state: scrub_off + map: [ "enabled", "enum.SubfloorLayers.FirstLayer" ] + - type: Appearance + - type: PipeColorVisuals + - type: GenericVisualizer + visuals: + enum.ScrubberVisuals.State: + enabled: + Off: { state: scrub_off } + Scrub: { state: scrub_on } + Siphon: { state: scrub_purge } + WideScrub: { state: scrub_wide } + Welded: { state: scrub_welded } + - type: AtmosDevice + - type: GasVentScrubber + - type: Construction + graph: GasUnary + node: ventscrubber + - type: AmbientSound + enabled: true + volume: -12 + range: 5 + sound: + path: /Audio/Ambience/Objects/gas_vent.ogg + - type: Weldable + - type: AtmosMonitoringConsoleDevice + navMapBlip: GasVentScrubber - type: entity parent: GasUnaryBase @@ -167,44 +156,38 @@ placement: mode: SnapgridCenter components: - - type: Sprite - drawdepth: FloorObjects - sprite: Structures/Piping/Atmospherics/outletinjector.rsi - layers: - - state: pipeHalf - sprite: Structures/Piping/Atmospherics/pipe.rsi - map: [ "enum.PipeVisualLayers.Pipe" ] - - state: injector - map: [ "enum.SubfloorLayers.FirstLayer" ] - - state: injector-unshaded - shader: unshaded - map: [ "enum.LightLayers.Unshaded" ] - color: "#990000" - - type: GenericVisualizer - visuals: - # toggle color of the unshaded light: - enum.OutletInjectorVisuals.Enabled: - enum.LightLayers.Unshaded: - True: { color: "#5eff5e" } - False: { color: "#990000" } - - type: Appearance - - type: PipeColorVisuals - - type: GasOutletInjector - - type: Construction - graph: GasUnary - node: outletinjector - - type: SubFloorHide - visibleLayers: - - enum.SubfloorLayers.FirstLayer - - enum.LightLayers.Unshaded - - type: VentCrawTube - containerId: VentCrawTube - - type: VentCrawJunction - degrees: - - 0 - - type: ContainerContainer - containers: - VentCrawTube: !type:Container + - type: Sprite + drawdepth: FloorObjects + sprite: Structures/Piping/Atmospherics/outletinjector.rsi + layers: + - state: pipeHalf + sprite: Structures/Piping/Atmospherics/pipe.rsi + map: [ "enum.PipeVisualLayers.Pipe" ] + - state: injector + map: [ "enum.SubfloorLayers.FirstLayer" ] + - state: injector-unshaded + shader: unshaded + map: [ "enum.LightLayers.Unshaded" ] + color: "#990000" + - type: GenericVisualizer + visuals: + # toggle color of the unshaded light: + enum.OutletInjectorVisuals.Enabled: + enum.LightLayers.Unshaded: + True: { color: "#5eff5e" } + False: { color: "#990000" } + - type: Appearance + - type: PipeColorVisuals + - type: GasOutletInjector + - type: Construction + graph: GasUnary + node: outletinjector + - type: SubFloorHide + visibleLayers: + - enum.SubfloorLayers.FirstLayer + - enum.LightLayers.Unshaded + - type: AtmosMonitoringConsoleDevice + navMapBlip: GasVentOpening - type: entity parent: [ BaseMachinePowered, ConstructibleMachine ] @@ -214,41 +197,43 @@ placement: mode: SnapgridCenter components: - - type: Sprite - sprite: _Impstation/Structures/Piping/Atmospherics/thermomachine.rsi - snapCardinals: true - - type: Appearance - - type: PipeColorVisuals - - type: Rotatable - - type: GasThermoMachine - - type: AtmosPipeColor - - type: AtmosDevice - - type: UserInterface - interfaces: - enum.ThermomachineUiKey.Key: - type: GasThermomachineBoundUserInterface - - type: ActivatableUI - inHandsOnly: false - key: enum.ThermomachineUiKey.Key - - type: WiresPanel - - type: WiresVisuals - - type: PipeRestrictOverlap - - type: NodeContainer - nodes: - pipe: - !type:PipeNode - nodeGroupID: Pipe - pipeDirection: South - - type: Transform - noRot: false - - type: DeviceNetwork - deviceNetId: AtmosDevices - receiveFrequencyId: AtmosMonitor - transmitFrequencyId: AtmosMonitor - sendBroadcastAttemptEvent: true - examinableAddress: true - - type: WiredNetworkConnection - - type: PowerSwitch + - type: Sprite + sprite: Structures/Piping/Atmospherics/thermomachine.rsi + snapCardinals: true + - type: Appearance + - type: PipeColorVisuals + - type: Rotatable + - type: GasThermoMachine + - type: AtmosPipeColor + - type: AtmosDevice + - type: UserInterface + interfaces: + enum.ThermomachineUiKey.Key: + type: GasThermomachineBoundUserInterface + - type: ActivatableUI + inHandsOnly: false + key: enum.ThermomachineUiKey.Key + - type: WiresPanel + - type: WiresVisuals + - type: PipeRestrictOverlap + - type: NodeContainer + nodes: + pipe: + !type:PipeNode + nodeGroupID: Pipe + pipeDirection: South + - type: Transform + noRot: false + - type: DeviceNetwork + deviceNetId: AtmosDevices + receiveFrequencyId: AtmosMonitor + transmitFrequencyId: AtmosMonitor + sendBroadcastAttemptEvent: true + examinableAddress: true + - type: WiredNetworkConnection + - type: PowerSwitch + - type: AtmosMonitoringConsoleDevice + navMapBlip: Thermoregulator - type: entity parent: BaseGasThermoMachine @@ -258,40 +243,33 @@ placement: mode: SnapgridCenter components: - - type: StationAiWhitelist - - type: Sprite - granularLayersRendering: true - layers: - - state: freezerOff - - state: freezerOn - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: freezer-Unshaded - shader: unshaded - map: ["freezing"] - - state: freezerPanelOpen - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - - state: pipe - map: [ "enum.PipeVisualLayers.Pipe" ] - renderingStrategy: Default - - type: GenericVisualizer - visuals: - enum.PowerDeviceVisuals.Powered: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - freezing: - True: { visible: true } - False: { visible: false } - - type: GasThermoMachine - coefficientOfPerformance: -3.9 - - type: ApcPowerReceiver - powerDisabled: true #starts off - - type: Machine - board: ThermomachineFreezerMachineCircuitBoard - - type: DeviceNetwork - prefix: device-address-prefix-freezer - - type: StealTarget - stealGroup: FreezerHeater + - type: StationAiWhitelist + - type: Sprite + granularLayersRendering: true + layers: + - state: freezerOff + map: [ "enum.PowerDeviceVisualLayers.Powered" ] + - state: freezerPanelOpen + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - state: pipe + map: [ "enum.PipeVisualLayers.Pipe" ] + renderingStrategy: Default + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: { state: freezerOn } + False: { state: freezerOff } + - type: GasThermoMachine + coefficientOfPerformance: -3.9 + - type: ApcPowerReceiver + powerDisabled: true #starts off + - type: Machine + board: ThermomachineFreezerMachineCircuitBoard + - type: DeviceNetwork + prefix: device-address-prefix-freezer + - type: StealTarget + stealGroup: FreezerHeater - type: entity parent: GasThermoMachineFreezer @@ -310,40 +288,33 @@ placement: mode: SnapgridCenter components: - - type: StationAiWhitelist - - type: Sprite - granularLayersRendering : true - layers: - - state: heaterOff - - state: heaterOn - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: heater-Unshaded - shader: unshaded - map: ["heating"] - - state: heaterPanelOpen - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - - state: pipe - map: [ "enum.PipeVisualLayers.Pipe" ] - renderingStrategy: Default - - type: GenericVisualizer - visuals: - enum.PowerDeviceVisuals.Powered: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - heating: - True: { visible: true } - False: { visible: false } - - type: GasThermoMachine - coefficientOfPerformance: 0.95 - - type: ApcPowerReceiver - powerDisabled: true #starts off - - type: Machine - board: ThermomachineHeaterMachineCircuitBoard - - type: DeviceNetwork - prefix: device-address-prefix-heater - - type: StealTarget - stealGroup: FreezerHeater + - type: StationAiWhitelist + - type: Sprite + granularLayersRendering : true + layers: + - state: heaterOff + map: [ "enum.PowerDeviceVisualLayers.Powered" ] + - state: heaterPanelOpen + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - state: pipe + map: [ "enum.PipeVisualLayers.Pipe" ] + renderingStrategy: Default + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: { state: heaterOn } + False: { state: heaterOff } + - type: GasThermoMachine + coefficientOfPerformance: 0.95 + - type: ApcPowerReceiver + powerDisabled: true #starts off + - type: Machine + board: ThermomachineHeaterMachineCircuitBoard + - type: DeviceNetwork + prefix: device-address-prefix-heater + - type: StealTarget + stealGroup: FreezerHeater - type: entity parent: GasThermoMachineHeater @@ -361,29 +332,7 @@ description: An advanced machine that cools gas in connected pipes. Has the side effect of chilling the surrounding area. Cold as Hell! components: - type: Sprite - sprite: _Impstation/Structures/Piping/Atmospherics/hellfirethermomachine.rsi - granularLayersRendering : true - layers: - - state: freezerOff - - state: freezerOn - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: freezer-Unshaded - shader: unshaded - map: ["hellfreezing"] - - state: freezerPanelOpen - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - - state: pipe - map: [ "enum.PipeVisualLayers.Pipe" ] - renderingStrategy: Default - - type: GenericVisualizer - visuals: - enum.PowerDeviceVisuals.Powered: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - hellfreezing: - True: { visible: true } - False: { visible: false } + sprite: Structures/Piping/Atmospherics/hellfirethermomachine.rsi - type: GasThermoMachine minTemperature: 23.15 heatCapacity: 40000 @@ -398,29 +347,7 @@ description: An advanced machine that heats gas in connected pipes. Has the side effect of leaking heat into the surrounding area. Hot as Hell! components: - type: Sprite - sprite: _Impstation/Structures/Piping/Atmospherics/hellfirethermomachine.rsi - granularLayersRendering : true - layers: - - state: heaterOff - - state: heaterOn - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: heater-Unshaded - shader: unshaded - map: ["hellheating"] - - state: heaterPanelOpen - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - - state: pipe - map: [ "enum.PipeVisualLayers.Pipe" ] - renderingStrategy: Default - - type: GenericVisualizer - visuals: - enum.PowerDeviceVisuals.Powered: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - hellheating: - True: { visible: true } - False: { visible: false } + sprite: Structures/Piping/Atmospherics/hellfirethermomachine.rsi - type: GasThermoMachine maxTemperature: 1193.15 heatCapacity: 40000 @@ -512,3 +439,5 @@ - type: ExaminableSolution solution: tank - type: PowerSwitch + - type: AtmosMonitoringConsoleDevice + navMapBlip: Thermoregulator From 136f852391df0e271b5244cdd332f773b3171554 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 01:04:00 +1300 Subject: [PATCH 09/40] Revert "fix to thermomachine sprites in the worst way possible" This reverts commit a3d5267f93c10354947269e6a151188b070e32b2. --- .../Structures/Piping/Atmospherics/unary.yml | 555 ++++++++++-------- 1 file changed, 313 insertions(+), 242 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index d4dab562f15..6a61cfc0a0c 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -5,20 +5,20 @@ placement: mode: SnapgridCenter components: - - type: AtmosDevice - - type: Tag - tags: - - Unstackable - - type: SubFloorHide - blockInteractions: false - blockAmbience: false - - type: NodeContainer - nodes: - pipe: - !type:PipeNode - nodeGroupID: Pipe - pipeDirection: South - - type: CollideOnAnchor + - type: AtmosDevice + - type: Tag + tags: + - Unstackable + - type: SubFloorHide + blockInteractions: false + blockAmbience: false + - type: NodeContainer + nodes: + pipe: + !type:PipeNode + nodeGroupID: Pipe + pipeDirection: South + - type: CollideOnAnchor - type: entity parent: [GasUnaryBase, AirSensorBase] @@ -28,48 +28,53 @@ placement: mode: SnapgridCenter components: - - type: ApcPowerReceiver - - type: ExtensionCableReceiver - - type: DeviceNetwork - prefix: device-address-prefix-vent - - type: Tag - tags: - - GasVent - - Unstackable - - type: Sprite - drawdepth: FloorObjects - sprite: Structures/Piping/Atmospherics/vent.rsi - layers: - - sprite: Structures/Piping/Atmospherics/pipe.rsi - state: pipeHalf - map: [ "enum.PipeVisualLayers.Pipe" ] - - state: vent_off - map: [ "enabled", "enum.SubfloorLayers.FirstLayer" ] - - type: Appearance - - type: PipeColorVisuals - - type: GenericVisualizer - visuals: - enum.VentPumpVisuals.State: - enabled: - Off: { state: vent_off } - In: { state: vent_in } - Out: { state: vent_out } - Welded: { state: vent_welded } - Lockout: { state: vent_lockout } - - type: GasVentPump - - type: Construction - graph: GasUnary - node: ventpump - - type: VentCritterSpawnLocation - - type: AmbientSound - enabled: true - volume: -12 - range: 5 - sound: - path: /Audio/Ambience/Objects/gas_vent.ogg - - type: Weldable - - type: AtmosMonitoringConsoleDevice - navMapBlip: GasVentOpening + - type: Weldable + time: 3 + - type: VentCrawTube + containerId: VentCrawTube + - type: VentCrawEntry + - type: ContainerContainer + containers: + VentCrawTube: !type:Container + - type: ApcPowerReceiver + - type: ExtensionCableReceiver + - type: DeviceNetwork + prefix: device-address-prefix-vent + - type: Tag + tags: + - GasVent + - Unstackable + - type: Sprite + drawdepth: FloorObjects + sprite: Structures/Piping/Atmospherics/vent.rsi + layers: + - sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeHalf + map: [ "enum.PipeVisualLayers.Pipe" ] + - state: vent_off + map: [ "enabled", "enum.SubfloorLayers.FirstLayer" ] + - type: Appearance + - type: PipeColorVisuals + - type: GenericVisualizer + visuals: + enum.VentPumpVisuals.State: + enabled: + Off: { state: vent_off } + In: { state: vent_in } + Out: { state: vent_out } + Welded: { state: vent_welded } + Lockout: { state: vent_lockout } + - type: GasVentPump + - type: Construction + graph: GasUnary + node: ventpump + - type: VentCritterSpawnLocation + - type: AmbientSound + enabled: true + volume: -12 + range: 5 + sound: + path: /Audio/Ambience/Objects/gas_vent.ogg - type: entity parent: GasUnaryBase @@ -79,23 +84,24 @@ placement: mode: SnapgridCenter components: - - type: Sprite - drawdepth: FloorObjects - sprite: Structures/Piping/Atmospherics/vent.rsi - layers: - - sprite: Structures/Piping/Atmospherics/pipe.rsi - state: pipeHalf - map: [ "enum.PipeVisualLayers.Pipe" ] - - state: vent_passive - map: [ "enum.SubfloorLayers.FirstLayer" ] - - type: Appearance - - type: PipeColorVisuals - - type: GasPassiveVent - - type: Construction - graph: GasUnary - node: passivevent - - type: AtmosMonitoringConsoleDevice - navMapBlip: GasVentOpening + - type: VentCrawTube + containerId: VentCrawTube + - type: VentCrawEntry + - type: Sprite + drawdepth: FloorObjects + sprite: Structures/Piping/Atmospherics/vent.rsi + layers: + - sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeHalf + map: [ "enum.PipeVisualLayers.Pipe" ] + - state: vent_passive + map: [ "enum.SubfloorLayers.FirstLayer" ] + - type: Appearance + - type: PipeColorVisuals + - type: GasPassiveVent + - type: Construction + graph: GasUnary + node: passivevent - type: entity parent: [GasUnaryBase, AirSensorBase] @@ -105,48 +111,53 @@ placement: mode: SnapgridCenter components: - - type: ApcPowerReceiver - - type: ExtensionCableReceiver - - type: DeviceNetwork - prefix: device-address-prefix-scrubber - - type: Tag - tags: - - GasScrubber - - Unstackable - - type: Sprite - drawdepth: FloorObjects - sprite: Structures/Piping/Atmospherics/scrubber.rsi - layers: - - sprite: Structures/Piping/Atmospherics/pipe.rsi - state: pipeHalf - map: [ "enum.PipeVisualLayers.Pipe" ] - - state: scrub_off - map: [ "enabled", "enum.SubfloorLayers.FirstLayer" ] - - type: Appearance - - type: PipeColorVisuals - - type: GenericVisualizer - visuals: - enum.ScrubberVisuals.State: - enabled: - Off: { state: scrub_off } - Scrub: { state: scrub_on } - Siphon: { state: scrub_purge } - WideScrub: { state: scrub_wide } - Welded: { state: scrub_welded } - - type: AtmosDevice - - type: GasVentScrubber - - type: Construction - graph: GasUnary - node: ventscrubber - - type: AmbientSound - enabled: true - volume: -12 - range: 5 - sound: - path: /Audio/Ambience/Objects/gas_vent.ogg - - type: Weldable - - type: AtmosMonitoringConsoleDevice - navMapBlip: GasVentScrubber + - type: Weldable + time: 3 + - type: VentCrawTube + containerId: VentCrawTube + - type: VentCrawEntry + - type: ContainerContainer + containers: + VentCrawTube: !type:Container + - type: ApcPowerReceiver + - type: ExtensionCableReceiver + - type: DeviceNetwork + prefix: device-address-prefix-scrubber + - type: Tag + tags: + - GasScrubber + - Unstackable + - type: Sprite + drawdepth: FloorObjects + sprite: Structures/Piping/Atmospherics/scrubber.rsi + layers: + - sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeHalf + map: [ "enum.PipeVisualLayers.Pipe" ] + - state: scrub_off + map: [ "enabled", "enum.SubfloorLayers.FirstLayer" ] + - type: Appearance + - type: PipeColorVisuals + - type: GenericVisualizer + visuals: + enum.ScrubberVisuals.State: + enabled: + Off: { state: scrub_off } + Scrub: { state: scrub_on } + Siphon: { state: scrub_purge } + WideScrub: { state: scrub_wide } + Welded: { state: scrub_welded } + - type: AtmosDevice + - type: GasVentScrubber + - type: Construction + graph: GasUnary + node: ventscrubber + - type: AmbientSound + enabled: true + volume: -12 + range: 5 + sound: + path: /Audio/Ambience/Objects/gas_vent.ogg - type: entity parent: GasUnaryBase @@ -156,38 +167,44 @@ placement: mode: SnapgridCenter components: - - type: Sprite - drawdepth: FloorObjects - sprite: Structures/Piping/Atmospherics/outletinjector.rsi - layers: - - state: pipeHalf - sprite: Structures/Piping/Atmospherics/pipe.rsi - map: [ "enum.PipeVisualLayers.Pipe" ] - - state: injector - map: [ "enum.SubfloorLayers.FirstLayer" ] - - state: injector-unshaded - shader: unshaded - map: [ "enum.LightLayers.Unshaded" ] - color: "#990000" - - type: GenericVisualizer - visuals: - # toggle color of the unshaded light: - enum.OutletInjectorVisuals.Enabled: - enum.LightLayers.Unshaded: - True: { color: "#5eff5e" } - False: { color: "#990000" } - - type: Appearance - - type: PipeColorVisuals - - type: GasOutletInjector - - type: Construction - graph: GasUnary - node: outletinjector - - type: SubFloorHide - visibleLayers: - - enum.SubfloorLayers.FirstLayer - - enum.LightLayers.Unshaded - - type: AtmosMonitoringConsoleDevice - navMapBlip: GasVentOpening + - type: Sprite + drawdepth: FloorObjects + sprite: Structures/Piping/Atmospherics/outletinjector.rsi + layers: + - state: pipeHalf + sprite: Structures/Piping/Atmospherics/pipe.rsi + map: [ "enum.PipeVisualLayers.Pipe" ] + - state: injector + map: [ "enum.SubfloorLayers.FirstLayer" ] + - state: injector-unshaded + shader: unshaded + map: [ "enum.LightLayers.Unshaded" ] + color: "#990000" + - type: GenericVisualizer + visuals: + # toggle color of the unshaded light: + enum.OutletInjectorVisuals.Enabled: + enum.LightLayers.Unshaded: + True: { color: "#5eff5e" } + False: { color: "#990000" } + - type: Appearance + - type: PipeColorVisuals + - type: GasOutletInjector + - type: Construction + graph: GasUnary + node: outletinjector + - type: SubFloorHide + visibleLayers: + - enum.SubfloorLayers.FirstLayer + - enum.LightLayers.Unshaded + - type: VentCrawTube + containerId: VentCrawTube + - type: VentCrawJunction + degrees: + - 0 + - type: ContainerContainer + containers: + VentCrawTube: !type:Container - type: entity parent: [ BaseMachinePowered, ConstructibleMachine ] @@ -197,43 +214,41 @@ placement: mode: SnapgridCenter components: - - type: Sprite - sprite: Structures/Piping/Atmospherics/thermomachine.rsi - snapCardinals: true - - type: Appearance - - type: PipeColorVisuals - - type: Rotatable - - type: GasThermoMachine - - type: AtmosPipeColor - - type: AtmosDevice - - type: UserInterface - interfaces: - enum.ThermomachineUiKey.Key: - type: GasThermomachineBoundUserInterface - - type: ActivatableUI - inHandsOnly: false - key: enum.ThermomachineUiKey.Key - - type: WiresPanel - - type: WiresVisuals - - type: PipeRestrictOverlap - - type: NodeContainer - nodes: - pipe: - !type:PipeNode - nodeGroupID: Pipe - pipeDirection: South - - type: Transform - noRot: false - - type: DeviceNetwork - deviceNetId: AtmosDevices - receiveFrequencyId: AtmosMonitor - transmitFrequencyId: AtmosMonitor - sendBroadcastAttemptEvent: true - examinableAddress: true - - type: WiredNetworkConnection - - type: PowerSwitch - - type: AtmosMonitoringConsoleDevice - navMapBlip: Thermoregulator + - type: Sprite + sprite: _Impstation/Structures/Piping/Atmospherics/thermomachine.rsi + snapCardinals: true + - type: Appearance + - type: PipeColorVisuals + - type: Rotatable + - type: GasThermoMachine + - type: AtmosPipeColor + - type: AtmosDevice + - type: UserInterface + interfaces: + enum.ThermomachineUiKey.Key: + type: GasThermomachineBoundUserInterface + - type: ActivatableUI + inHandsOnly: false + key: enum.ThermomachineUiKey.Key + - type: WiresPanel + - type: WiresVisuals + - type: PipeRestrictOverlap + - type: NodeContainer + nodes: + pipe: + !type:PipeNode + nodeGroupID: Pipe + pipeDirection: South + - type: Transform + noRot: false + - type: DeviceNetwork + deviceNetId: AtmosDevices + receiveFrequencyId: AtmosMonitor + transmitFrequencyId: AtmosMonitor + sendBroadcastAttemptEvent: true + examinableAddress: true + - type: WiredNetworkConnection + - type: PowerSwitch - type: entity parent: BaseGasThermoMachine @@ -243,33 +258,40 @@ placement: mode: SnapgridCenter components: - - type: StationAiWhitelist - - type: Sprite - granularLayersRendering: true - layers: - - state: freezerOff - map: [ "enum.PowerDeviceVisualLayers.Powered" ] - - state: freezerPanelOpen - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - - state: pipe - map: [ "enum.PipeVisualLayers.Pipe" ] - renderingStrategy: Default - - type: GenericVisualizer - visuals: - enum.PowerDeviceVisuals.Powered: - enum.PowerDeviceVisualLayers.Powered: - True: { state: freezerOn } - False: { state: freezerOff } - - type: GasThermoMachine - coefficientOfPerformance: -3.9 - - type: ApcPowerReceiver - powerDisabled: true #starts off - - type: Machine - board: ThermomachineFreezerMachineCircuitBoard - - type: DeviceNetwork - prefix: device-address-prefix-freezer - - type: StealTarget - stealGroup: FreezerHeater + - type: StationAiWhitelist + - type: Sprite + granularLayersRendering: true + layers: + - state: freezerOff + - state: freezerOn + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: freezer-Unshaded + shader: unshaded + map: ["freezing"] + - state: freezerPanelOpen + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - state: pipe + map: [ "enum.PipeVisualLayers.Pipe" ] + renderingStrategy: Default + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: { visible: true } + False: { visible: false } + freezing: + True: { visible: true } + False: { visible: false } + - type: GasThermoMachine + coefficientOfPerformance: -3.9 + - type: ApcPowerReceiver + powerDisabled: true #starts off + - type: Machine + board: ThermomachineFreezerMachineCircuitBoard + - type: DeviceNetwork + prefix: device-address-prefix-freezer + - type: StealTarget + stealGroup: FreezerHeater - type: entity parent: GasThermoMachineFreezer @@ -288,33 +310,40 @@ placement: mode: SnapgridCenter components: - - type: StationAiWhitelist - - type: Sprite - granularLayersRendering : true - layers: - - state: heaterOff - map: [ "enum.PowerDeviceVisualLayers.Powered" ] - - state: heaterPanelOpen - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - state: pipe - map: [ "enum.PipeVisualLayers.Pipe" ] - renderingStrategy: Default - - type: GenericVisualizer - visuals: - enum.PowerDeviceVisuals.Powered: - enum.PowerDeviceVisualLayers.Powered: - True: { state: heaterOn } - False: { state: heaterOff } - - type: GasThermoMachine - coefficientOfPerformance: 0.95 - - type: ApcPowerReceiver - powerDisabled: true #starts off - - type: Machine - board: ThermomachineHeaterMachineCircuitBoard - - type: DeviceNetwork - prefix: device-address-prefix-heater - - type: StealTarget - stealGroup: FreezerHeater + - type: StationAiWhitelist + - type: Sprite + granularLayersRendering : true + layers: + - state: heaterOff + - state: heaterOn + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: heater-Unshaded + shader: unshaded + map: ["heating"] + - state: heaterPanelOpen + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - state: pipe + map: [ "enum.PipeVisualLayers.Pipe" ] + renderingStrategy: Default + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: { visible: true } + False: { visible: false } + heating: + True: { visible: true } + False: { visible: false } + - type: GasThermoMachine + coefficientOfPerformance: 0.95 + - type: ApcPowerReceiver + powerDisabled: true #starts off + - type: Machine + board: ThermomachineHeaterMachineCircuitBoard + - type: DeviceNetwork + prefix: device-address-prefix-heater + - type: StealTarget + stealGroup: FreezerHeater - type: entity parent: GasThermoMachineHeater @@ -332,7 +361,29 @@ description: An advanced machine that cools gas in connected pipes. Has the side effect of chilling the surrounding area. Cold as Hell! components: - type: Sprite - sprite: Structures/Piping/Atmospherics/hellfirethermomachine.rsi + sprite: _Impstation/Structures/Piping/Atmospherics/hellfirethermomachine.rsi + granularLayersRendering : true + layers: + - state: freezerOff + - state: freezerOn + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: freezer-Unshaded + shader: unshaded + map: ["hellfreezing"] + - state: freezerPanelOpen + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - state: pipe + map: [ "enum.PipeVisualLayers.Pipe" ] + renderingStrategy: Default + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: { visible: true } + False: { visible: false } + hellfreezing: + True: { visible: true } + False: { visible: false } - type: GasThermoMachine minTemperature: 23.15 heatCapacity: 40000 @@ -347,7 +398,29 @@ description: An advanced machine that heats gas in connected pipes. Has the side effect of leaking heat into the surrounding area. Hot as Hell! components: - type: Sprite - sprite: Structures/Piping/Atmospherics/hellfirethermomachine.rsi + sprite: _Impstation/Structures/Piping/Atmospherics/hellfirethermomachine.rsi + granularLayersRendering : true + layers: + - state: heaterOff + - state: heaterOn + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: heater-Unshaded + shader: unshaded + map: ["hellheating"] + - state: heaterPanelOpen + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - state: pipe + map: [ "enum.PipeVisualLayers.Pipe" ] + renderingStrategy: Default + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: { visible: true } + False: { visible: false } + hellheating: + True: { visible: true } + False: { visible: false } - type: GasThermoMachine maxTemperature: 1193.15 heatCapacity: 40000 @@ -439,5 +512,3 @@ - type: ExaminableSolution solution: tank - type: PowerSwitch - - type: AtmosMonitoringConsoleDevice - navMapBlip: Thermoregulator From 61b9f1e9a1a766aac297fb144174c4ec964a5d2c Mon Sep 17 00:00:00 2001 From: Shaman <56280352+Sha-Seng@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:32:52 -0500 Subject: [PATCH 10/40] lowering hos prestige requirements per feedback when we increased hos unlock requirement we never changed the mantle down from 20 hours, and people say they'd appreciate the coat and the armor sooner too i don't disagree that 140 hours in security for a cosmetic is extreme lol bumpin mantle down to 10 hours (so it lines up with the security star) and the coat/armor down to 25 (so it's 10 more full shifts as hos past the mantle) seems appropriate also removing the loadout selector that lets the hos spawn with the regular security mask, since it was added to the hos's locker in a previous pr. they got their own personal mask in their command box, their locker already contains the regular security mask, AND their hardsuit locker contains the swat mask. this way it's all readily accessible based on what they want, and vox of course already spawn with the security mask too --- .../en-US/_Impstation/preferences/loadout-groups.ftl | 1 - .../Loadouts/Jobs/Security/head_of_security.yml | 2 +- Resources/Prototypes/Loadouts/role_loadouts.yml | 1 - .../Loadouts/Jobs/Security/head_of_security.yml | 8 +------- .../Prototypes/_Impstation/Loadouts/loadout_groups.yml | 7 ------- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Resources/Locale/en-US/_Impstation/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_Impstation/preferences/loadout-groups.ftl index f8fb7c30a42..7e12567a3cd 100644 --- a/Resources/Locale/en-US/_Impstation/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_Impstation/preferences/loadout-groups.ftl @@ -6,7 +6,6 @@ loadout-group-tank-harness-with-outerwear-aquatic = Tank harness for water-breat loadout-group-tank-harness-command-with-outerwear-aquatic = Command tank harness for water-breathers (in inventory) loadout-group-breath-tool-decapoid = Vaporizer for decapoids loadout-group-breath-tool-inventory-decapoid = Vaporizer for decapoids (in inventory) -loadout-group-head-of-security-mask = Head of Security mask loadout-group-hop-shoes = Head of Personnel shoes loadout-group-clown-mask = Clown mask loadout-group-clown-neck = Clown neck diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index a6b6e2d6c71..95f53b4a0f2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfSecurity - time: 72000 #20 hrs + time: 36000 # Imp, 10 hrs # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 86a91432c51..113e46be2e9 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -431,7 +431,6 @@ groups: - HeadofSecurityHead - HeadofSecurityNeck - - HeadofSecurityMask - HeadofSecurityJumpsuit - HeadofSecurityOuterClothing - UpperSecurityShoes diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/head_of_security.yml index 7979963f42d..07f1f0c5994 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/head_of_security.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfSecurity - time: 180000 #50 hrs + time: 90000 #50 hrs - type: loadout id: HeadofSecurityVeteranHeadset @@ -16,12 +16,6 @@ - !type:GroupLoadoutEffect proto: VeteranHOS -# A mask so the HoS can choose to spawn with the standard security gas mask that their new survival box removes -- type: loadout - id: HeadofSecurityMask - equipment: - mask: ClothingMaskGasSecurity - - type: loadout id: HeadofSecurityGreatcoat equipment: diff --git a/Resources/Prototypes/_Impstation/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Impstation/Loadouts/loadout_groups.yml index dd45727f804..e1137f76d1a 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/loadout_groups.yml @@ -241,13 +241,6 @@ - CommandVeteranSatchel - CommandVeteranDuffel -- type: loadoutGroup - id: HeadofSecurityMask - name: loadout-group-head-of-security-mask - minLimit: 0 - loadouts: - - HeadofSecurityMask - - type: loadoutGroup id: HoPShoes name: loadout-group-hop-shoes From 4f96ff6faeb567abf2de58b03bd9502e5420c999 Mon Sep 17 00:00:00 2001 From: Shaman <56280352+Sha-Seng@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:20:37 -0500 Subject: [PATCH 11/40] slime hair opacity to 75% per https://github.com/impstation/imp-station-14/issues/617#issue-2631597254 i think this is worth trying also minor improvements to the gatheredlow hairstyle (more body in profile, clearer silhouette, etc) --- Resources/Prototypes/Species/slime.yml | 2 +- .../human_hair.rsi/gatheredlow.png | Bin 4944 -> 5184 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index 814afb10cc9..70c62932a52 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -60,7 +60,7 @@ - type: humanoidBaseSprite id: MobSlimeMarkingFollowSkin markingsMatchSkin: true - layerAlpha: 0.65 # Impstation Special + layerAlpha: 0.75 # Impstation Special - type: humanoidBaseSprite id: MobSlimeHead diff --git a/Resources/Textures/_Impstation/Mobs/Customization/human_hair.rsi/gatheredlow.png b/Resources/Textures/_Impstation/Mobs/Customization/human_hair.rsi/gatheredlow.png index 53dcfa1bee37055a0bf8129f3a51a3cc88514afb..372a2e88dd3c40b6a06f0ca8f8b7e9b66cf0b316 100644 GIT binary patch delta 1585 zcmV-12G04=Ccr3=Bmu;cB_DrL4#OY_{r40*0s>V$j$ONCH`wv_6xy`QUg8sYx4j=;##Cuh>h6B-ioTRoiuqa?V+Q!CMb)bnZJS4Xs5jO-c0 zdKX%}!1iMl56PH_5o}@9!bsSK90uLLMWtE2eqr6|4)c=+NuA!O$!~wI72Deu6oq-0 zECd!&A3(;@Bpm{SQ9xss;xU-SViGLm-<}SnFX7c$6N03C82|tQg=s@WP)S2WAaHVT zW@&6?004NLeUUv#!$25@-=<1MDh_54amY}0v5SfbE>guJSSW3URvk<({evbANs5c3 z;979-XR+$w;;gHKs~~>}{(v|;I4QbFiQgrK7BSv&+{1g{`*QakAT%mWv%2O0O}EWd zJSJsxt5WC{VTd%xFe@|5NTe4t@Eu?G2=M(b%Cr3I{v3U3-eN#NBA#Q0X%lY{PjA`= z=Y3+4m1LFpoOs-%3lcwaUGeyhbJ1miXNqPfHBT%OOT`XWI+%ZzOpSPoIHGDg=Hnl7{Yi2u`FmeLZJY>pV2qvfPq_}cg^ct>l~*KK!$p?d;=UD z0;5IBUiW!-PiNo$t!ee|2Q+_j^d^Gp6951XRkMQviUK4!W-&2iFgPc~1 zH#svcWHVzmGc{s3Vq!EhlRgJb3o0lP7zge^ndA}nDckQzj=f`wG!`{QN8 ztn1w+8eKi}z~bSZH($?85@!}5;@U`-Jk&JJnCCeR!vJ^{LL_@B9a4U>L^$XC?Y`D} z7bk?4@AZIEYGjOAf#`iy$QXYEWm#_K1S;Pc1B@|yT`E8I@jMEu>l%a*N!zv{gh;g3 zyXP)7-WX%=HBB>a&VZsQ-k$6Ge%vw@DD}~Btu@ee*pvYP0K+i+`1>vEfDj_VNF%62 zmcq*cUDtuu+D4m3Uuz9r*X>Gw*T4j;0a8lqglXivt^+BhcMdKofYg6zV~k}2V+@p1 zUh=9^Z86J5qaEWAOo^2 zyB__OQZL5ib?FA|bjyEWS(eG%R($CO?CXpyphw`_?FO84P)dzk??Mk%2axvkWV-b^ z5fKp)5fKrAuxdU4vG;sHNFCBOf*E7BNwMckiK?nb&bgHj@V{}hq$`!K zF&>)}T5FI}?&5^1szxcLeI-siLQ9ded!k;%BlO*X zQl97V={K=TsS$ri_2`o5I2Gk)uv$2!hk;$i4VY j43CJ2h=_=Y__O#2vTmo9y4!s*00000NkvXXu0mjf?wi$} delta 1511 zcmV@bL$@qnjPx18 zG7BwUApJ2S4?HFs`5HzojF?<4I*)y;t8IU8&GrrxZJZd5 znZ*a-aRj)VK*q?`E+$sbjWZu+wvc~&IsjkaAXyXH3e#->00D$)LqkwWLqi~Na&Km7 zY-Iodc$|HaJxIe)6opSyr9~ z2Y(i;4ld5RI=Bjg;17R@vxAeOiz+EP?xH-)yYJ5$R!SxVd?In2>4rtTK|Hr<>74h8 z!>lSP#OK7*23?T&k?XR{Z=5R*3p_JyUyK@5gpMfi_=Wn!u`A^bYJuPws zjBEoJ*F8<%11>{%fUzfCG9*Xx(-O*M;QfrgsR)eT0z+%=+`8vDeE{+_tK}Qu;1HOq zQ1-gVyMz66`?se%zaMz@a;bFBn=SwV4R*7J0*V48Fg7$(g>&lq!f?o#8ewaYuL^&C6` z%Cda=-Z+kP$W*|*r-mD2fTlyx2mk<>rs=<*hpYpyewU`6FPt1u6a@$&mer=KFNA=i zC=Lz(tqZe@1EiEQV+=UwAcXkwnGgav=fD^PDdilx08)RWt+h)e_|$+em(_oj`v3q+ zsZ1%gC>nD0G5^u%X_}sPgCG&GwYY@b2G=W3>ws?>+~6eGYM`qlPUC=Ah42&o$4Ak& z?L3a-j8FWd?=RNzzE3m{CeT9wf#A2zl|~84cONiqktZPzrVksu4~X*&!M}}sOkWQJw2I*K8Hl*u#Q3>Zqk_@MnQNhgHL~@RQ50Ka8HzFnJJ|*D%%*dIKq{o z_PP?o@fZMrVHn^D!(TaK7>2ih=jIxI0DrHf`o525D=Ug(i3Zm+yt%IY8k}?Z#IS;T^3|>?&9SmoyajS7GVs;|{>X&8)5)u*;5)u-A!ymATd0Un3ljr~d N002ovPDHLkV1n^uyUzds From 8462a96924cd73f59e074fc6548346c3064dc246 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 12:59:15 +1300 Subject: [PATCH 12/40] Major changes to nukes based on feedback. Also seasonal variants. --- .../Objects/Devices/nuke.rsi/meta.json | 10 ++-------- .../Devices/nuke.rsi/nuclearbomb_base.png | Bin 1303 -> 1205 bytes .../Devices/nuke.rsi/nuclearbomb_deployed.png | Bin 1269 -> 1314 bytes .../nuke.rsi/nuclearbomb_exploding.png | Bin 484 -> 529 bytes .../Devices/nuke.rsi/nuclearbomb_gay.png | Bin 877 -> 1077 bytes .../Devices/nuke.rsi/nuclearbomb_timing.png | Bin 282 -> 290 bytes .../Objects/Devices/nuke.rsi/nukefestive.png | Bin 1429 -> 937 bytes 7 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json index a09d3bb9560..96b589fbc09 100644 --- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github), nuclearbomb_gay by PJB3005. New sprite by AftrLite(Github).", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, New sprite by AftrLite(Github).", "size": { "x": 32, "y": 32 @@ -17,13 +17,7 @@ "name": "nuclearbomb_gay" }, { - "name": "nukefestive", - "delays": [ - [ - 0.25, - 0.25 - ] - ] + "name": "nukefestive" }, { "name": "nuclearbomb_timing", diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png index d33e9aa71c243300a633ec80a6415066d4a8de20..40457f2760377fb2a3f0beb3a6b91e603a93201d 100644 GIT binary patch delta 1172 zcmV;F1Z(@33bhH4F@JAKL_t(oh3%GIY!p=#fWJiyw7Xe>LdT^E1zjuM+GSUSppm8$ z0|Y3=QG~Mhc`MJdqmIhZYkX62WLtP(n>iEf4*R-7;&J?Dl8b7`olk zQo8+t63X~6o!hxPTjNh3Oyne+z31FB=X~ehbMFj1kpH{b%zsK@sYgra6#On^OK1P_ zQo9Cl;M1K9MMqh_<`FSx=yN@5$U<}S&p+5nquMDs6nlNt3^A_DQ$(*$%S775{LuhHbcZ%FLz^|DhBmgxQw^XeX2f*dc(Xy6h3VY?=)f}!qA;xzvpJm^!HZgy!d&ERygmA}ccWxtvu?1{v< z)GLbOpek%5rcR1qRoG?$1-%*D1GBJV1%{%dV1KICEc?|Qj=Z#yANqdb9VP`_>XEGq z%N=fRVnf;k8sBt`(%Ri?1Jk>pu+*ca-sc9`okw3~+B-mY#umOj_Za{!!3+S_UOGu6 z5=sjW`Yn0yjzhTz^JgIzK)fO6VUh18N6T#Y?fC5HfF}o4zf>1zF8LT>rDhio83F!{?at(_s?=O_ mezO}8^Cjt$Kal@~`~gLNBP-?*A`Kt_0000&Ih3FU_0M_cN~Bn&3iE}E5L3sskUB5 zbowyYa8*cvL)Mbe5%2~_bSKsZOU3Kf6tJUtF8~{w*5EmRlY09~osCw{t?tL^5P6d% zbOh`c6JAEr2nakHOQ={Pah;lHl(pyl5xl{qUn&s*r+-7j=%~QS0Pcb0tf#dg9G*;{ z0gJMZ1mbE7GRdiPSAg_NY6%$~6>MSvQH30UmWFEi@bq*>=2(;f+7pT-c8dvbaD?8D zF}^OyV(rc{a^4-{YO9GX&#N42*@vT{1c2OL87Bi69TgZI6>!uKfYj1ZEjt|&+xw-o z0ZgroXn(;{&4k-6CiUda=Vw^Evy3dy3p{+i9f0SaTn@n5wqNImP-(}WqqlKYNMwlw zBDnAJDBIPQT$#>U4f zDSs@?OhA-Q+lFW?fzepN8=VF0wub;XHdIVk-(mp#t9-N_>`Ei89;&XEXe>egJPB=b z9f3$74wa<~&cJSah??9|0A8LO1-r7pW!~*KPmIFFHR<;`xeM%241p3eKJcLWRom~M?F39N9s)PK?} zDKYCvUOj~jpBl9Ubb`|KPu@!#ra6BDenP0=0A zrL{4S&T}^zy%A(KF+po%9zR{Y#cw*>6lbqZsrYPS;xBD7;a9_koYuxXwD#I>A)7nlY6}1!$bax7fJcnxZJ7)g!nJZYzSD`D+jRuA gB>rg;$^RAdClYw01U2h1umAu607*qoM6N<$f*fpe3IG5A diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png index 2f47ba58e3e13e77db27403e161ee11ebeb13c45..10a23c3add0a87453f7d6b8891b1d13a02ae4a5e 100644 GIT binary patch delta 1281 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 delta 445 zcmV;u0Yd(f1mpvdF@K&(L_t(&f$f;RZo)7Wg}(p=!PKD(;w{QhDNoah*Fd}muY<(K z%o9WmU6_(W1?hm3x+YE>r~FjhPs)(Q*XIZ)ITwR)V*>po3Q27PN6VkF(;h9LJsGnH zn6KyphuMy!w}B`m)kRG7`u0K|(AhU=Ii5UXoWMsyQR3?#r-9f_*}(?rKd zT|Mnb;LE4}jI!77l0+e??-KkOVgR_!GmvRM<}YxjcTEGPR;>?_El`@&270!ulsiz6 z?L~3yY9`D<7w+nZqObkMS0U31R%niT3}1`;?mnCkpe2Ckta2!im>@Y)|R$NMxWX9j%s z2Z|aL8>J>)d%`Fr_3a-^Yj4?Up8PYC{eg!z05-^5@L(UJyW1bIIxD-MC0m^o nwcTsfkW|%F)e3?j2zS9Zf~D_0sFWKf00000NkvXXu0mjfIzH1- diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png index 4a653dfc7b0c9997bb15c34b7363e486bd876c48..d83fceb96a336b3ba01f147ec8b1814b7c0c0d28 100644 GIT binary patch delta 1043 zcmV+u1nm3m2DJ!~F@Nt#L_t(oh3%GYXj5kt$A4*St9I;K61wyyYodvcZA8*-uovx` z`cgU+t2oP`xUHg-;g>RzwZxU`&>@a~8TnA9YoSBB6<1Lri_1Ne1cuMySm^*Dawh_86Arj4+T?;AUdH-GMC& z01nn4kpWJ&e19Sk5eNWU@MKvZ+-a2zHYqPMHY7%j}&I1qxJg>gY!TKYzo`gUk zbT62=wGsJio8@KBXS8)y%qM@J`>9ElPxxf6T$kj1!2@Ib@ve^W^C7eZ7%qIi9;D5`e@$dn54}GiI8xJ4g*wHU& zSd*dYRyhJva))qaoTk=x0Ge9c2}hLuza{+o-?l?@pvuePEuI%lDq@@gv~e-OzmX5eb{N8Yf%1i+OG9o$abzNxjH=6&x0 zaDQ%&-G9Xvg~a|+0CEC9kYlq0!w3WlBs-`57n2i0$gkAJ?D8q}HINGW45%bjlnh*B ze*9PF0kh3cOS}T;d`w_sHi`oW*G2~@knEc7b&pqbvJjdAV1@g6EeilM+dQm~i}mwd z*>+rK2Duql`oVlwG>LAum;n`PaJ@Wor;q7)w|_~hXp;dR25&JF&B0Rk2mnjjBl5rM zp{w(;pZJ+UJlV#^`mD2<+NG7ifJor(gAm{~8~_-Ncbfpl`s++C6cUue%utT7FaKVT zCQp#Z=%31SSBW&fxJR*_9YF1*8i8W7ldtqmJ|s(jet@Esf%#_&9?whN&H(Pzr+@(TT;Zak}88um`t9`ohcp1_q?yk z(Wk!@Y;z~O7yVYy<9KDSFxrJ@s8+ikhktrw0;!+YT^H;f9~>3znMq^cyx%7%l82q4 z4y z&y{FCY8$?PV;=w(hXg>$U8NV4ITcrf-zh;?=Pm;l|0GKzjWp8u8}TS&l$C}O5extT N002ovPDHLkV1fbu{rLa@ delta 841 zcmV-P1GfCN2<--tF@GmXL_t(oh3%DJNK;W9$3J(J6dAVItU3QAEK3&sL0Ex=A-)up z5sp(`3!yZl#clX@g z?QWSbzU&K!d+xpG{J!7w{r%24P(T6e3?|Cu$OKHpy!q<;Kz(Q zX8ASPisckxCd44XY~@+x+dKl`Y)O>h-kn%87U0^WHUPfq-;ZprpuQnOViGZ)mU<~b z%lUoo=#w}m`+w1GWk8w0aRz{a>FZb>CG!8}D-$}g2?nMYsRz1%o9H484m8us7=8dE zgz+<|i*THQP^UtC6o3HGl(IGSX)&9;Pw(D&P{Gr#2phcW`+M~v#zC><)~v$MAW=`R zN}hptZzhz`r$szR%kst;m|m3qVc=`ukbE}?h!HhRlz*%LRh2V%?S3nXrRBT=8l6^2 zey?u``++04$5uE9BCi8GaHxBK%M^HgS?5C2@qGeRC#tq1Tkx7b=Jd^C>Kh_F^0D-yWs>uUkqXPhMZ*&ujFL3onH{+mKVt=t2s;V5O7fl7#sRL;3NKaY12n`mW zuU|ZRbRS5|c?uE2IO3^;J^CaoP~G9`tev6ZVxwAwnGOJq0K0b7S|C+~K3~5KG|I3+ zgmfl8YHGci2#p-zN0EM9kEGhkQkyJ(*-5|uH4*>1|L0~C%*`e^-=-3tZ$oH(fR~d_ z&O+HOyqt700(eikEGJ8CmiQl&-ESzk|Aeas;i^%IT{VcKdstJP0tzUgfOWxNl7=6r TtJ`l200000NkvXXu0mjfbfb(b diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png index 97a1c831f336af5e3884d5ec86b72211984091c7..7b0783b3aa54713789923aad8e8424bcb636d070 100644 GIT binary patch delta 249 zcmV0-^$tF@M}iL_t(&f$f+v4uUWkMjv1_GP`&V2XEvxjA!Ez9)ZCfq6x;O zgEGL+-vWc*OBmXuL6#(FTfa)HzgZ~IRps5}l!?+1^iwd;B>vC)C5)eWNu{u9Nk}@=` z^e>}ip<$)p1Ia?eD*&Vk4J-X4NER9~0tyWw#DAgp0lg3CeLx5y#Ok<$#EKau=|$00000NkvXXu0mjf9S3O$ delta 241 zcmVSogpH^99NX zfo4_E9rtuWr24TZsQ>_nEwq=I6Z9(>fxf-63+q0-%PKGc_iDGbBw&m&rbwCX3N;C{ zUE%fjNwQrP0McZ;LQTSKj}dUT8)M93cs}6yfae3o7-OV9pzy6js9B)!u|q_~u^=$% r5IF^aX@|&p1s^*^ZUJ`)WB!jPMV46G=7wTU00000NkvXXu0mjfb2Mjc diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nukefestive.png b/Resources/Textures/Objects/Devices/nuke.rsi/nukefestive.png index f9c58ac8e64a4a199565a133bec97269caea63fe..640cf468278a27c3f57f02b06ae9584442716850 100644 GIT binary patch delta 928 zcmV;R17G}=3#kW?7k?lK1^@s6b9#F800001b5ch_0Itp)=>Px&V@X6oR9J=WR!wLV zK^T3BS`FJ;r9q4#(HK;W)<#LN4MosuKuQrrDCQy()Ps7kRu4f?G4vpU2R$er1U;pA zXltWbY?U@{BcWtcp&Cmp5`rSTXq2T@3gaQ}WH;HwCLZmBg@2j1-#72=H-8KK@6i2A z^6h&eDz{tRPB@)gDjsiXHNrlBfC9kL!~2U2ojK82kqK3Bd!2`B1%-d`EY9Z-&|BBf z0{|Kt8gu|4iXsJobXq_pMsRoVD)zrN0RZgRPNLQAL?lK~)?9m?hl+QCbaL-*)g#^s z(g)UkR2COSk$=j9N{FIJ2}x2ylGNu9&h0-A1!ZGuSLqjPP?R;luipEB+0&nkbfkV=bw)zSX`I41-7pV@X`D; zKhTGBYui|E$z32!20Pa z0Kmshj)kNb8Bv;Bkb#`Id?b6QFq4JRR*&`5Q;7dEu{hZn02QwUNpT2$onyy)#g|d| z2d~2<@M$sw0CtPX0k;Cyt@1j+|W1xK=S4) zQE9)N#$U^4+L4Px)Pf0{URA_=V8%B4Rkz+!DKqt0IA7DP!y$fLu{his$^#mmwR_FZGRCqHn!RC)4AuI`}=)= zf6lq>7hZQrGhswLbqeNgffr|0qi_1AY&T&h2mnY6sw9B!jw~UbI)%P4PHZ})BCt%P ziOJTxJF>)do{fmfO7@_?^j7gfMp`~1To-%4<|Nm-9bTNJ#~;$ymapoM`Cilo*@Gz9 zwG!E#0zkXd3x5znKq!ik{C-IzduwABxrzmV9)F1Zi~aiESmftSG?`q>KMk*_5;ZC z5XNjIOf>x6sZQP4#K^U10df@!-{yrN`)z%F_o8Hd+~W_yqGWblQe9lLsHO4kbWq{4 z3a{5I!Gsd{S{!=X08`|4#YVUeX`pOa8Yml5qYi(lL^f zTiF{5=yMSS8q1SRQ3Fw(8}V#(EnjbZSAW*hzT;AYI$rfckKVW4M)8>yq!wF|JqQy4 z?L{Mra2-;5lTD;I*&;ePqs=Oo9CgrJ-Nl2u4}bOOwQ)n~7_vKsTj4OWJB5?MAYjh0 zPN2x=0-(I{Sxg2n{48noJ7;Tt{o{3CE~7m4ucY>4<%BOZRL%@FF1cA zksj2Hxoe)A{A}3NPq+?AFG08tX<`#byMKa>xU;pJ(}xmGb9LF-Dyb;AT5pe-Go6C= z^iIjxgvN^~+ELV;yKA1aHxwZ6asW?XUxX7a`gN7+`CrhqQ~x+cl;HlFpj6(5phbN) z-rLbWtD5nTEq0cUE;p0=@{fI2>+Otw`T+p@_FvHF^$Zxl|M%AfrHRg?VZ)|=Q-79> zgaB@wd&!M+FA4aEaTa&c)%}2d`!8_f*k%d~3(Ut@_8^QTrUTi7xS5k9G#jz(e0FM& z=(v7d6c!eUj_b$&l&_c&iZUgG8i^To9!DH;#POd-TpyScj*G*ys}E$>rg5+8@!z5k zMEz@~=>tVR7ezi7_o^O8eOc7j3V&_Ct_6(u0YLu6e)2E&GuiJ9vp!H;D}3>K=8>C@-EM?K44Axkdb4P=mVc`(W4L5 zm2mjSe^?)&xp{W=0XpVRPak-H{(Ruo`oQkh6+CS9M`X?9oXPb8QwdH6gMTX1ZQJyW zXpw8(4{Gz>UlWu{R-9+?T19uRMSrC-m4~fjQb01HAdk<=N8*epqj3=~v5P)IjdF(g%d1%(6Z({^R6Ti0cD! e#1Y3t{0?$lm$h`3?zR8`00{s|MNUMnLSTaV8NL|+ From 76ee350c12c530d77f48ce49d7132722316651fe Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 13:07:33 +1300 Subject: [PATCH 13/40] test --- .../Specific/Chemistry/pills.rsi/pill22.png | Bin 221 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill22.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill22.png b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill22.png deleted file mode 100644 index 426d4019cc687f3ceda7314f19e53749aa14b7af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(>+}rLn2y} z6C_v{Cy4Yk1sZU%Nf=C8_3-QK>pa`1N&Rsb5AWW0KtoH*OE&x=v%9*-|N6?%Z~J%e zw&toWX)8-hkGi&e_~gl`vn1=ruF0(n&wb`{e(RFIBVz9J zu(q|<457-|rJ`_19C-7XNa5W`fF&L$2vBCUd(T)BwAJ$C`nm&)#6$5+k`( Qpc5H9UHx3vIVCg!0Pi7CEdT%j From 6be95f7a08e8b598c6f531baadf8b5291dd7ab8f Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 13:08:39 +1300 Subject: [PATCH 14/40] test2 --- .../Specific/Chemistry/pills.rsi/meta.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json index 7c3e3af8b64..6a6094ec3b0 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json @@ -28,6 +28,18 @@ { "name": "pill6" }, + { + "name": "pill18" + }, + { + "name": "pill19" + }, + { + "name": "pill20" + }, + { + "name": "pill21" + }, { "name": "pill7" }, @@ -61,18 +73,6 @@ { "name": "pill17" }, - { - "name": "pill18" - }, - { - "name": "pill19" - }, - { - "name": "pill20" - }, - { - "name": "pill21" - }, { "name": "pill22" }, From f2e9915032c4b42cbc04dad015f0ae8e0dd1f43d Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 15:00:52 +1300 Subject: [PATCH 15/40] Smollified brute pack, New smol ointment sprite --- .../Specific/Medical/medical.rsi/brutepack.png | Bin 709 -> 342 bytes .../Specific/Medical/medical.rsi/meta.json | 1 - .../Specific/Medical/medical.rsi/ointment.png | Bin 593 -> 463 bytes 3 files changed, 1 deletion(-) diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/brutepack.png index b782305b07988ef9ba22c804ab8ac66b7371a337..5306897dc7eca5bfd9ab4da15c0402891b1d8f00 100644 GIT binary patch delta 303 zcmV+~0nq-%1=a$PFn<9MNklt2 za||_SPn~24=eY~#dr#Rr+3KSK@85EuE8NS@V$H1eg#IXDL6}Vi|>o$gYqE!qG41Wv^7tdc|NJCP`u=gM# zqZt?&7#Ns{Q3Nye%l&&OmLt=+)KSF&FhhA1mEdCYM5`Fy9Abxu04{Ze0Kqt#=V$oe z!cHB|e`TG|aPj;V40Za3Iw)!2#G#uENt@0SG@qb?0|yQ;-0LfZ=YoZw1R3NNFn##& z!99j}zV~pxQYcYBql1G3A>&8EC>RB!U=)l31^`SBTkSj^HID!Q002ovPDHLkV1k>L Bf=~be delta 673 zcmV;S0$%;r0>uT8Fnaym*%Zz}?)BZ> zd+D9&*8G-y-*>nm9e5VSna!<2bAM%-k$Yqx;{* zrEmy&fcX+`VIBbhU>aRiOPVJ>m5gIy`v>u}u_%{E|GI_IBA5c)iGpxwL2EBxd-xBZ zKL+MA#ODg|Q~aQHmwxYgo_~ID2OF7b>-4QfM9k4;Sofpr>qMqmS*eK*w0szp{ z+c4W5@=SmK#D4-H_!2NE?Ba4Nfu7!mC@Vm*0^oo>V53#rS3Z6*!iW4wi|+Sv`v9lvmv%VA!b zcavAS*YWMiea+uaOknc-IS;2QIns5f?$kp<4$_I!Hj25a{ARkj3KQmMrIDqqa*Lo1&24_;K7l z?%n%!~K%uqX3^-l@0PJjUC4Zt4H3Xw8#5N1W=n8qR zL!RqUwN{U8D?_M7jTl`a!!*e-O=6pcv5A-pT6oB=0suB&j{yMbRvDF29uwPyD9Kc< z)yXi;AKUO;=T}D>=m-IzW3&?h2-rY#eb;|ax5`*P$l?JCy`S8Ue3*eP=!>|!xrS|Z z0eso7uj3} zOA9GHKWfDBLLea{SuiLf_w)wa>iWY0Kr8Qq;{{Yod8kD#`hmnrFfB04e7POTjLLmgw9@4nvjvNVBu#>ll^K)n}ghtx?T^e2T zg@bqRe*E6&zVE%?4;EVJKPx5)u2yQ=P^n8}hHjttyYE8hy?-fLe0gP+QZajJT)Wc) z&|x7$0|0oAjpx`T)0rudcBhBu*phTIfWgq6g1M-n+y86qwE$S%Rt(Ulp-84P0MtJn z1Mu?UoiV^*=mxQ&bR#tCggnQlRLm03o5b@brDAsMh-7gwfYoiq43%PiV+~~{P=(QB zCRpECe<&$Gc6$D`~2z0pj5znz%8of99#?bAvys|3JC8}D5Tv-F$ zyZ>OyYD1;?`sFhqtA=6+OhWP+MLA~z u0JybO(It25PXKVOQ~LF%Gv{3BpXv{|=fssRq5bs$0000 Date: Sat, 21 Dec 2024 15:04:23 +1300 Subject: [PATCH 16/40] gas analyzer palette tweaks (now uses atmos palette) --- .../Specific/Atmos/gasanalyzer.rsi/icon.png | Bin 537 -> 534 bytes .../Specific/Atmos/gasanalyzer.rsi/working.png | Bin 925 -> 929 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/icon.png b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/icon.png index 8718cf1d3af994803482271b89d87a6fd00b8e0f..ff90519c1f455114cfb021563d5b83434b8bf765 100644 GIT binary patch delta 495 zcmVFi1AXiEgVh4u<2g#sA z@DIq~kS$xG(~+g2bjYgUkfn6X&_x{-p&c}+lst+?;*fwTB;hEuLkZIBpgC=$a=$Z( z!hM&=``vrr`+oVo-}^lX5a6*QnlPQ5RdfJyR?&$jOvevT=zlIE%$aGT3DYrWrhRif zk#4x^G&V6w?c~@U0eW?t){m-ZUXg%k!gPv-w`_mey>ZRa(IIMM$Fm4cBA{2dSzax< zZifMpfcA@V)XO=H?8=R6RHaONtpwZE;R^sTl4&;c3!K@VL9(#Uto4b_wUTE(u>e&m zb7prKU;T|<`+x4nJF!t3OC40DEaJOU84d%!1ZZJh6u*_rkAToroYU8E%Cmv^y$Bc? zGcXpdfw(mPAiW8nzjCy&eyh_z-}cWdq`EWwiwGc+%3vhZz@_7UX+}~R7&B;nc<-4{ zbO^Puj*(2GDrG*tTcq1m?#}@z|o=chSaOu0E}GBTLL~`Wtd&cT-%cStylta3gG-* l(0BbmB#)5*0RlV-`~}rHpe>q1H7WoA002ovPDHLkV1hrp@g@KO delta 498 zcmVQ#L6FP+uaS3=7djCST z2s$`OiP&@!9NgOCU=|UF4y}mkIi!R;kL_#er*Hk$`AYwX>f;vAMnbV9v?OF^B6ru0;eS0<2P%rLW%{ zx2=Fkz)=4c>Ct0CG3~*eT2W^qd&T_EXAl4oifMd#pQBKz-&u=Cf=n+C13A}xVga?H zPN7n#ywX9}>3=ULe%{vuBPO+?F5-Jq8@2+T1jHjjQT#E8O8}q^w!@4Cgqxz)b^LD# zP!b&^-rns5Y5hTX5WQA@)A#WZR~oxo%PBX2rC2S~lUl+eiqz>Vwu-D?f!T^nrY$6kQ#)lQ7ODdH1P z!;f!X+38I9-Zdj{GPi8Hu0MF#18cv#Ir^^L8c0^D+LZB9#OJ9EC&tI_9m$PREP=QL oaD6Yh?fM3i%ZLvjKK=>(0UEcU23(icegFUf07*qoM6N<$g7fa`NB{r; diff --git a/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/working.png b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/working.png index 60c508d2068dcfcac6c42630991ca748752522d8..b3c36790bed9ac0134c9d6e02927cb71502a9b61 100644 GIT binary patch delta 797 zcmV+&1LFLh2cZX$F@IZ0L_t(|ob8>zYZGA{#veP)^i_)}h0JgLJS% z@DIpPuv<65DRi-eLsx|kU0gG`)DDG$4mF^Z9%3SKXrV1MB?vl5ES`hjnb;rrzL(_f z`@QG0l)Opb&wKafF7I95hXV*9gb-pE*}NCbmzDwmm@h2_*?+tj(67!woI!X~lgQ@1 zz?+(k(@moNmsJ0uz0$d>*HQcYDf$Zlt$GvtU$&L|O{!mMpxL|^EG<64#+$ciex_Re z2!Cy}Cp$r+KczB&R=tU5%PUc}`;A1uQUMNcj>5lv5ANLaGe6^3$~atI0XDYdjx7;> zr2+teJ5j*;!hZ~on~js5r5)TYy~O(JifXrs^(z;^uat4zY+!Wxd(`IC4$#OAV`sJj zzfxB1Qrqv;4x)Bb{zh&%dQZo%T!41kcYq1PjW;=t(A{1L6|}AcQfWu2z1xHyr*_b> z^ZV^@b_d)4Id#}&G68&ly zD>v>0skC!$rGI{S_j`u0z1jV%QGtHtBOo(fgga3H@VDaO)GRYy1V&u!zj&(JZDRdO zU&5)h19zeTzfwkZ@D`4C{YVY~SX@x)PMLQ9kB8Tc`n$FL%Cn%b>f!9euaq$`Hjd2J z4)C~yqkmmrc@R4O>fxYKf48<@`8=8O?gyFa;;HW)?fPiFe$|`vuTa18cfjRuUy*yi z)^S6sRc`_ShW@@AdgW=Nf$z{{Lw|w=bOmT$J_s68y{u81^$CVA#)mfMLIOK45)eM#TDjU4OT> zUppU=+1iO-+q^zs*Waz}lLrGx9iJZ{2`lpflCUx#APKwj0RpiuA0Q2@o*y6)>zzYZGA{#vi3LgDnoBLZ<{u6L1P8rAwiQU>5%X zs|Y%D5DC;e2@c&<9Lyr(;7~=Zi|$4cg${~PiXv^2cIeWAg;q(H9))v|yWY_s_`a9q z?fbpwvlQODzMuE*%O&q!-iHGSA%qZO7ullYP0v<50GOVwcz@ZVbE? zI-WB=7N?s;`%kI&xgHE*-f~t5L<1${rqnh&{GM z_>~F(0DZ$HJb%13kEQk91KSFj6z)E~0$^UX+r;{n3(#s*v9!L6wO9Q?+dyp-TlqoY zS`)2CRkcfP|3GasXgB5G$`9^u)bJ}8AWZlKn7}`HljHE+kwPe-bstd3q?Fp*jqe$# zZAMOhxBXlB!N`f%@oQZHrHNkPo(muyYIXm$cY%}R_kT%i`?U&?8|lZ$<%2VUPJjMN z^ef%0T*wW1g-q($N>@L-SX$r3$NE~^Z-gZJm9K#EOgfkc`xW=6X62bQawEXh?G4p# z6YE#{5-wy?=o>Df)u>{0=Pl}s%|H$S<5&Nvbf-+%KY3}+sJ~suuRII#tM1P}T8%17 z6TNuzt$zm#ug{{s*i;^bj(_FX8KeGo9l!GDz4A=@&~5d_CLX)w-a0~{4! Xq2hB??gfRD00000NkvXXu0mjfnXrx= From 8faff5c3a46fa0e2224ddb9addd9ba9e267c2b95 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 15:46:40 +1300 Subject: [PATCH 17/40] fixes to inhands sprites for Nullrod's arrows --- .../Weapons/Guns/Projectiles/holyarrow.yml | 2 +- .../nullrod_arrow.rsi/arrowprojectile.png | Bin 0 -> 189 bytes .../Objects/Misc/nullrod_arrow.rsi/icon.png | Bin 0 -> 204 bytes .../Misc/nullrod_arrow.rsi/inhand-left.png | Bin 0 -> 239 bytes .../Misc/nullrod_arrow.rsi/inhand-right.png | Bin 0 -> 238 bytes .../Objects/Misc/nullrod_arrow.rsi/meta.json | 25 ++++++++++++++++++ 6 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/arrowprojectile.png create mode 100644 Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/meta.json diff --git a/Resources/Prototypes/_Impstation/Objects/Weapons/Guns/Projectiles/holyarrow.yml b/Resources/Prototypes/_Impstation/Objects/Weapons/Guns/Projectiles/holyarrow.yml index e5f664a6828..d5e22c70168 100644 --- a/Resources/Prototypes/_Impstation/Objects/Weapons/Guns/Projectiles/holyarrow.yml +++ b/Resources/Prototypes/_Impstation/Objects/Weapons/Guns/Projectiles/holyarrow.yml @@ -8,7 +8,7 @@ - type: Item size: Small - type: Sprite - sprite: _Impstation/Objects/Misc/nullrod_bow.rsi + sprite: _Impstation/Objects/Misc/nullrod_arrow.rsi layers: - state: arrowprojectile shader: unshaded diff --git a/Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/arrowprojectile.png b/Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/arrowprojectile.png new file mode 100644 index 0000000000000000000000000000000000000000..14874447b82646a1bac7040a1fbe9859580c072e GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}<(@8%ArY;~ z2@cyMvV}VX!@O1TaS?83{1OOv3L}CB{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d7edf6c50179e4545ba6255d051b2e2e601ac6b8 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ZJsWUArY;~ z2@_oVDe!dryr&zqN*#3D zFP3bTxhvQ`$%1W}>)`_j4j3p*>u(A);BsSOV9?~+JooGL*JVH#F?hQAxvXAD!FJZ+r8oVwv?T+-%8(nR=4(d{$+Zo@<*lAFK&U4JC&k; zfZV{qu=UOB8}B!l@g3i`WRCys*tL(nb4qqa9-l6^=_SY3wrnG(w+m^7C4<3_Bk23dT20vUoL38)Sy3tDnm{r-UW|?Q36Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/inhand-right.png b/Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..240dcd5ee253990e6449befba763a5049bd25771 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|R(QHNhE&XX zdvhc20R=wb;_2$=vd$@?2>>p4UBLhV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/meta.json new file mode 100644 index 00000000000..e998ce3fbf5 --- /dev/null +++ b/Resources/Textures/_Impstation/Objects/Misc/nullrod_arrow.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by AftrLite (Github), with inspiration from /tg/station.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "arrowprojectile" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 0c2893983bfa75abd459e134e9305bc2f7d9d452 Mon Sep 17 00:00:00 2001 From: Kip Date: Sat, 21 Dec 2024 13:49:15 +1100 Subject: [PATCH 18/40] camera stuff --- .../Entities/Objects/Devices/flatpack.yml | 9 ++++ .../Machines/wireless_surveillance_camera.yml | 47 +++++++++++++++++++ .../Wallmounts/monitors_televisions.yml | 26 ++++++++++ 3 files changed, 82 insertions(+) create mode 100644 Resources/Prototypes/_Impstation/Entities/Structures/Machines/wireless_surveillance_camera.yml create mode 100644 Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/flatpack.yml index 7aa78adafda..6c478b6b8ad 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/flatpack.yml @@ -21,3 +21,12 @@ components: - type: Flatpack entity: ChemMaster + +- type: entity + parent: BaseFlatpack + id: WirelessCameraMovableFlatpack + name: wireless movable camera flatpack + description: A flatpack used for constructing a wireless movable entertainment camera. + components: + - type: Flatpack + entity: SurveillanceWirelessCameraMovableConstructed diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Machines/wireless_surveillance_camera.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Machines/wireless_surveillance_camera.yml new file mode 100644 index 00000000000..1ae8b33ba01 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Structures/Machines/wireless_surveillance_camera.yml @@ -0,0 +1,47 @@ +- type: entity + id: SurveillanceWirelessCameraPocket + name: long-range handheld camera + parent: BaseItem + description: A handheld wireless camera set to the entertainment frequency. + components: + - type: InteractionOutline + - type: Eye + - type: WirelessNetworkConnection + range: 500 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + density: 20 + mask: + - MachineMask + layer: + - BulletImpassable + - type: SurveillanceCameraMicrophone + blacklist: + components: + - SurveillanceCamera + - SurveillanceCameraMonitor + - RadioSpeaker + - type: ActiveListener + range: 10 + - type: UserInterface + interfaces: + enum.SurveillanceCameraSetupUiKey.Camera: + type: SurveillanceCameraSetupBoundUi + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: SurveillanceCameraEntertainment + transmitFrequencyId: SurveillanceCamera + - type: SurveillanceCamera + networkSet: true + - type: Item + size: Small + - type: Sprite + noRot: true + sprite: Structures/monitors.rsi + layers: + - map: [ "enum.SurveillanceCameraVisualsKey.Key" ] + state: television \ No newline at end of file diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml new file mode 100644 index 00000000000..f1356f88240 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml @@ -0,0 +1,26 @@ +- type: entity + parent: WallmountTelevision + id: WallmountTelevisionMini + suffix: entertainment + name: mini television + description: Finally, some decent reception around here... + components: + - type: Sprite + drawdepth: WallMountedItems + sprite: Structures/Machines/computers.rsi + layers: + - map: ["computerLayerBody"] + state: telescreen_frame + - map: ["computerLayerScreen"] + state: telescreen + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.20,-0.10,0.25,0.35" + density: 250 + mask: + - FullTileMask + layer: + - WallLayer \ No newline at end of file From 385a684c8f94342adb7de7c5106b627d26e9ff8f Mon Sep 17 00:00:00 2001 From: Alex C Date: Fri, 20 Dec 2024 23:00:01 -0500 Subject: [PATCH 19/40] holopad fixes --- Content.Server/Holopad/HolopadSystem.cs | 38 +++++++++---------- Content.Server/Telephone/TelephoneSystem.cs | 2 +- .../Telephone/TelephoneComponent.cs | 1 + Resources/Locale/en-US/holopad/holopad.ftl | 1 + 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs index 6f124e3da11..fce71a2cd15 100644 --- a/Content.Server/Holopad/HolopadSystem.cs +++ b/Content.Server/Holopad/HolopadSystem.cs @@ -119,7 +119,6 @@ private void OnHolopadAnswerCall(Entity receiver, ref HolopadA var source = GetLinkedHolopads(receiver).FirstOrNull(); if (source != null) - { // Close any AI request windows if (_stationAiSystem.TryGetStationAiCore(args.Actor, out var stationAiCore) && stationAiCore != null) @@ -128,16 +127,15 @@ private void OnHolopadAnswerCall(Entity receiver, ref HolopadA // Try to warn the AI if the source of the call is out of its range if (TryComp(stationAiCore, out var stationAiTelephone) && TryComp(source, out var sourceTelephone) && - !_telephoneSystem.IsSourceInRangeOfReceiver((stationAiCore.Value.Owner, stationAiTelephone), - (source.Value.Owner, sourceTelephone))) + !_telephoneSystem.IsSourceInRangeOfReceiver((stationAiCore.Value.Owner, stationAiTelephone), (source.Value.Owner, sourceTelephone))) { - _popupSystem.PopupEntity(Loc.GetString("holopad-ai-is-unable-to-reach-holopad"), - receiver, - args.Actor); + _popupSystem.PopupEntity(Loc.GetString("holopad-ai-is-unable-to-reach-holopad"), receiver, args.Actor); return; } + ActivateProjector(source.Value, args.Actor); } + return; } @@ -161,8 +159,7 @@ private void OnHolopadEndCall(Entity entity, ref HolopadEndCal !_stationAiSystem.TryGetStationAiCore((args.Actor, stationAiHeld), out var stationAiCore)) return; - if (TryComp(stationAiCore, out var telephone) && - telephone.CurrentState != TelephoneState.EndingCall && telephone.CurrentState != TelephoneState.Idle) + if (TryComp(stationAiCore, out var telephone)) _telephoneSystem.EndTelephoneCalls((stationAiCore.Value, telephone)); } @@ -216,7 +213,8 @@ private void OnHolopadStationAiRequest(Entity entity, ref Holo { var receiver = new Entity(receiverUid, receiverTelephone); - if (!_telephoneSystem.IsSourceAbleToReachReceiver(source, receiver)) + // Check if the core can reach the call source, rather than the other way around + if (!_telephoneSystem.IsSourceAbleToReachReceiver(receiver, source)) continue; if (_telephoneSystem.IsTelephoneEngaged(receiver)) @@ -231,10 +229,9 @@ private void OnHolopadStationAiRequest(Entity entity, ref Holo LinkHolopadToUser(entity, args.Actor); } - if (!reachableAiCores.Any()) - return; - - _telephoneSystem.BroadcastCallToTelephones(source, reachableAiCores, args.Actor); + // Ignore range so that holopads that ignore other devices on the same grid can request the AI + var options = new TelephoneCallOptions { IgnoreRange = true }; + _telephoneSystem.BroadcastCallToTelephones(source, reachableAiCores, args.Actor, options); } #endregion @@ -355,6 +352,9 @@ private void OnHolopadUserInit(Entity entity, ref Componen private void OnHolopadShutdown(Entity entity, ref ComponentShutdown args) { + if (TryComp(entity, out var telphone) && _telephoneSystem.IsTelephoneEngaged((entity.Owner, telphone))) + _telephoneSystem.EndTelephoneCalls((entity, telphone)); + ShutDownHolopad(entity); SetHolopadAmbientState(entity, false); } @@ -611,15 +611,8 @@ private void ShutDownHolopad(Entity entity) UnlinkHolopadFromUser(entity, entity.Comp.User.Value); if (TryComp(entity, out var stationAiCore)) - { _stationAiSystem.SwitchRemoteEntityMode((entity.Owner, stationAiCore), true); - - if (TryComp(entity, out var stationAiCoreTelphone) && - stationAiCoreTelphone.CurrentState != TelephoneState.EndingCall && stationAiCoreTelphone.CurrentState != TelephoneState.Idle) - _telephoneSystem.EndTelephoneCalls((entity, stationAiCoreTelphone)); - } - Dirty(entity); } @@ -670,8 +663,12 @@ private void ActivateProjector(Entity entity, EntityUid user) var source = new Entity(stationAiCore.Value, stationAiTelephone); + // Check if the AI is unable to activate the projector (unlikely this will ever pass; its just a safeguard) if (!_telephoneSystem.IsSourceInRangeOfReceiver(source, receiver)) + { + _popupSystem.PopupEntity(Loc.GetString("holopad-ai-is-unable-to-activate-projector"), receiver, user); return; + } // Terminate any calls that the core is hosting and immediately connect to the receiver _telephoneSystem.TerminateTelephoneCalls(source); @@ -716,7 +713,6 @@ private void ExecuteBroadcast(Entity source, EntityUid user) var receiverTelephoneEntity = new Entity(receiver, receiverTelephone); if (sourceTelephoneEntity == receiverTelephoneEntity || - receiverTelephone.UnlistedNumber || !_telephoneSystem.IsSourceAbleToReachReceiver(sourceTelephoneEntity, receiverTelephoneEntity)) continue; diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs index c5f1b7c9eb8..232da71e377 100644 --- a/Content.Server/Telephone/TelephoneSystem.cs +++ b/Content.Server/Telephone/TelephoneSystem.cs @@ -194,7 +194,7 @@ public void CallTelephone(Entity source, Entity source, Entity receiver, EntityUid user, TelephoneCallOptions? options = null) { - if (!IsSourceAbleToReachReceiver(source, receiver)) + if (!IsSourceAbleToReachReceiver(source, receiver) && options?.IgnoreRange != true) return false; if (IsTelephoneEngaged(receiver) && diff --git a/Content.Shared/Telephone/TelephoneComponent.cs b/Content.Shared/Telephone/TelephoneComponent.cs index b8dfefc0438..db386c45ab4 100644 --- a/Content.Shared/Telephone/TelephoneComponent.cs +++ b/Content.Shared/Telephone/TelephoneComponent.cs @@ -181,6 +181,7 @@ public record struct TelephoneCallEndedEvent(); [Serializable, NetSerializable] public struct TelephoneCallOptions { + public bool IgnoreRange; // The source can always reach its target public bool ForceConnect; // The source immediately starts a call with the receiver, potentially interrupting a call that is already in progress public bool ForceJoin; // The source smoothly joins a call in progress, or starts a normal call with the receiver if there is none public bool MuteSource; // Chatter from the source is not transmitted - could be used for eavesdropping when combined with 'ForceJoin' diff --git a/Resources/Locale/en-US/holopad/holopad.ftl b/Resources/Locale/en-US/holopad/holopad.ftl index 52c0c5a95bb..554c5f08b49 100644 --- a/Resources/Locale/en-US/holopad/holopad.ftl +++ b/Resources/Locale/en-US/holopad/holopad.ftl @@ -33,6 +33,7 @@ holopad-hologram-name = hologram of {THE($name)} # Holopad actions holopad-activate-projector-verb = Activate holopad projector holopad-ai-is-unable-to-reach-holopad = You are unable to interface with the source of the call, it is too far from your core. +holopad-ai-is-unable-to-activate-projector = You are unable to activate the holopad's projector, it is too far from your core. # Mapping prototypes # General holopad-general-tools = General - Tools From 3752910ac994ed007af6e1a667cb1af0f2e080e6 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 17:39:27 +1300 Subject: [PATCH 20/40] It's a smessy new smes. --- .../Structures/Power/smes.rsi/meta.json | 2 +- .../Structures/Power/smes.rsi/smes-oc0.png | Bin 114 -> 125 bytes .../Structures/Power/smes.rsi/smes-oc1.png | Bin 145 -> 132 bytes .../Structures/Power/smes.rsi/smes-oc2.png | Bin 145 -> 132 bytes .../Structures/Power/smes.rsi/smes-og1.png | Bin 101 -> 123 bytes .../Structures/Power/smes.rsi/smes-og2.png | Bin 155 -> 161 bytes .../Structures/Power/smes.rsi/smes-og3.png | Bin 160 -> 179 bytes .../Structures/Power/smes.rsi/smes-og4.png | Bin 194 -> 221 bytes .../Structures/Power/smes.rsi/smes-og5.png | Bin 200 -> 238 bytes .../Structures/Power/smes.rsi/smes-op0.png | Bin 106 -> 121 bytes .../Structures/Power/smes.rsi/smes-op1.png | Bin 143 -> 133 bytes .../Structures/Power/smes.rsi/smes-op2.png | Bin 111 -> 129 bytes .../Structures/Power/smes.rsi/smes-open.png | Bin 967 -> 1069 bytes .../Structures/Power/smes.rsi/smes.png | Bin 869 -> 1046 bytes .../Structures/Power/smes.rsi/static.png | Bin 884 -> 1100 bytes 15 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Structures/Power/smes.rsi/meta.json b/Resources/Textures/Structures/Power/smes.rsi/meta.json index 2ca8d1fb226..8a2b2ff76cc 100644 --- a/Resources/Textures/Structures/Power/smes.rsi/meta.json +++ b/Resources/Textures/Structures/Power/smes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/1f8c6c3953acab27de96bc62173f924073831f2c.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png index 5579432d3fed36949e0cc0872d2886509b9596e4..f6db006f8990f3fa3767293b67e656af61acd841 100644 GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a?Cwl978f1 z-(FA@JzyZha`3YVzhUtIA6`tKv=-L0>E2@js$oc2WVbu^<@Vz*yk;9e$YNlqd&Sxn VBqV=ND~J;$?dj_0vd$@?2>|~nC1C&n literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzOHUWakcif|7dP@UDDW^lzCXgJ zbNJs^~SEYfn`1yks09?3Qu6xNq_~rhu2)AO3Qy+|@kEcHy>!WX4CG!$3nA NJYD@<);T3K0RSJ?C9(hj diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png index d624672613b71529b53390c16b976c4cd8af7851..02d08016cf03362038202be34cfc703fb7a7920d 100644 GIT binary patch delta 103 zcmbQp*upqLC4sRx$lZxy-8q?;3=9l*o-U3d8I5nxE)+bVAi!`?eCERc`(7y6J}~5G zo2Ocf!w&uIo;8O5YHt-MZ(6)JHT1s;14Fyd7GZ(iyBOZdfmC?9`njxg HN@xNAv+pJ@ delta 116 zcmZo+oX9vqB{#y;#W5tK@$Kb}oDB{Ocf!w&uIo;8O5YHt-MZ(6)JHT1s;14Fyd7GZ(iyBOZdfmC?9`njxg HN@xNAv+pJ@ delta 116 zcmZo+oX9vqB{#y;#W5tK@$Kb}oDB{N1x91iLGAIhL9Nap+p5=+NU-!Y!?|jRz s{_q4U0Rg)x_`>{Qt)^k8hI`*Y}L0s_7spPgg&ebxsLQ07Ek(r~m)} delta 70 zcmbkA(pQZ062dxwDj$;YZlk Xh#9O?-I&;(gM>X@{an^LB{Ts5guWPA diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png index 0023750405154e83682e95d82f9251fad89d2fee..52203a6937c6618ba8b19d1bff9723eb10dd2a69 100644 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a-uz5978f1 z-=5pZ+2A13{4iqQCo@47_Y0Q!JhF~{1(T%}&92{;(fCn6LCv*;1*icG8tNsgdUBFK z8HHzN9o2m6eyQrJ-tQl~WF9Kr)O9WD`*3?dgUv3+kXb@M*bhr)gS2?M`njxgN@xNA Djwdx9 literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCq0y z;uumf=k57}oD2#)EC+?(cw}!{@g>FgVn3^gi(py&&$}wG3xNt@;1Bx;weXql(9m@I^DtoY)pX5lN%qYU5`;UKJ<Z4F z;uumf=k0}qoIurX5A8D+&)POKYuTp@OpC5OwH4U&Gx6$kpgI^RVE%R`Y;&sT($zNX u88>1a-0}`ct^EGCVcn10&JAyXstOpI_&Bz|k7Bw3(&Fjr=d#Wzp$P!e!!wfr diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png index ceb3db1bc317c61c13ae5c60a0d5d19c4c96f72a..64c2938ee02e48f09aa9496ffd13233f93cdb9df 100644 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a;AH_IEG|2 zzP+Nz#S|#g`cOF{PHI`y88gQXoxa~62)U%0Ce1KAYMUWE+vZ@}wup4*LmT(7O2}Cl z{AXW&r(nm^I8LA;AaFsxSw?m8;S;lux}W~&H>srZZRsAquXpxs{<8S>t5q8o=PY;G zxsL09wf-N4)4lVSEe-!1Hf!m@SgZS9YvpzA7l_XikWsZ(^~!U4z|L^@JL}sYI-7mi R6^lSdd%F6$taD0e0sx}HRKx%P literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C|Kg@ z;uumf=k3LfoDBv7tq;|2+`47eICa}2r@n+sJDNhb6*h$UCCugx$_%r37tr$k@ap%? zt3MX92skh>LWn>78|J>XE$8mbZhsy8)hgjEXNJu(9*Y-~_bW`{O%+t@WHg*{Z#uJ^ j!{2hz16E8N3J(}3nhJzOuMSlP+RxzW>gTe~DWM4f*Tq4} diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png index e6c0c8a2eac425d18dc75175efc42717333ffea4..581ce31f62414c24b7340b3a3012b5399609e99d 100644 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#nb{IEG|2 zzP+Nz#Z)M8^r3o$nQpXh+H8dzN0wEy^($-&{~(lfW7~!b_S~e&`xA_#*Hkk;jQqyH z#l7yw?>0^0HqFl}Kx07QM?lQ7unE^oHBS`I{B^thA@5wZX*}C(_0{}+e`|YQ`nd1n zyDL|7e`ciE-_kpuWPPISuH(7QGkAWm_WpTMH>1LA-I74t9Ukq)i+*lZV*ckO=*l-K iwtPa2i=ZUKmiyc}(N?D3GhX$9Z1QyVb6Mw<&;$V11zfKH literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C|Kp` z;uumf=k2A9ybT6CEC<}3yj)K!EpgR3!r?Gkbj2oK+sKw_TB17=8BPmk{!=~ubbiYA z6*5d53JnYp;!A@tKif^uV~c;v3dHokoL9I*R$DK7zublt&9`Pfl1v-i>zgz_&t1T# oaCFh%s)qKzAAK4wDFSuJeJBtNU6gcz8R!ZIPgg&ebxsLQ0BkfuoB#j- diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png index 573b5c404ffb782747013b0c948d8e1b3ba46092..7d13c662667f907f2211707fed3d74f4ed9630ca 100644 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a*RD)978f1 z-(D~jWH8`iHZ109pQQQ!X6r>op{D)*Km`m8+g{tgU9#VL-^(RuA2Bj8NZZKW=M)fN R$~p*=^mO%eS?83{1OO_`BDw$o literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzLr)jSkcif|7XmqflFkQ9H#Mie z`ER?iS>aG@qq!IZ!-Hw-ZuWh-xlsL{jSRyd&68{|xj6+g&Y9f=YG&|s^>bP0l+XkK D{h}fG diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png index f5c8e1048941781782c75f26e94579007e891abf..99e88f0fa0347bc406d1e13de11009b53177aab2 100644 GIT binary patch delta 104 zcmeBYY-OCFlE_#b7N=jWE)2dVOO^>bP0 Hl+XkKcQho{ delta 114 zcmZo=>}Q;yk{#yh;uwe4;!gGaq=_zMEMkGD(Q9z9&6lKNF`J z0}ve0eQ#$yYu&bc$zd1N(~Hh}MF-se|JM4z$E@R3`UYp$*KGa>R1`I-hH-nFnDsA> R^%Ft5JYD@<);T3K0RRYWE*}5@ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png index af560237f17a0a5b2a9ff008cd922cf1b0a0c180..f1e3e9e34d32ed249695bcae398360a83b64e658 100644 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a;!aF978f1 z-=5pZdq6>e<>2IKr!9}$be&#RDn&IMFuvF}8>onZ;m^hBy-`c^>gRlWGvnu^!eUm2 ahQ(q>@30$vY8C$lQsC+8=d#Wzp$PyH!n#Uus2xtO>r>mdK II;Vst0E|5$!vFvP diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-open.png b/Resources/Textures/Structures/Power/smes.rsi/smes-open.png index 472e3fd72019753f986a7d9d30bd54b8634bd0b9..351022b03c8218ecdba0af3a2319909ec4dc0751 100644 GIT binary patch delta 1048 zcmV+z1n2w52dxN@B!2;OQb$4nuFf3k000B$Nkl+kS z9&*p~=HUkzrbT2F{g31Tgkfl8Vrl_t@+3)SBDQTiS408e?aFh*YUxSZgFm@i8FKTW zfV_Wx@IxVwTpw^6r2B}7!Ze0*9LIRCR;%=SJ(46Lj^l}aZQI7OEZXh1@hy(ykqQ56 zUBfU`gfbHV%YU-4EQ@NjI!V6)$%18BV*#_QXB@{9XFZJoK{2l}O_;|0uWtcxwKC-J zZi$t%0}k(&c<;ke>}Q`is%_=$fSU&+uRrtJtC_J>9SFnFSc>$!z;PVqi3C`@IR5{| z(I{r|UGv+eizm)+EFev$zsvdy#8k6DOq(9F2uvI-41dFnfLV6|+9>|B?y9ma=EMmy4@}t8yf&Ln@vN6=Xsf|OhTHx*=z!u z2m1X!gXPPV?(FdXy)#^Ys;@dYj*}~59tgSPI7Cszg7I;68GsAVKFsahY&K^$Umm#* z<2df^-+$rSy)(SUubIwK6ydtA%0yaN9!`pjqDc8m6{4l3CCa_qG@pkuBQMytt<34V zt`gDf^^^x1jfUZLfowS;l_irgG8x$3-p-vxIs;J@;d!2MK;@kWvQ&DUK8DIb6h-P| z8hWri*Xwm7=8ZS6aH@1FSM-Cy18#iufqJjk>wg46U}nH|-4h+Hw~P892=IMhwcGYN zemRPaEexY=Y}>BUCgges)GpZF-6aSDJkL|ldD%#30AR3una1~z(dl&PbUGx~i~Mor zLMEOpUut9To1sgex&jH?&Ca-S3`3<_1Ox2tPd<*NzmSJvsM@Ex7u0IC zq0Bse67KEC{B-yY3#;#N?aS}@`1Kd~yMJ<@!lz$xe&uCeS{)Z6y>Apnv|6pgR9CZB zt5pDouIrK{iBTW+_G6=r+r8Ux3%W~7ic}zJ7jl^4ZYUzu??LV7)k@`+O#JEcd5({d zRh*m^I{8cjbP@V4C_V9z<#SHv@-nI&zZq>o5E$ez$Kv8AP@SfpE9Tc%HYE+NTg#FBJjVIh_PIhSHwLXsetp$0i8yGT1bJDU=JettI0 zr9BAg=;#OtNs<%;K&4U%OtuLhA0L|v=hJvusS90fvmfy+~pr_*U8n1DeL z;2kM~b{H8OO@Ftc3m|Vc1`%-(Du9aZNPr+rgo`}P^9BK22gp&mT-MLJy1D`e5ZcYn zO;swDLJcl2FE@~We0=EE&c6{LSE+oFLZp~h+mYlXbrH)gss*gBt_B8dA-0$(kaJ1A zxVWg=+S&}?)YR0s0ICfW!qmit^f-}7sI|2Xq>L_*f4hL_Iw{YI1T?-y`oUD=WVu-`LnN#Nc^-eO24r+xp&5ffq8`R*uuui$%*d!kyerqaHe2xZZ06?{rz2UznPhtNM0Wv9_sDb z-QBGtN`HH?Q$WBF$SFty`8_x|P_whMYJGj(IB<1!rTe|Tz3TGvGB9U+d|Y2XqNjjl zF6`~?X#sMvLGVa>d*Hq6T1~Z&)Sne|#b_xY;HgcV%jNVX$HvCSR2XX4HPc6`BBg+U zmxTW<4?VImqLp-=^zQD?`EINfNH1-#84Z9Dkbm9|4Grlwo2{o{dOBtbWCUzsG8%L! z|FZ_N7Z*mv(a|qbfK`5)Dygzxn+lnXekK>D+ywwX&bvM_Qy>>+u2_th0^naYpv_$|oV&B}{=sv;~2TUt$NMamJz?Dj+64h$e z3!I9@KbsN4a3Mu;0KuGdetvH3gBX2~qbhYC%P9mk0_0R57o2l{e{X(9Nlg3)4i|Cl TPqj3700000NkvXXu0mjf_&>P4 diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes.png b/Resources/Textures/Structures/Power/smes.rsi/smes.png index ecfbc4cd58fcc6d61d8693207b06cecc9a86f1f3..aeb26ae17ca5ce3dd4a413f2ca9f0ec737b2f3df 100644 GIT binary patch delta 1024 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 Date: Sat, 21 Dec 2024 15:56:22 +1100 Subject: [PATCH 21/40] checkpoint --- .../Devices/handheld_camera.yml} | 28 ++++------------ .../Wallmounts/monitors_televisions.yml | 12 ++++--- .../Objects/Devices/hand_camera.rsi/icon.png | Bin 0 -> 775 bytes .../Devices/hand_camera.rsi/inhand-left.png | Bin 0 -> 300 bytes .../Devices/hand_camera.rsi/inhand-right.png | Bin 0 -> 300 bytes .../Objects/Devices/hand_camera.rsi/meta.json | 30 ++++++++++++++++++ 6 files changed, 45 insertions(+), 25 deletions(-) rename Resources/Prototypes/_Impstation/Entities/{Structures/Machines/wireless_surveillance_camera.yml => Objects/Devices/handheld_camera.yml} (57%) create mode 100644 Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Machines/wireless_surveillance_camera.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml similarity index 57% rename from Resources/Prototypes/_Impstation/Entities/Structures/Machines/wireless_surveillance_camera.yml rename to Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml index 1ae8b33ba01..f23f999ed4b 100644 --- a/Resources/Prototypes/_Impstation/Entities/Structures/Machines/wireless_surveillance_camera.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml @@ -1,24 +1,14 @@ - type: entity id: SurveillanceWirelessCameraPocket - name: long-range handheld camera + name: handheld quantum camera parent: BaseItem - description: A handheld wireless camera set to the entertainment frequency. + description: Bring the station's eyes with you with this wireless camera set to the entertainment frequency. + suffix: entertainment, mapping only components: - type: InteractionOutline - type: Eye - type: WirelessNetworkConnection - range: 500 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.2 - density: 20 - mask: - - MachineMask - layer: - - BulletImpassable + range: 1000 #should be pretty much map-wide - type: SurveillanceCameraMicrophone blacklist: components: @@ -26,7 +16,7 @@ - SurveillanceCameraMonitor - RadioSpeaker - type: ActiveListener - range: 10 + range: 1 #only has a built-in mic - type: UserInterface interfaces: enum.SurveillanceCameraSetupUiKey.Camera: @@ -37,11 +27,7 @@ transmitFrequencyId: SurveillanceCamera - type: SurveillanceCamera networkSet: true - - type: Item - size: Small - type: Sprite - noRot: true - sprite: Structures/monitors.rsi + sprite: _Impstation/Objects/Devices/hand_camera.rsi layers: - - map: [ "enum.SurveillanceCameraVisualsKey.Key" ] - state: television \ No newline at end of file + - state: icon \ No newline at end of file diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml index f1356f88240..4cae2b5157a 100644 --- a/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml +++ b/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity #this one is a little fucked up but I needed a teeny screen for mapping parent: WallmountTelevision id: WallmountTelevisionMini suffix: entertainment @@ -13,14 +13,18 @@ state: telescreen_frame - map: ["computerLayerScreen"] state: telescreen - - type: Fixtures + - type: Fixtures #this whole bit is so that you can open it way easier fixtures: fix1: shape: !type:PhysShapeAabb - bounds: "-0.20,-0.10,0.25,0.35" + bounds: "-0.75,-0.75,0.75,0.75" density: 250 mask: - FullTileMask layer: - - WallLayer \ No newline at end of file + - WallLayer + - type: WallMount + arc: 360 + - type: Physics + canCollide: false \ No newline at end of file diff --git a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..526c74bd0cb0c2908bfa6688694ee46d219a5e7c GIT binary patch literal 775 zcmV+i1Ni)jP)Px%!AV3xRCt{2n!jrkVH}5_c;*+SR%{wDP$Al0&CuXjaOrp`IJ?%R;1&db3~p|% z{Dd*A!X zeLxTdK@g6OB~7#bXFu-INM8%+tN$eI{23<-`Im9ob!az>VSlZqUugU)i*FK*@!X>k ztD0N09lziHvj;Wmx^87laASI^vF-EXBAHCKW#DW{v!-v}vi28oSe)>8?5yj$^>O73 zk%tR-UOizVI@xGjN^i7Xg?3~znVu%ZDSyW!AY0OS{A>Y$0zM}8wOx;ncN}o&!f@07 z-BQ)s&b6+X9ZvZVJO%z{b8FMS)7BVwT}KSm`bI2`R;wwwsgqgc^2Z{q_SUW0&2w)4^}ne-X!Fk#Q?F2 z!NuZT0PauKFI?Y#s3>gx!GuQKOT)Lf5OMGCdTNS(r3onD!?SGiwf^6eGnoZq!8^=^ zVRqTXte>y$^TS;gpz5F9F`Ins&{R)B(XV_8m~-ZNQH;RAVQv_UaIz-1F)?6CZrmwbR-2gwIWK0xvTk`LHJ<@@}4dX+)Hn*u%+h2#EX%Lfel-RzdCfTpUj z^>>pG=+>`v8{D4{h~|@|Lk6*m(P)oV3~I#^03#zKT)q@i8NMrjF!5)HVikjQ$f)N7 zlJ$ImnqTq(szpdXKmo}INIpRF0f(mFenAifK@fyf%P+RfBKLin(xLzW002ovPDHLk FV1gkBdr|-Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/inhand-left.png b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..88d7905c9673a5648c39abf01235b8fb565aac96 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|o_V@BhE&XX zduu;eQ-H|vkHJq8E(rMY^6J?+7fk=QK>W3A)tqnBI5sY_S78%Wd8AM%&D0*&-}&Qj zPWsQn9WP?v`Lh5`VPII0Y8BC1lg%xj6)h3eVDN0-Z1%vSmQ3a`bj pm|NLCc+YKgO5g4|7o_;XPWBubCpEQ3fm)DLJzf1=);T3K0RS0jbh!Wk literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json new file mode 100644 index 00000000000..1bd27f98f72 --- /dev/null +++ b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprited by kipdotnet(github) for Impstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From d295a4a4881560e4b2c1ea3647fdaf30b971b6e9 Mon Sep 17 00:00:00 2001 From: Kip Date: Sat, 21 Dec 2024 16:33:43 +1100 Subject: [PATCH 22/40] ook --- .../_Impstation/Entities/Objects/Devices/handheld_camera.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml index f23f999ed4b..ec845c59a11 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml @@ -2,7 +2,7 @@ id: SurveillanceWirelessCameraPocket name: handheld quantum camera parent: BaseItem - description: Bring the station's eyes with you with this wireless camera set to the entertainment frequency. + description: "A wireless handheld camera boasting an impressive range. They're watching you. Maybe." suffix: entertainment, mapping only components: - type: InteractionOutline @@ -15,8 +15,9 @@ - SurveillanceCamera - SurveillanceCameraMonitor - RadioSpeaker - - type: ActiveListener range: 1 #only has a built-in mic + - type: ActiveListener + range: 1 - type: UserInterface interfaces: enum.SurveillanceCameraSetupUiKey.Camera: From 470b5c257110482d3762316b504d80de98fe2ceb Mon Sep 17 00:00:00 2001 From: Kip Date: Sat, 21 Dec 2024 16:42:27 +1100 Subject: [PATCH 23/40] looks good --- Resources/Maps/_Impstation/banana.yml | 227 ++++++++++---------------- 1 file changed, 88 insertions(+), 139 deletions(-) diff --git a/Resources/Maps/_Impstation/banana.yml b/Resources/Maps/_Impstation/banana.yml index 78954df2546..7d79d371b56 100644 --- a/Resources/Maps/_Impstation/banana.yml +++ b/Resources/Maps/_Impstation/banana.yml @@ -961,7 +961,7 @@ entities: 1: 32944 -1,2: 1: 59528 - 4: 273 + 2: 273 0: 1092 0,3: 1: 15 @@ -1019,7 +1019,7 @@ entities: 0: 45038 -2,-1: 0: 61440 - 2: 1632 + 4: 1632 -2,0: 0: 3839 -2,-3: @@ -1056,7 +1056,7 @@ entities: 0: 36863 -2,2: 0: 823 - 4: 2184 + 2: 2184 -2,3: 1: 994 -8,0: @@ -1233,10 +1233,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + temperature: 235 moles: - - 0 - - 103.92799 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -1263,10 +1263,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 235 + temperature: 293.15 moles: - - 21.824879 - - 82.10312 + - 0 + - 103.92799 - 0 - 0 - 0 @@ -2177,11 +2177,10 @@ entities: parent: 2 - proto: ArrivalsShuttleTimer entities: - - uid: 93 + - uid: 1068 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,3.5 + pos: 5.5,4.5 parent: 2 - proto: Ashtray entities: @@ -8044,68 +8043,6 @@ entities: - type: Transform pos: -11.619232,5.685272 parent: 2 -- proto: DrinkGlass - entities: - - uid: 1065 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - - uid: 1066 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - - uid: 1067 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - - uid: 1068 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - - uid: 1069 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - - uid: 1070 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - - uid: 1071 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - - uid: 1072 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - - uid: 1073 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - - uid: 1074 - components: - - type: Transform - parent: 1064 - - type: Physics - canCollide: False - proto: DrinkHotCoffee entities: - uid: 2108 @@ -8606,7 +8543,7 @@ entities: pos: 6.5,-3.5 parent: 2 - type: Door - secondsUntilStateChange: -61227.023 + secondsUntilStateChange: -62219.598 state: Closing - type: DeviceNetwork deviceLists: @@ -13289,13 +13226,6 @@ entities: currentLabel: Evac - type: NameModifier baseName: holopad -- proto: HolopadMachineCircuitboard - entities: - - uid: 2785 - components: - - type: Transform - pos: -12.39566,-9.589447 - parent: 2 - proto: HolopadMedicalChemistry entities: - uid: 2776 @@ -15306,61 +15236,6 @@ entities: - type: Transform pos: -24.262817,-5.3251038 parent: 2 -- proto: ShelfBar - entities: - - uid: 1064 - components: - - type: Transform - pos: -0.5,7.5 - parent: 2 - - type: Storage - storedItems: - 1065: - position: 0,0 - _rotation: South - 1066: - position: 1,0 - _rotation: South - 1067: - position: 2,0 - _rotation: South - 1068: - position: 3,0 - _rotation: South - 1069: - position: 4,0 - _rotation: South - 1070: - position: 5,0 - _rotation: South - 1071: - position: 0,3 - _rotation: South - 1072: - position: 1,3 - _rotation: South - 1073: - position: 2,3 - _rotation: South - 1074: - position: 3,3 - _rotation: South - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: - - 1065 - - 1066 - - 1067 - - 1068 - - 1069 - - 1070 - - 1071 - - 1072 - - 1073 - - 1074 - proto: ShelfKitchen entities: - uid: 1176 @@ -15736,10 +15611,10 @@ entities: parent: 2 - proto: SignBar entities: - - uid: 2027 + - uid: 93 components: - type: Transform - pos: -1.5,3.5 + pos: 4.5,3.5 parent: 2 - proto: SignBridge entities: @@ -16571,16 +16446,28 @@ entities: entities: - uid: 2143 components: + - type: MetaData + name: camera router (General) - type: Transform pos: -28.5,-21.5 parent: 2 + - type: Label + currentLabel: General + - type: NameModifier + baseName: camera router - proto: SurveillanceCameraRouterSecurity entities: - uid: 2144 components: + - type: MetaData + name: camera router (Security) - type: Transform pos: -27.5,-21.5 parent: 2 + - type: Label + currentLabel: Security + - type: NameModifier + baseName: camera router - proto: SurveillanceCameraSecurity entities: - uid: 2145 @@ -16640,6 +16527,43 @@ entities: - SurveillanceCameraService nameSet: True id: Bar +- proto: SurveillanceCameraWirelessRouterEntertainment + entities: + - uid: 1067 + components: + - type: MetaData + name: wireless camera router (Entertainment) + - type: Transform + pos: -28.5,-20.5 + parent: 2 + - type: Label + currentLabel: Entertainment + - type: NameModifier + baseName: wireless camera router +- proto: SurveillanceWirelessCameraPocket + entities: + - uid: 1065 + components: + - type: MetaData + name: handheld quantum camera (Shuttle Bay) + - type: Transform + pos: -12.3628845,-9.523865 + parent: 2 + - type: Label + currentLabel: Shuttle Bay + - type: NameModifier + baseName: handheld quantum camera + - uid: 1066 + components: + - type: MetaData + name: handheld quantum camera (Salvage) + - type: Transform + pos: -4.2048645,-4.4974365 + parent: 2 + - type: Label + currentLabel: Salvage + - type: NameModifier + baseName: handheld quantum camera - proto: Table entities: - uid: 1839 @@ -17158,6 +17082,31 @@ entities: - type: Transform pos: -0.12158203,6.3308105 parent: 2 +- proto: WallmountTelevisionMini + entities: + - uid: 1064 + components: + - type: Transform + pos: -1.5,3.5 + parent: 2 + - uid: 1069 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-4.5 + parent: 2 + - uid: 1070 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,11.5 + parent: 2 + - uid: 1071 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-19.5 + parent: 2 - proto: WallShuttleDiagonal entities: - uid: 160 From 28eebd08a8978a8cde1dc08b351cb86a05da485d Mon Sep 17 00:00:00 2001 From: Kip Date: Sat, 21 Dec 2024 17:00:26 +1100 Subject: [PATCH 24/40] whitespace --- .../_Impstation/Entities/Objects/Devices/handheld_camera.yml | 4 ++-- .../Entities/Structures/Wallmounts/monitors_televisions.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml index ec845c59a11..a9302c2afcc 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml @@ -2,7 +2,7 @@ id: SurveillanceWirelessCameraPocket name: handheld quantum camera parent: BaseItem - description: "A wireless handheld camera boasting an impressive range. They're watching you. Maybe." + description: "A wireless handheld camera boasting an impressive range, tuned to the Entertainment frequency. They're watching you. Maybe." suffix: entertainment, mapping only components: - type: InteractionOutline @@ -31,4 +31,4 @@ - type: Sprite sprite: _Impstation/Objects/Devices/hand_camera.rsi layers: - - state: icon \ No newline at end of file + - state: icon diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml index 4cae2b5157a..5c8e4e5f007 100644 --- a/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml +++ b/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/monitors_televisions.yml @@ -27,4 +27,4 @@ - type: WallMount arc: 360 - type: Physics - canCollide: false \ No newline at end of file + canCollide: false From f8e64e7538cd97b1679a33c3f6ef2dcbec200ef4 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 19:27:15 +1300 Subject: [PATCH 25/40] Advanced Smes sprites --- .../Power/smes.rsi/advancedsmes-open.png | Bin 0 -> 1205 bytes .../Power/smes.rsi/advancedsmes-static.png | Bin 0 -> 1245 bytes .../Power/smes.rsi/advancedsmes.png | Bin 0 -> 1189 bytes .../Structures/Power/smes.rsi/meta.json | 157 +++++++++--------- .../Structures/Power/smes.rsi/smes-open.png | Bin 1069 -> 1082 bytes .../Structures/Power/smes.rsi/smes.png | Bin 1046 -> 1067 bytes .../Structures/Power/smes.rsi/static.png | Bin 1100 -> 1122 bytes 7 files changed, 83 insertions(+), 74 deletions(-) create mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png create mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes-static.png create mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png new file mode 100644 index 0000000000000000000000000000000000000000..f1b2a7084eb8d0db53e0903482b9d27f82db4eb9 GIT binary patch literal 1205 zcmV;m1WNmfP)Px(Z%IT!R9J~0^jf%5NrMRVxI9*zrENE=kO2oLx2n+fWSq)oO zUqpP0Li6G({&{IZ^5}!0zKjZa@ks_{Q>eS$t*PMblI|L^p|(X^X|R}fODXR7klve_ z%xs$!JTTVF6hfN7c@ zCfWkf9K2Ggw6soD)q8?y8Gv7Kr{n#k+13dn0Pt$$lpPCoQ`ox0g^0~p*8_<8H`jj+ zq|<3z(=?aUSS&`hTE#TYeS_<|j-n_O3I&(GR4S3pW&=ThdApPO&AUJ+^H$wJ%$oy> z9RVncLMoMNi3Mn+LQxb-r4j(a$A?Glv3Non?fmq;YtfUDQ}*hmX+FI)?b$)Q;+L`@ zz|vxUM?K58xDc@^-VPn;tgr_t7V2i`u`P2_enZuBvLwrvU0T<5xF9fZj*@r6T#-8y+LevY48h zav?WO6J6J7r7H?sA&R0fF)`5qaP4xQ<)uZ>!V`TBV1{9kN~I(SUDprXy^!YMhGEFL zOu=7EH|ZETPiWyg-dXA8!v}wJ0njwf7eqTEf@_+FWz`!_hs$7O5P;F)?Rz>g45Q`Z z^9$ZAt|F|?EpTzAmsj}1*NJ6WM59s3gcFpX_}N&Ng|n^8K2Wm4^i;26JOMrQAoR}K zh(@Clgg61IR0>VgJY7y4JHs$!s>E7f2F|=R?s_r24+EBEq3gQbNh}ug*org>8|PXV z1GQR>D>Hd&wVKCCI2^9)k9WHmNG6lg=Ebw;I2t8Hu>m-cL7KyljL$a4+9Px(mq|oHR9JV`1?8nE)6LI?FqXxGut6eug4n!=f{~lrbXRA z&YJ_ui~w|9$F}X3Sb*iN&~+Wp^8iS0+4iD8G@MmN_kaE&aEm-fW2 zlLYALts}d?a5?0(nhd}5wi;J}&LKE8U!Ql5F6)NZSSQqoru_~wjeof-7Z*cER@PDkz|e4(6O%=PH6f+B+6}{K`4m9CX5#8539xB%uTtb*KNv9* zLU8=}@ep#?b+IgqR=T3Jm7?o9hYufK2Jq`IMHc4gB92e?ECX{K2ivw42+Ok8%w9@! zaK~}fTy4R5Q20%t(XXcijz1SAq2s;uKIu{G-hXK)dNk_=;<{= zwUJJz6$p6(Y}>{(%}AG%$IfvawN=tLmVvz^qbp|K%zzLA%d%7^nM@{PE4NA71bssc zRI63aP8MVLT+_6={)w&-1G!vI*}SrEKkHNLV*%f(-QmL{?*fp^J(Hel@JJ6{wg|kX$OBgX$bTqaY-l}!!Q&B`FuX~YEE98 zD<|k3@c$_P9-H~KxpHEw(d|S1trkRYnkG}{J@QMx@p3K9z>iCh^Fh}xOw+`5U6r}( zx}iSM@@IKAoAqVp!8hU5d5=`by-0NnA*lV^$*vd7h>sA0VzHQjHm+t32S1%oQ>j!` zd!0J(@y5Ax3>1q&0@&W!$!E`Hm7SzL7`!b2K@gHcx#-C~uf{vvz8$)hGzV`RKoEpH z1*wjEZ0$E`zPQx;#y@IaC=?>W;SnyUQnJ}>Ti5fr-~j&tr|DKHf@Kr500000NkvXX Hu0mjfxsp&_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png new file mode 100644 index 0000000000000000000000000000000000000000..0bc39c50cf179dadda174089f961c5c8d0b8ae5d GIT binary patch literal 1189 zcmV;W1X}xvP)Px(Ur9tkR9JjYZOmg-VXAmAEdG=+k&pe}^! zi-=E)kbMya@g)J-N8i+!Rbihi<3p#A+R(5OIt`IBBx^ndvq&(oNz`^Oa;b z;DKT0o;l~9|M}l@&&*A5LMaxDZa4Pjayb#FPo6ZmVHn-Ixp5$3QT-3W0WeK7!bDd9 z!olnHdPjbmrX32RV*qi%{SzN0VOu|l1i(9^m)vZskJ|o2u8+EWdq05~e}Dg8qF5}t zx~>N%&1SRg?CfBg=8?e-!$4J4YPDKG?>G+SaygL%SaN$<+WQyiVafIk#5f#KWCWn9 zDuqI!BNm{&6soG?I1T{G=U#Z(9iPZaqsO;@3^=_sddc0sd5bS^-il<MrfHiluyOtRT*#8xbmu<`o_7-%+|+?lsx z*IZE)Pk*K_z(78qmo{%)eVfy%)3Jc}_V@VwvyTDD=krvn)d&Np6h&ctB8Q?VkxS^q z3{cKD85w; z(8}vx=UZ58cfP|IkN_HuhFk{!vk=E|0t}Q&CHby=qYO9T%sFrT=Z1H`^3+sk44fSt zX8NN~rPBW_#9u^V26BVBU}n#I_WO_8DnA2$5J`aQcV9;WhNV<0F*`dO%Rv8{#m1Ti zFSZoFKtHhmOgsZ(E@w>Xr7hDLY+v0_; z7u$38oSE5VHsAwG=A4{!-sgSZk26!?glIGx!)ewxo6SPje1Gwz#$DH)cH1zEL?)~M z!8ib67^ak%ia^qMx7*FN&$jJ}BytnTGOizd6q0Lo5(R)am!2M0N~dTK?(_E2kk9rC z$nocUHw%qMV$+H$MZ4WL=Hob~*=!by0P~k#=2u`I2!Z)a zs4;st4TI7n0DsG}sMqVcRDf|PEXyK}V*rXdk}6ehaU81yra@N7ijY5w1?_3>``t)O==Gue%z)0mR6els0$nsPOfu0jxVD<(0Vt+KAeQP{-@fb%` zBMQS1Jrv2YjK73!+gO%$%<<#By2|=lia;_ClH+8y+kdv5y9!`(-V}jjJ&B@-_4Rdw zxl|}mS4^sDSr#iRD`Nufc6(y1C4AqfUau<>uInD_y+qQu@B3=3La@2H$;|QE_;S62-(StO=`G%kc7iXs4Jj0MXJ09<(L!Nfy+-_Mr6YbYR-LH^YtHzdckT20Np z`r2hqmriFAzBjnXhwr}!K&@6I2!gZ%j^j+sW`A8e-HRXy@H`Iy+dju{`w``G+1T6b z^|0-+F=;%hfU1J+?QMb}z;#{qJV_B<0f526>(sx0gifbJr_-TpJ;z^{FBofTwOVEl zC<47+kHf>m)U!k!$A$trWclhibMbFutSg`=wra&&TU%;Uf0odbD5(HE>>c}KLjUrM z@qd3k2lTuu!sI&E;dvfwYip?-fKmTQ;?M0zd4h36(~Zls0A?f`dB^KN={bz*+Veak zj=GfJ{xF+KNUo7N;CY^LH5Xg0Rsk4hl_5Z@)hbl0)gg>-HJ!Z>f}P!?U(JLNgkh+R zhhb<`LGIV`YPC9)p6fT^&Th<)x4vO!`F{%6zWk1lUU`;(mhMvc;`ZE delta 1035 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 delta 1066 zcmV+_1l9ZE2+RnOF@FY0L_t(og|(MKh+9P*#(&Wqx=llocZj{d(%03MeU&8$?IJWn zd4eDafl5HD;Kkb_Yz|voDkAK~y|sue_VTpl30}tq<3+YCY0z1^Sf1M)yl7~%R?@Uy zN<3s|GV}7{CIP=oGBf{~|2N-!GxH|H6j)kX>P^#ceSJNXtbfZ+lROB5Y4QW~k|c&0 z{g2535JFf=j7=b!yxD9{l-PCMR1z70x989Fin*iIyN|gv-{bmD237uM=a)=ca&y3O zknE#KWX3U+=XqASSS-?Rw`n$;#BqFRU)ObU9EW5a2yB6 zaVQpxhw-Z|Kp~q}nM|0(pFjKvz@_;fyZ3U;o$RuEFUNbA z`>|hr>gl?!di-CS;6x>?TIEZb8hf^BiFDyZdgU3cvB zAi1QDBh6g&G4*7hZLZJY_ z-rk<>;CWsuiD{scd!C1sl4s1uLZLvb)uPpErFIU(aANbNB{yMR$DHEGW(Qdc32P&0{<#YwLs zD5WF_0_%cGyARY-nQ`VAS^+7gZcM@qR{zW8vK90C8y7j2JC;iNQTGv_tbU}+<#L%Q zifjdZ-yi8{vtF@}qKIm>s_R|%Gp0{|CaYVbj&1`7uj4fyiuaW-x*j#NO6 znN_n(e)qvZde8GL5~@w%#+?Oz4Sg`?A@4{l&UIa_K($)c=R_9z5~poL6G8}00tWkg zYdfa8|1%f5wgQ{`&++lmvpP-)p=U0H(0}z~y$edEQcul1c@u7J$K;MYv7D_Y)%|CN zv#$)4HTy~_snu$kv7TnNS}g Date: Sat, 21 Dec 2024 19:33:43 +1300 Subject: [PATCH 26/40] Removing AdvSmes because..?? Conflict?? --- .../Power/smes.rsi/advancedsmes-open.png | Bin 1205 -> 0 bytes .../Power/smes.rsi/advancedsmes-static.png | Bin 1245 -> 0 bytes .../Structures/Power/smes.rsi/advancedsmes.png | Bin 1189 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png delete mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes-static.png delete mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png deleted file mode 100644 index f1b2a7084eb8d0db53e0903482b9d27f82db4eb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1205 zcmV;m1WNmfP)Px(Z%IT!R9J~0^jf%5NrMRVxI9*zrENE=kO2oLx2n+fWSq)oO zUqpP0Li6G({&{IZ^5}!0zKjZa@ks_{Q>eS$t*PMblI|L^p|(X^X|R}fODXR7klve_ z%xs$!JTTVF6hfN7c@ zCfWkf9K2Ggw6soD)q8?y8Gv7Kr{n#k+13dn0Pt$$lpPCoQ`ox0g^0~p*8_<8H`jj+ zq|<3z(=?aUSS&`hTE#TYeS_<|j-n_O3I&(GR4S3pW&=ThdApPO&AUJ+^H$wJ%$oy> z9RVncLMoMNi3Mn+LQxb-r4j(a$A?Glv3Non?fmq;YtfUDQ}*hmX+FI)?b$)Q;+L`@ zz|vxUM?K58xDc@^-VPn;tgr_t7V2i`u`P2_enZuBvLwrvU0T<5xF9fZj*@r6T#-8y+LevY48h zav?WO6J6J7r7H?sA&R0fF)`5qaP4xQ<)uZ>!V`TBV1{9kN~I(SUDprXy^!YMhGEFL zOu=7EH|ZETPiWyg-dXA8!v}wJ0njwf7eqTEf@_+FWz`!_hs$7O5P;F)?Rz>g45Q`Z z^9$ZAt|F|?EpTzAmsj}1*NJ6WM59s3gcFpX_}N&Ng|n^8K2Wm4^i;26JOMrQAoR}K zh(@Clgg61IR0>VgJY7y4JHs$!s>E7f2F|=R?s_r24+EBEq3gQbNh}ug*org>8|PXV z1GQR>D>Hd&wVKCCI2^9)k9WHmNG6lg=Ebw;I2t8Hu>m-cL7KyljL$a4+9Px(mq|oHR9JV`1?8nE)6LI?FqXxGut6eug4n!=f{~lrbXRA z&YJ_ui~w|9$F}X3Sb*iN&~+Wp^8iS0+4iD8G@MmN_kaE&aEm-fW2 zlLYALts}d?a5?0(nhd}5wi;J}&LKE8U!Ql5F6)NZSSQqoru_~wjeof-7Z*cER@PDkz|e4(6O%=PH6f+B+6}{K`4m9CX5#8539xB%uTtb*KNv9* zLU8=}@ep#?b+IgqR=T3Jm7?o9hYufK2Jq`IMHc4gB92e?ECX{K2ivw42+Ok8%w9@! zaK~}fTy4R5Q20%t(XXcijz1SAq2s;uKIu{G-hXK)dNk_=;<{= zwUJJz6$p6(Y}>{(%}AG%$IfvawN=tLmVvz^qbp|K%zzLA%d%7^nM@{PE4NA71bssc zRI63aP8MVLT+_6={)w&-1G!vI*}SrEKkHNLV*%f(-QmL{?*fp^J(Hel@JJ6{wg|kX$OBgX$bTqaY-l}!!Q&B`FuX~YEE98 zD<|k3@c$_P9-H~KxpHEw(d|S1trkRYnkG}{J@QMx@p3K9z>iCh^Fh}xOw+`5U6r}( zx}iSM@@IKAoAqVp!8hU5d5=`by-0NnA*lV^$*vd7h>sA0VzHQjHm+t32S1%oQ>j!` zd!0J(@y5Ax3>1q&0@&W!$!E`Hm7SzL7`!b2K@gHcx#-C~uf{vvz8$)hGzV`RKoEpH z1*wjEZ0$E`zPQx;#y@IaC=?>W;SnyUQnJ}>Ti5fr-~j&tr|DKHf@Kr500000NkvXX Hu0mjfxsp&_ diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png deleted file mode 100644 index 0bc39c50cf179dadda174089f961c5c8d0b8ae5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1189 zcmV;W1X}xvP)Px(Ur9tkR9JjYZOmg-VXAmAEdG=+k&pe}^! zi-=E)kbMya@g)J-N8i+!Rbihi<3p#A+R(5OIt`IBBx^ndvq&(oNz`^Oa;b z;DKT0o;l~9|M}l@&&*A5LMaxDZa4Pjayb#FPo6ZmVHn-Ixp5$3QT-3W0WeK7!bDd9 z!olnHdPjbmrX32RV*qi%{SzN0VOu|l1i(9^m)vZskJ|o2u8+EWdq05~e}Dg8qF5}t zx~>N%&1SRg?CfBg=8?e-!$4J4YPDKG?>G+SaygL%SaN$<+WQyiVafIk#5f#KWCWn9 zDuqI!BNm{&6soG?I1T{G=U#Z(9iPZaqsO;@3^=_sddc0sd5bS^-il<MrfHiluyOtRT*#8xbmu<`o_7-%+|+?lsx z*IZE)Pk*K_z(78qmo{%)eVfy%)3Jc}_V@VwvyTDD=krvn)d&Np6h&ctB8Q?VkxS^q z3{cKD85w; z(8}vx=UZ58cfP|IkN_HuhFk{!vk=E|0t}Q&CHby=qYO9T%sFrT=Z1H`^3+sk44fSt zX8NN~rPBW_#9u^V26BVBU}n#I_WO_8DnA2$5J`aQcV9;WhNV<0F*`dO%Rv8{#m1Ti zFSZoFKtHhmOgsZ(E@ Date: Sat, 21 Dec 2024 19:37:11 +1300 Subject: [PATCH 27/40] Tweaks to Appraisal tool based on feedback --- .../Objects/Tools/appraisal-tool.rsi/icon.png | Bin 514 -> 490 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Tools/appraisal-tool.rsi/icon.png b/Resources/Textures/Objects/Tools/appraisal-tool.rsi/icon.png index 1d9845477c721de08066eaf0d7c7afe5072c0faa..ad463685a42004f2327f23e911d5dc4cbe7babb7 100644 GIT binary patch delta 451 zcmV;!0X+VK1nL8jF@K~qoUh7d#`L0KpnhadunG9;-%Z-Z$@qMeh}a-Z?Nm-jsP_n!NL ziHV7cB#}tuTWw}`(fE6lio^H9Cx)totyW_p?f~%Fp8y!@Z+~H8VHtqq?M*^)8)Kth zu3|CfmKFev{hgqtAp!ua>uX%aVzgfG;@15Dba=)AaO-|Hbbu^f1B0vtwkZkAP}8;) z>y+cRTysn<0`PJa{PM0__p^17LN)rrW;E>QWU&i1Zf9S(K&Ks^x+3;}pY zd;o^Z7?eiPNPZ=tH5JNhS{0?63lNx}G~BwMWHbyE_dGx%os<3*mG3|(ZbN%X0lgm^ t&_yQyD&0pp0r=brB~*8TiHXU-@(!qWmJCk!CoBK}002ovPDHLkV1gP8%`gA} delta 475 zcmV<10VMwF1A+vQF@L;CL_t(oh3%BTOF~f;$3JQi1W^VR62zmQLj@9=lO%!B*wS2t z1a18V)fBV^4J|4(HzYI^3SkIA7!jm_qVNbJa418P8tgXsqa;e-HIU$arpvwWob$cs zp7#YE9i9J1I2``Ao?q~YrU)n(KMb7hG zI{+N5PXLS$wKKiE2Edtr2VcB+9=*I~ab>v_=@Eeguc2W902^DI++JOAceGzA-aR@6 zz=+e$wzK%1Wq6GBT|Z^PTKG{w=@tT@_sjlq@DzZTNT{-xjD%R7bF+6+iL0AmXCQFk zHPm~nWF#cjfq$AqcpVKIF5b+`FyWgK;7-K+GmBM^@)o&Gf*7N zL?+K@PaBC$9)NH%uBrW+1e8$*Cj@|EdIuoe(MR_20X2Q2ITuLy0DzjlF{lM2YQc!2 z^vk4>7x49_on4lOibD+_s3k-Jp#s)P2Y`@y2B|0bOH>*XpqSn(HZ6}F zn`FrmW2qd8OkVS^C_Mwdcniu)8W<=!pqXspRdXKc4#1};l#%rU9UYyf@&RiGq&W81 Rt1kcm002ovPDHLkV1md*)L#Gq From 99f011e93826d25f5694f76a1370895742cbfdc8 Mon Sep 17 00:00:00 2001 From: Kip Date: Sat, 21 Dec 2024 21:07:09 +1100 Subject: [PATCH 28/40] gopro real --- .../Objects/Devices/hand_camera.rsi/icon.png | Bin 775 -> 628 bytes .../Devices/hand_camera.rsi/inhand-left.png | Bin 300 -> 276 bytes .../Devices/hand_camera.rsi/inhand-right.png | Bin 300 -> 270 bytes .../Objects/Devices/hand_camera.rsi/meta.json | 8 ++++---- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/icon.png index 526c74bd0cb0c2908bfa6688694ee46d219a5e7c..faa4352a58f193c0e89f7dbdeeff315d576a0e4f 100644 GIT binary patch delta 590 zcmV-U0UpLWK<7 z+`4q_kg-F^RNT6^gIfuerM~7(0>lwS> zw*l#N+ReWIAoT+PHuD>9xm=Enbn%${N_PMNlzw~{$uq0(MB~Hq`!>L`EbP{sxcFm> z3fQeTVOf^wnlSvn4e0h9)EX_^v~3tOCY-iCDC{n&RBGsdtt4t}U-!E#w$$Az*e^nB313&i;u(ElKMBEs3`*kFOUv4mu z0GWb*zo-G;3IM?V`W|Mtqxg2xKlWH#Tts1MNiwZ6-W{mZFKU3d0svs{e0}gZNW42x zr(by+1o|tm|8W@r&?)9&-k$Fi^GJ?df;y$#7Sdnz`hP_Y@K#`9{uyxE1d1B~fTVXW zU^0a)9L;{;2Am;=>#I4KmId6|dJ=JCXx#m6$-bIH2eFZg8mC|BF?G~8JEvZI)MN0Z z_z59|5JCtcgb+fM2>bhd*nZ{%{uP)H@EgE%a!Qa|$nlEKUeFdx8tfC%OT2qA delta 738 zcmV<80v-MI1cwHYF@M2HL_t(|ob8&wYZGA{ho5-n7o}Eg8Zb~H+Fs4j;8<|!cqll# z)}`PU1b+-}Zmr}WkduPWLQst8(7}Rr2qgt;)0TjN6iaX^A&DWJgK2C`(#xB+7hAv2 zl-&FBKHq!a`^kMk5ClOGj*TTvv;Jp4?$JnJ3+Su=B<%bdCw~h0mvPy3Xg7;tf32lo zX#6URZxW61+@leznp?9Szu*3|2Q})tZe>ewV|uEw?epRynM}52;A}~=rf=S|_7`zj zobY$-tn0eVwT}KSm`bI2`R;wwwsgqgc^2Z{q_SUW0&2w) z4^}ne-X!Fk#Q?F2!NuZT0PauKFI?Y#s3>gx!GuQKOMk<+w-9mf?|N#Aex(U0;KQ?Q z^0ofolQWqGV!=Digkg5s#H^pM?(@T46`<;$-7%Yd?9fzCLD8>#3Yc^AE!*78^Fno? z9x>>(<$v#Z1XOctt^j4LfDdiJk2O?dC$IME5TM-i>O19EdKU;#rk97B!_aTPAP9mW z2!bF8f*=U$^!xjKzx^lT6Zz?scj=dWfL#a42S`3Z@&S?$*hA&}{CawoLBE>tmaW&XT(W?=Yd6$UWyIeo@h$H(Zk^!mQv2TKpBY(8Fj{=B_rM-cbq zGa)lp8UU$ng?Fko-ltTqUw{6P^@g?5o|m$=2S%GmWxq^`Jv8;T`qx)$WBuC?mhM`U zmnX3Fnda{LM-KS-9gx>^pxJ1`t?~Y8B;q{t4Z|^i4;A0DC38T!JYD@<);T3K0RX+& BZx#Rm diff --git a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/inhand-right.png b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/inhand-right.png index 962be1e37111e6619cdfb6b53161373bb1407237..41c09514fbc617666ae34f6d2ee7885b01014dbe 100644 GIT binary patch delta 229 zcmZ3()WORni(^Q|oVT|O`I-zwj(uD{@yK1#vIk=KdL~;G3*|TLI{k=|!?5j2 zqlw}Tv&<xPV0&vCH(?BXJ ZzOsm~^{5Xh37-ezdb;|#taD0e0swAeX5at- delta 259 zcmeBUTEjHKu>P5+i(^Q|oVT|&ay11=v_0H^VBtZ>SxrhR6JKyK>2Iulq15zE>~^#) z7Z;Z_cVUNxZbu?8@fbyS!V~O zJ3N2-`lHKbD`u;FeudZKR?MwzAH3%_I;C&-oC{L?U?+QyjFXyLqd+alt)8xaF6*2U FngGp%ZWaIl diff --git a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json index 1bd27f98f72..55de43c4adc 100644 --- a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json +++ b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json @@ -11,10 +11,10 @@ "name": "icon", "delays": [ [ - 0.25, - 0.25, - 0.25, - 0.25 + 0.35, + 0.35, + 0.35, + 0.35 ] ] }, From bd3ad526ff10ecd9995309594c328f52fb5f08f9 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sat, 21 Dec 2024 23:21:01 +1300 Subject: [PATCH 29/40] New medkits --- .../Medical/firstaidkits.rsi/advkit.png | Bin 308 -> 587 bytes .../Medical/firstaidkits.rsi/blackkit.png | Bin 274 -> 505 bytes .../Medical/firstaidkits.rsi/brutekit.png | Bin 366 -> 551 bytes .../Medical/firstaidkits.rsi/burnkit.png | Bin 475 -> 544 bytes .../Medical/firstaidkits.rsi/firstaid.png | Bin 370 -> 567 bytes .../Specific/Medical/firstaidkits.rsi/meta.json | 2 +- .../Specific/Medical/firstaidkits.rsi/n2kit.png | Bin 450 -> 493 bytes .../Specific/Medical/firstaidkits.rsi/o2kit.png | Bin 478 -> 486 bytes .../Medical/firstaidkits.rsi/purplekit.png | Bin 253 -> 560 bytes .../Medical/firstaidkits.rsi/radkit.png | Bin 484 -> 546 bytes .../Medical/firstaidkits.rsi/toxinkit.png | Bin 533 -> 553 bytes 11 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png index 83e91597166a7d1c28ad0225d7c65255c0700f0f..d36f6652099933ed9415ade9c824ed21944ee088 100644 GIT binary patch delta 573 zcmV-D0>b^Y0?P!D8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00IR`L_t(oh3%F>NKmVc@LIzP3g+zz&AW|XZ!CNwe@UTk{ zo{$O?)Zq@T!)&+^dMub7B6uCzduw~^<=#s=_`at<-{1H5dw-w*|Nr1UaOCKytHDas zXmmoY_FlbsVriD!toU$pS`GAcS9tL^OFVcKs})zp@JNNRv6K**Kz&wpm;*~w)s&+~kmVnMM6P)i=6rL-~vlxy|LWvQ#A@%~;r?e+owh3dKj zfT`v6ik)lgYX8sx#`}AjT3)ZYwxa)j1-1aR-5(mjzOrj;_(A&XdI!t~YBg^?1I+-| zRuc{0W;Q`>Vqf>ZO257dUv|G4^3vW10IKtAs|ia#DvlgEIy(9Z?_r@XuUb(F00000 LNkvXXu0mjf6^#-` delta 292 zcmX@jvW01aWIZzj1B1(wu46!ou{g-xiDBJ2nU_G0Wq?nJ>wyCYiVKS$T)#DK+O)K^ zv`?Qt&6_uG#flaCckYgfiP^e!>-igZ-n{>4-hM=J+UNfa496K5{)>qLwbwqm-3l~B zxFpCgnBhMLu(Q9T3zY8ibg6d?vFLp}@gkp-B8S8JhH&oEb^rh0SWvcIXzKQPRcnu7l+ zN-wnbR~}t_L4I$s=GJRLJ5J}QZkgIpq;vY8TJzF{p8Q%Ssp>geJ8XAsFSvhDw)W&l eW1oNhhlP!GId@z?eby7`E(T9mKbLh*2~7ZLwT)B& diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png index cfa19a007aa4422a0dae7c3ed1c6fc8237fc7909..6cef24ae89de2927408b18219c23f6aac789fed2 100644 GIT binary patch delta 491 zcmVzCDHfX4b=|8}DpadgKlb{~TRweUqjB~J(>&zn zy36#;EUT;USz26R|Hn_RE>Hb>!!Rh9%aIb1CjiiHxBCPDO!E+@{TqOP*O!L0^{0sy5_34f&&T2kY@(?xP~tQFq*dF$dY=bbKEQbR;26bjU8webju2udjc>gg=? z&K0@V2~MlOuAa_9I!mr~f>H_*8BIV$uq+G1F#Oo}`BwmJtOO??l(Q@g5y7_YP=V0P zk;!Ddd_LdT)7#}D08__%f%-u?5uw>^;<|3=I$EgOGh{K6z}>DVCNK^j^$dHNI^OHs zd2jEBIguv|+%6aWi*|oJ3=?m`NCJbN)002ovPDHLkV1h=5-kksd delta 258 zcmV+d0sa2@1Cj!e7=Hu<0001iRA%}S$%zd zAs`?-J3BBiFf%bSMMXt7hr}V4^Ka#y%K!iX0d!JMQvg8b*k%9#0G3HaK~yM_V_+Z` zFbWEy3J57F2_SKW9hC%y6rJHh%%X{k<%No=!f*kL867|{!+RK^B1s7dkW>f?hlYj* z3nB!Jja^(^oQ;i841fhl4 zWh7Jtiqv+A*wS(>`OCkj_p7GvJN@qa-tWE7y?4U_s#N`VX@6)gjf~Am`QHBaDpf6= zT+r>=luYeRj(2!;g2m;zV(F5@KA2+&w|C&?CS<`%21mwbq&9OmoQ^)?EzEo1un$7G zy#vo*Ae|IZWiY~O?S-kGDS$gTJVzuHke!a~1e}gOTz1ZW8@3t%0MB1wYI2;|>l<6h zOe#Cy8D2po6n~IwArFvI&*&&p(J;<*&v;6RXlQCgN0*7j8=4yNln|lSX~9^`sBZ1V z<<3qerON{_7Bf=OFaW@A8vp<_*AL+4S|B;uK70>IMZ;h$=AQw?V=?%4{g@seB3^Zu zzHGtTk7jaS+w~(Ji_rn3lOpuSIvlf0#Cv4h$^x`_BY)(q=lYROigW^i-me&drl3-l1h@*GYN`xI>FxENcmkg+TQEQWDtJouqoPWc cs{f-;NfY;;(Nan7=l}o!07*qoM6N<$f@%=h($0d!JMQvg8b*k%9#0BL$uSad{Xb7OL8 zaCB*JZU6vyoKseCa&`CgQ*iP1o;igg xaQ5!qQ}|V2n1N;shC9$*$^i8WJb(rz005eyLAti=$#Vbz002ovPDHLkV1mxbluZBt diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png index 796eaf83b05d85f87b788e9e0f24a7c027d52820..52f26c99143eca3a45183485ab09d1ca13581748 100644 GIT binary patch delta 506 zcmVw=4Pj4dwXXeg-t2@{ZSsNcvLMy9iSj)rUzmsi?)^_jR|jyqX^5FD0Khvu1ORAn7{bF{Lhe!e zI6sA$$-?QTwE;ZyJdQ(QEcN%uUcKVh->K=N*uNeM58xL0n zpbv`uroagDIe`qIl1vus7jJp@5Nk7IwTvkdMSQXh;&V>{3V~XJH32BY3+pF^sTn{S zq~-020e&-_2%tQ;{3&Xc>SrhluP|4EPzx4?S8V_!11kX&0o=x}4dyzFWPf^>y(G(3 w9cX`g$KD_V0O(^m+{UhnepGbn()EAz3A%`x`oy;FN&o-=07*qoM6N<$g5DYCegFUf delta 437 zcmV;m0ZRU$1lt3UFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pG za7jc#R9Hu27zG0j7@;&tpr?T8Ka>dvB@_OUWfsW*WcjBvd>9y;qlf_nUA?S_3vTeU zCqEd{VtByp8H>MyX%NVW5FBv5E_0oe}t_wOGVGcqzVh>3|oMM(!_IRNHsCMG6^|NsAkX>tMiI-%g;!Glm1 zd4M7ZfGpp$XAhJ|9w5sBFJ8QWvKSZ|8yivhq=Er22QCOY07MU1NeBXz)CYtt9|fae f6pVsF02mkm_Y|bs*oxpZ00000NkvXXu0mjfSN5hJ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png index 3fe117f2ac6a20ac04a09aa996b49e769b5d7ad4..7a9230f334c1412b3df8f9258e6f6e73fe37f002 100644 GIT binary patch delta 554 zcmV+_0@eNU0=EQ^7=H)`0001UdV2H#0004VQb$4nuFf3k0005;Nkl|DGDd2=e4%hmI80>>vuj)O&FDHq2NG)vAcJ`hl#gBuuH??k#X&n zualurkM4bZH%%xw!0z4wvK%3sQK_wy=Kt+k~DZgp*)eI+W~9pMfPg?i{3o7LZY ztInUY93fu+6o2Y-fgB;fQy1$avt#TlQPC&F0C_!s?I)q6aGa)yr&T;nPk7Mh*Yn5W zf5g)&j!FkkkBcUsn_pjI*J*t`hH=(kQ0AOx&r(oszaj}1E z0HXmfbDKMcV>7z*Bd`RJU;V8C{85iBHNVdMvi<>4L$k1#0>rk%6}5Gec6$6*_vDj9 s04{o>Od~!yB(@zkby2Zp%hvtT88Bp{;u6dru>b%707*qoM6N<$f_?t~pa1{> delta 355 zcmV-p0i6D~1o8rq7=Hu<0001iRA#37dRWRG}=00001bW%=J06^y0W&i*HX?j#xbVOxy zV{&P5bZKvH004NLQ&w-sSviZf~%hk*kk~k%^P7b z+7Vv>004eTL_t(2kz-&W7cdG6q6!EpDG4BPjSZDtoD_`>V0`AFM3wRq#iU@kK*x*@ zAehmNP?4kr1YAfeLLmSlUaPQr_+xS&rn1N;shC9$*$^i8WJb(rz007d&NO+)%X6yg}002ovPDHLkV1kjS BnDGDr diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json index c3d804ee25b..303bdf46d74 100644 --- a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide", + "copyright": "Inhands from tgstation at https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. New sprites by AftrLite(Github), inspired by /tg/.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/n2kit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/n2kit.png index af1868dd9ddd5ab63013fabb5177745c16fce00f..0a3be12a9a8a69face718906569311ce167fc4b6 100644 GIT binary patch delta 454 zcmV;%0XhD{1MLHlF@L8?L_t(oh3%F-OT$nUhTnc{I*6O-V6erdA90c*iXgSv4&py> z(m_f`+ofO;#Kon!I0^m$aWEDo5Dem24IPRt2BAUPp$M8qkUEs4u^%_drMNWDlH}ZT z&v|kZLI4McQO8BIX?thC)g3!OJEp4TB`s!{NKd2p=n4)FGk^WkTT^%UJ;5XSktjBB zF~dY!EaUkTyYVeyYcq~#sRTg~@%7Qf_{1buSC=Lgd%T^A zDU}dRrz{m3w4Yj_sH$K&-ts8>!7?5cRh5|Iwo}lbOTwQ^n#Sy4OTgH4SWpQJQ-VsM zlFbiIf_eg)gmzB*E>H^?CH%Q0D%rd)@^1o05v{RtGCx+Z^eHwrBE@JVYzdICd*`MC wg@)u>kRvU#FBuVe426b7^`qk8;4nJ;0wG+Dcbw>j`Tzg`07*qoM6N<$g0mUTyZ`_I delta 411 zcmV;M0c8H|1HuE4F@JnXL_t(oh3%HTio!q?h0iX#u!x}BSZp95SOn6TavPfz^9DBA z#>zr0tQ0FteEPpiP&b7s+MxnK-2c0`FtY2h@w;wWWvz4`D}lEAAfQ4MHF$57<)4e9`DU& zWc_EVdBZeeg&|6g!{du6!bh>lKM|(nIIzMH4bwb;Kc|a?L)+fJ=5hdlWuX9TyQS(K z`2Kb~aur^vf?wq_R-T9VZWr2UL;}RVDr5LwuSq`%0033SP+hG6#%QmkPZ~gG7S~8> z1!}skTzDP?w|@Z;o6my)Y&<#Z^;%8tuj#rJ#KmnWHl~^b02@!ZS5{I0qAa6wa-3Gm z0Jmy<6~HlsWmM4bwC@M7^nVinuIt_p;25IcX=6H_-UmQz9FJYsMZI261)y{gd9CKj ztr&xd=YXup+fW2hQG6Cqx1rL5L{%~ml1!O0WqP>&0TdO(jmM23b#4Fv002ovPDHLk FV1oOsy}AGZ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png index 59919b8585570407e25bcea726eb57e6a6516cb3..6417e2f296fb85bf4680d612ef847eb1823c7107 100644 GIT binary patch delta 448 zcmV;x0YCoU1LgyeFnOB?2M531R<0L=Zd1K&6Wag~DLcNjwBD0}DLFIv8XA*xX+65bkr?`#$gc zKF^1D?_LJDxU4!Jl10avQ*APKTe>95<+B>()5WPm32z7I7k_87rfc<|;8d`AleH8x z9puwRt&~mR>Zz^AHsmG__EUIyZ9y{Fh zI{*MmtFN~c-qBN%DtHg>072mUuOEx@Q}dCWm)(W{0Gu3#Aj&GJb{FlAip}jU9PNel z@#n`;obpj%Ie!`{&X4Q6H#@243$PIyqO1Y{KA147Uju*%>oEX;Ar1hdtb&cuiwm^6 zD)LFjRwA?Y!~#RP0a2!HZ{;l52#ulKAQLbnCj`d&1*zvW#TXPx@q*OT3r`9yRbUzX ze}RJ3Lrw?~zlwzgaza2q6C@Ij1dIpIcp!~!r#Su$%{hvYN;npn#Ugissen=|d)BzP qHt#00LO~o#txWWz;^N}6I{X4{8Ia+mXA`af0000XEWT$8~x$Psb^U%_k;SlypR(0nE+jeiw@EO+sWVGz*>V(`@E zfQmva7mzcBV`RsG)PdB4^dUPQ7r^U6kO6nF0@H*rOdUucF@RtQfP#`-uxHy6f+0ZA0Z=B{fGQ3U6p;e+NdfQQ zJOk4dI{?{okbj|7>26RSCTN?v3&pV@^%N&U5C9p3Y`LL^3K*jUkUUH+v4AKCAOn!a z=WpBrV{DEf6_D%zY6Ge`02C5cg}G23X@DvY07b|4?c1R|(g4X0fW diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png index 778a319a016f8423e1502c4f292d11a403c7a218..37954977c48433c0a46e0e6ec82860376afe7354 100644 GIT binary patch delta 547 zcmV+;0^I%m0k8y+7=H)`0001UdV2H#0004VQb$4nuFf3k0005%Nkl?~RYe2-((o&IvlVGIHU=3Ut#|<7Lvo z;E-MJ&Afl(saIGOz8agf+mfv%-qP|4FJBM4mD?$`x5U`d_jo@1R0#IRaA0uAzI(5o z{#2Lay?8c8O6_Gw-$T>ZDda8c8=@#mCvC~r3b=)(kL+%52zN)g1O2HkMmy#&jB^%E zTPOZaIeV}`Lw}>VQ4^@n;&eyPsab(flBGWCYPX4p*%nyY_ z$T69?lw|GG@>N>@9YBuB7+DIupg?QgB;!Qn#nK;GB>c}zKAHbn$ zGCMuTlXTkgPVOHA@F0D=qTVf=ntscnX?g=F#37dR$IlyS00001bW%=J06^y0W&i*Hen~_@R49>S zU?3MT3JRhM2q`HEAaRWim0X+@jSXOY=AcBC@)E_QV7NfXjAjlXn9+<-k)#9!NGd`h z03l!u1#khYRbYS+ShaZf?%kVLErts$wmx(B&S_&5fqQ5IckkW3jUsUG-MicPRbZHb nW($Tp&|S&^^$I+I1| diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png index 0bab485fa95130e3bb5da80276b4918d0b0b1109..21bce48d5a1c6fed072ed89fae02045faec0c869 100644 GIT binary patch delta 508 zcmV4k@}r5Rm47JssDY-z^R3lB}T23DH^x;6(cf=89KE-zrU86c)u0DybQ2>@tqa^n6j zPHJ*UGX zQO}eWXcxXluQdfA3Ot=aF|pG zc}YY;R9Hu27zG0j7@;&tU?Mm7e<%|U^1ps1%Pf*Lfh-SYW`^<*VD;a>WI2MMhJ|cw zaNmAlWo3X_KI_jPFbx7}EG%FeFqefj>KVZ-0QjZovT0=yvr0%W96&0d*a09w oNqs=b@=-7fM!_f;1b~4701S)0$AGI@fB*mh07*qoM6N<$f-iTl;Q#;t diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png index e0e563022ab30ecf9227785af84f1e8493fc9767..2ea5cf1ca02096b757629b9d477adaed019f9d48 100644 GIT binary patch delta 515 zcmV+e0{s1z1gQj&FnH9G-#-H=x8>L`T}AhceJ}o)k`l|42HHvyUp^8JAXYp$MVWtF}dh*yM7U| zcoK_qld{H27Ds&n(c0C65s#B_OA8@*+%Cl8NpM^k*^Gd?1_S#0`(U?O{+K&Cy+R^- zEt`&P0wW$LtZU=sc^GB@0LO(fJvBl2jm;hWBqh}+X7`YYUdxS;H}He*v3I2SPcRn@ z_(uV)W)nKQ?SG`+YBqs?6u{^i7#%s7+8Ep()Kt>CyaA&lhZO(4b`K2#0NPpxad#Ud z8Y$0xB$47jVRYow8F)yialFrBV5Wm`oiFxMa)N>Sy#9Ed#X~wxXCRvqP-|!gJAXyE zrbf1`0rvTxte4t*k`?eAGd|mpXPSs1uM55Bj~-Nl@JZsS&lWK-R#k@T6*Zsr^zYx&xIo zREm-YZX%bux(0*zhWwX|L%3|iLj6tTlIllAg9Z)NgD>Upoym~hD%k)4002ovPDHLk FV1joC?!o{7 delta 495 zcmVpG zs!2paR9Hvtl}}3oK^VqgcT4k76d4f-8Fa8qAan{Nkj_Tkq7PB0Zbi`-D8EB=>2Gp2zto`G5R30iHcEbu?b*Mak`E zMQbk4gCHKB4e{DHcK%h%gmOT9CnkTb9kEG>Kb}6b3`SN5S%!&lHO$JOa9}CtH+XIf z#1mU{M2jD^J-y3Y8{+1KA;W2g_513NaZdBUVe;IT$kOoMeWgV8C!)9WI+f!^Rt`-D zDLB+G19h~UA%BzgyBoErbX_K+W>EE_w$G<)OUD%e^D7B5qX9~#QY@=N^usteblfAk z1)AgzuaxINX@D2C`4a;;{az8bp=$$9aZGx$amH&uSwCKGGK>By1Ij}PFp&@+8|Y(^ zh|kCnZTK$wy2X`&R-&;OU1qbajEuT2S_Z&EGTD@M(P%PIv@Di0nGDOKu7hU-V!0u@ zmQG7?-EHt}0D=%}4c%4HS^s l2)g+{P>K8a`1teyM4wJyx4i`F#TWnp002ovPDHLkV1n_)+pPcq From 4917f30f83b0322a92a3041e901d33243779f479 Mon Sep 17 00:00:00 2001 From: Kip Date: Sat, 21 Dec 2024 21:21:15 +1100 Subject: [PATCH 30/40] unshaded --- .../Objects/Devices/handheld_camera.yml | 2 ++ .../Objects/Devices/hand_camera.rsi/icon.png | Bin 628 -> 582 bytes .../Devices/hand_camera.rsi/icon_unshaded.png | Bin 0 -> 139 bytes .../Objects/Devices/hand_camera.rsi/meta.json | 11 +++++++++++ 4 files changed, 13 insertions(+) create mode 100644 Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/icon_unshaded.png diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml index a9302c2afcc..bf87d374ad0 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/handheld_camera.yml @@ -32,3 +32,5 @@ sprite: _Impstation/Objects/Devices/hand_camera.rsi layers: - state: icon + - state: icon_unshaded + shader: unshaded diff --git a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/icon.png index faa4352a58f193c0e89f7dbdeeff315d576a0e4f..d2ce7de2ca785867dc755f869b6edd6a57837f77 100644 GIT binary patch delta 544 zcmV+*0^j}g1jYoAF@FF_L_t(|ob8%1OB-Pv#(!;kU?>608Nom;y7e=}A!DJ?KnFLs zF0TCm9mFwP_d2+VH0USD68BC~Yn7T1hwIrip+tH}I>ZY`gnQq3$))u9!NJ|}-uwJ{ z{x7_D+yg=gAw=v{Q>otntdH~jWugU`>OUTLA=AzilR<^oZ-1=2dGhUqhJ8H~*N-$H zpU?M-@78Vg0oW~V_NvwDqmdq-kiO9h0H}Q4u@W!5U9}pYlzyZEp678`Z}RKXw<_SU z-o*1ft7nqXk2Iju4X8CPxNiA4vo1l)9~5?*Y&JV|U29y>=>|46C!%k)3oL!u8;Ezh z!O#&Fbb8+8yMO=FW?Ew^Yw_z_8F02y1o~acq#eE-edX2eDVel0a69!h&GqlD&9uf8 zw&T~gG9c^#!12Zr^ZO~b&idyeFWhG=FXn8fH6~nvaq3$c5Ox5-J@|C*`8WwzV4V8K z+aUBiaQuD+fOffrdvm{CE-^Q93FcJR_Q-#XSKrEjuzv%~i#a%NLU|K_x$xeYDQp)B zV%Co|;0H7Oxmv*WJh-*>WYW&ixVzhuf3-lHnURW`q`uK>>Zo6KLA~~%*WhW<7eWXj zgb+dqA%rj@>HqUd>nk7dub_ND)BxoJZcsiz`2ghuln+ooK=}aW1C$Q{UpLWK<7 z+`4q_kg-F^RNT6^gIfuerM~7(0>lwS> zw*l#N+ReWIAoT+PHuD>9xm=Enbn%${N_PMNlzw~{$uq0(MB~Hq`!>L`EbP{sxcFm> z3fQeTVOf^wnlSvn4e0h9)EX_^v~3tOCY-iCDC{n&RBGsdtt4t}U-!E#w$$Az*e^nB313&i;u(ElKMBEs3`*kFOUv4mu z0GWb*zo-G;3IM?V`W|Mtqxg2xKlWH#Tts1MNiwZ6-W{mZFKU3d0svs{e0}gZNW42x zr(by+1o|tm|8W@r&?)9&-k$Fi^GJ?df;y$#7Sdnz`hP_Y@K#`9{uyxE1d1B~fTVXW zU^0a)9L;{;2Am;=>#I4KmId6|dJ=JCXx#m6$-bIH2eFZg8mC|BF?G~8JEvZI)MN0Z z_z59|5JCtcgb+fM2>bhd*nZ{%{uP)H@EgE%a!Qa|$nlEKUeFdx8tfC%OT2qAVJLn`LH zJ&{826lRP^EYsWrCgcQ2j4%skKV(b{eQ-_`;} cVPL_1cKf+JXCJ=K(gg{5y85}Sb4q9e0PedjNB{r; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json index 55de43c4adc..cc221013d88 100644 --- a/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json +++ b/Resources/Textures/_Impstation/Objects/Devices/hand_camera.rsi/meta.json @@ -18,6 +18,17 @@ ] ] }, + { + "name": "icon_unshaded", + "delays": [ + [ + 0.35, + 0.35, + 0.35, + 0.35 + ] + ] + }, { "name": "inhand-left", "directions": 4 From d105aa344a66a840600d3896ac71e33c93de4025 Mon Sep 17 00:00:00 2001 From: Darkmajia Date: Sat, 21 Dec 2024 11:17:36 +0000 Subject: [PATCH 31/40] i fucke up --- Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 02a85cb9ee1..e3800bfe982 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -64,7 +64,7 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.3 + amount: 0.06 - !type:Emote emote: Wuhey showInChat: true From 474d9db22c9642d40c13e9a6cc80f2a649f7e0c1 Mon Sep 17 00:00:00 2001 From: ImpstationBot Date: Sat, 21 Dec 2024 11:32:05 +0000 Subject: [PATCH 32/40] Automatic changelog update --- Resources/Changelog/Impstation.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Impstation.yml b/Resources/Changelog/Impstation.yml index a50ef9cc939..bd581af971c 100644 --- a/Resources/Changelog/Impstation.yml +++ b/Resources/Changelog/Impstation.yml @@ -1,11 +1,4 @@ Entries: -- author: hivehum - changes: - - message: More items can be put in the candy bowl. - type: Tweak - id: 278 - time: '2024-09-28T00:12:40.0000000+00:00' - url: https://github.com/impstation/imp-station-14/pull/359 - author: Darkmajia changes: - message: Brigmedics now spawn with a survival box. @@ -4523,3 +4516,12 @@ id: 777 time: '2024-12-20T16:54:25.0000000+00:00' url: https://github.com/impstation/imp-station-14/pull/1087 +- author: AftrLite + changes: + - message: Ongoing respriting efforts. Keep an eye out! + type: Tweak + - message: Fixed the InHands for Chaplain's Null Rod quiver's arrow. + type: Fix + id: 778 + time: '2024-12-21T11:31:01.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/1085 From 389d287037cacc9927aaa98e853e75fefc3e0587 Mon Sep 17 00:00:00 2001 From: Dark Date: Sat, 21 Dec 2024 11:34:54 +0000 Subject: [PATCH 33/40] comment change --- .../_Impstation/Loadouts/Jobs/Security/head_of_security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/head_of_security.yml index 07f1f0c5994..eda0f2ef5b0 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/head_of_security.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfSecurity - time: 90000 #50 hrs + time: 90000 #25 hrs - type: loadout id: HeadofSecurityVeteranHeadset From 19b9ce6d04fee34648cd649423e33c1fc0974553 Mon Sep 17 00:00:00 2001 From: ImpstationBot Date: Sat, 21 Dec 2024 11:38:33 +0000 Subject: [PATCH 34/40] Automatic changelog update --- Resources/Changelog/Impstation.yml | 31 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/Resources/Changelog/Impstation.yml b/Resources/Changelog/Impstation.yml index bd581af971c..cb17c8d7158 100644 --- a/Resources/Changelog/Impstation.yml +++ b/Resources/Changelog/Impstation.yml @@ -1,18 +1,4 @@ Entries: -- author: Darkmajia - changes: - - message: Brigmedics now spawn with a survival box. - type: Fix - id: 279 - time: '2024-09-28T00:12:16.0000000+00:00' - url: https://github.com/impstation/imp-station-14/pull/357 -- author: AirFryerBuyOneGetOneFree - changes: - - message: A new type of mouse has been added. - type: Add - id: 280 - time: '2024-09-28T00:14:41.0000000+00:00' - url: https://github.com/impstation/imp-station-14/pull/360 - author: Darkmajia changes: - message: Brigmedics now have their own winter coat and boots. @@ -4525,3 +4511,20 @@ id: 778 time: '2024-12-21T11:31:01.0000000+00:00' url: https://github.com/impstation/imp-station-14/pull/1085 +- author: honeyed-lemons + changes: + - message: Various holopad fixes + type: Fix + id: 779 + time: '2024-12-21T11:37:30.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/1091 +- author: Sha-Seng + changes: + - message: Slime hair is now 75% opacity (up from 65%) + type: Tweak + - message: Gathered Low hairstyle touchups (more body in profile, clearer silhouette, + etc) + type: Tweak + id: 780 + time: '2024-12-21T11:37:01.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/1090 From 726349106dc71996c93017fade29fbd6e12fb77a Mon Sep 17 00:00:00 2001 From: ImpstationBot Date: Sat, 21 Dec 2024 11:42:52 +0000 Subject: [PATCH 35/40] Automatic changelog update --- Resources/Changelog/Impstation.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Impstation.yml b/Resources/Changelog/Impstation.yml index cb17c8d7158..14ab179d64e 100644 --- a/Resources/Changelog/Impstation.yml +++ b/Resources/Changelog/Impstation.yml @@ -1,14 +1,4 @@ Entries: -- author: Darkmajia - changes: - - message: Brigmedics now have their own winter coat and boots. - type: Add - - message: Security and medical winter boots have been removed from the Brigmedic - loadout. - type: Remove - id: 281 - time: '2024-09-28T00:13:06.0000000+00:00' - url: https://github.com/impstation/imp-station-14/pull/362 - author: TheGrimbeeper changes: - message: Artifacts can now spawn non-random books (e.g Book of Nar'sie, Parker's @@ -4528,3 +4518,16 @@ id: 780 time: '2024-12-21T11:37:01.0000000+00:00' url: https://github.com/impstation/imp-station-14/pull/1090 +- author: Sha-Seng + changes: + - message: Removed security breath mask from HoS loadout options since it's already + in the locker lol + type: Remove + - message: HoS Mantle is now 10 hours to account for the 90 hour unlock requirement + of the job + type: Tweak + - message: HoS prestige coat, armor, and headset are now 25 hours + type: Tweak + id: 781 + time: '2024-12-21T11:41:49.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/1089 From e192e3b5c65a67841523a54bef425f61e66fd90e Mon Sep 17 00:00:00 2001 From: Kip Date: Sat, 21 Dec 2024 22:57:59 +1100 Subject: [PATCH 36/40] oops --- .../_Impstation/Entities/Objects/Devices/flatpack.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/flatpack.yml index 6c478b6b8ad..7aa78adafda 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/flatpack.yml @@ -21,12 +21,3 @@ components: - type: Flatpack entity: ChemMaster - -- type: entity - parent: BaseFlatpack - id: WirelessCameraMovableFlatpack - name: wireless movable camera flatpack - description: A flatpack used for constructing a wireless movable entertainment camera. - components: - - type: Flatpack - entity: SurveillanceWirelessCameraMovableConstructed From 71002b332cff53906f9d0575e7ae964647733894 Mon Sep 17 00:00:00 2001 From: AftrLite <61218133+AftrLite@users.noreply.github.com> Date: Sun, 22 Dec 2024 01:17:12 +1300 Subject: [PATCH 37/40] Advanced SMES sprites, Heater/Freezer sprite fix --- .../Structures/Piping/Atmospherics/unary.yml | 56 +++++++++++------- .../Power/smes.rsi/advancedsmes-open.png | Bin 1208 -> 1205 bytes .../Power/smes.rsi/advancedsmes-static.png | Bin 1124 -> 1245 bytes .../Power/smes.rsi/advancedsmes.png | Bin 1093 -> 1189 bytes 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index d4dab562f15..d42012aa970 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -198,7 +198,7 @@ mode: SnapgridCenter components: - type: Sprite - sprite: Structures/Piping/Atmospherics/thermomachine.rsi + sprite: _Impstation/Structures/Piping/Atmospherics/thermomachine.rsi snapCardinals: true - type: Appearance - type: PipeColorVisuals @@ -247,19 +247,26 @@ - type: Sprite granularLayersRendering: true layers: - - state: freezerOff - map: [ "enum.PowerDeviceVisualLayers.Powered" ] - - state: freezerPanelOpen - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - - state: pipe - map: [ "enum.PipeVisualLayers.Pipe" ] - renderingStrategy: Default + - state: freezerOff + - state: freezerOn + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: freezer-Unshaded + shader: unshaded + map: ["freezing"] + - state: freezerPanelOpen + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - state: pipe + map: [ "enum.PipeVisualLayers.Pipe" ] + renderingStrategy: Default - type: GenericVisualizer visuals: enum.PowerDeviceVisuals.Powered: enum.PowerDeviceVisualLayers.Powered: - True: { state: freezerOn } - False: { state: freezerOff } + True: { visible: true } + False: { visible: false } + Freezing: + True: { visible: true } + False: { visible: false } - type: GasThermoMachine coefficientOfPerformance: -3.9 - type: ApcPowerReceiver @@ -292,19 +299,26 @@ - type: Sprite granularLayersRendering : true layers: - - state: heaterOff - map: [ "enum.PowerDeviceVisualLayers.Powered" ] - - state: heaterPanelOpen - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - state: pipe - map: [ "enum.PipeVisualLayers.Pipe" ] - renderingStrategy: Default + - state: heaterOff + - state: heaterOn + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: heater-Unshaded + shader: unshaded + map: ["heating"] + - state: heaterPanelOpen + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - state: pipe + map: [ "enum.PipeVisualLayers.Pipe" ] + renderingStrategy: Default - type: GenericVisualizer visuals: enum.PowerDeviceVisuals.Powered: enum.PowerDeviceVisualLayers.Powered: - True: { state: heaterOn } - False: { state: heaterOff } + True: { visible: true } + False: { visible: false } + heating: + True: { visible: true } + False: { visible: false } - type: GasThermoMachine coefficientOfPerformance: 0.95 - type: ApcPowerReceiver @@ -332,7 +346,7 @@ description: An advanced machine that cools gas in connected pipes. Has the side effect of chilling the surrounding area. Cold as Hell! components: - type: Sprite - sprite: Structures/Piping/Atmospherics/hellfirethermomachine.rsi + sprite: _Impstation/Structures/Piping/Atmospherics/hellfirethermomachine.rsi - type: GasThermoMachine minTemperature: 23.15 heatCapacity: 40000 @@ -347,7 +361,7 @@ description: An advanced machine that heats gas in connected pipes. Has the side effect of leaking heat into the surrounding area. Hot as Hell! components: - type: Sprite - sprite: Structures/Piping/Atmospherics/hellfirethermomachine.rsi + sprite: Impstation/Structures/Piping/Atmospherics/hellfirethermomachine.rsi - type: GasThermoMachine maxTemperature: 1193.15 heatCapacity: 40000 diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png index c45b42460087914af05fd68805c35298df20c577..f1b2a7084eb8d0db53e0903482b9d27f82db4eb9 100644 GIT binary patch delta 1172 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 Date: Sun, 22 Dec 2024 01:30:49 +1300 Subject: [PATCH 38/40] YAML linter fix wow i can't believe i typo'd that --- .../Entities/Structures/Piping/Atmospherics/unary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index d42012aa970..4140660bce1 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -361,7 +361,7 @@ description: An advanced machine that heats gas in connected pipes. Has the side effect of leaking heat into the surrounding area. Hot as Hell! components: - type: Sprite - sprite: Impstation/Structures/Piping/Atmospherics/hellfirethermomachine.rsi + sprite: _Impstation/Structures/Piping/Atmospherics/hellfirethermomachine.rsi - type: GasThermoMachine maxTemperature: 1193.15 heatCapacity: 40000 From 7a73c0304a7b8ddf454571aeb89fa7cfc9e25109 Mon Sep 17 00:00:00 2001 From: ImpstationBot Date: Sat, 21 Dec 2024 15:10:25 +0000 Subject: [PATCH 39/40] Automatic changelog update --- Resources/Changelog/Impstation.yml | 39 ++++++++++++++---------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/Resources/Changelog/Impstation.yml b/Resources/Changelog/Impstation.yml index 14ab179d64e..b4326cb2ed7 100644 --- a/Resources/Changelog/Impstation.yml +++ b/Resources/Changelog/Impstation.yml @@ -1,25 +1,4 @@ Entries: -- author: TheGrimbeeper - changes: - - message: Artifacts can now spawn non-random books (e.g Book of Nar'sie, Parker's - TEG guide, etc) - type: Add - - message: Added some parts of The Great Gatsby by F. Scott Fitzgerald, which is - under public domain. By sections, I mean Added the entirety of The Great Gatsby - by F. Scott Fitzgerald, which is under public domain. - type: Add - id: 282 - time: '2024-09-28T00:13:26.0000000+00:00' - url: https://github.com/impstation/imp-station-14/pull/354 -- author: Sha-Seng - changes: - - message: A new prestige neck item for quartermasters - type: Add - - message: Some veteran captain sprite adjustments - type: Tweak - id: 283 - time: '2024-09-28T00:47:17.0000000+00:00' - url: https://github.com/impstation/imp-station-14/pull/364 - author: formlessnameless changes: - message: Made the upstream Frezon and N2O nerfs around half as harsh. If it's @@ -4531,3 +4510,21 @@ id: 781 time: '2024-12-21T11:41:49.0000000+00:00' url: https://github.com/impstation/imp-station-14/pull/1089 +- author: AftrLite + changes: + - message: Fixed Freezer/Heater sprites, which got accidentally reverted. + type: Fix + id: 782 + time: '2024-12-21T15:08:45.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/1095 +- author: kipdotnet + changes: + - message: Added the Mini Television for mapping. + type: Add + - message: Added the handheld quantum camera for mapping. + type: Add + - message: Updated banana. + type: Tweak + id: 783 + time: '2024-12-21T15:09:21.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/1092 From 7efb0c7e0367ef86e6a91519a3f84c7447cd464a Mon Sep 17 00:00:00 2001 From: ImpstationBot Date: Sat, 21 Dec 2024 15:13:05 +0000 Subject: [PATCH 40/40] Automatic changelog update --- Resources/Changelog/Impstation.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Resources/Changelog/Impstation.yml b/Resources/Changelog/Impstation.yml index b4326cb2ed7..cd32a241624 100644 --- a/Resources/Changelog/Impstation.yml +++ b/Resources/Changelog/Impstation.yml @@ -1,16 +1,4 @@ Entries: -- author: formlessnameless - changes: - - message: Made the upstream Frezon and N2O nerfs around half as harsh. If it's - still wild, we'll revisit it later. - type: Tweak - - message: Fixed variable name after VoiceMask refactor - type: Fix - - message: Made SVS less common, matching revs and zombies - type: Tweak - id: 284 - time: '2024-09-28T01:04:02.0000000+00:00' - url: https://github.com/impstation/imp-station-14/pull/365 - author: Darkmajia changes: - message: Fixed Saltern. @@ -4528,3 +4516,10 @@ id: 783 time: '2024-12-21T15:09:21.0000000+00:00' url: https://github.com/impstation/imp-station-14/pull/1092 +- author: Darkmajia + changes: + - message: Beer is no longer 5x as alcoholic as it was meant to be. + type: Fix + id: 784 + time: '2024-12-21T15:12:02.0000000+00:00' + url: https://github.com/impstation/imp-station-14/pull/1094