From 0b5f9625ba47701a04ffe77c3e18bc99cb6cde35 Mon Sep 17 00:00:00 2001 From: Aviu00 Date: Sun, 28 Jan 2024 06:36:25 +0300 Subject: [PATCH] Revert "New /vg/ nuke sprite (#18890)" This reverts commit 07f932ae3cfbe89ffd06080e7e9a570fca8853f1. --- .../Entities/Objects/Devices/nuke.yml | 24 ------ .../Objects/Devices/nuke.rsi/meta.json | 71 +++++------------- .../Devices/nuke.rsi/nuclearbomb_base.png | Bin 1324 -> 801 bytes .../Devices/nuke.rsi/nuclearbomb_deployed.png | Bin 1310 -> 0 bytes .../nuke.rsi/nuclearbomb_exploding.png | Bin 1614 -> 1036 bytes .../nuke.rsi/nuclearbomb_safetyoff.png | Bin 0 -> 819 bytes .../Devices/nuke.rsi/nuclearbomb_timing.png | Bin 1381 -> 939 bytes .../Objects/Devices/nuke.rsi/nuclearbombc.png | Bin 1612 -> 0 bytes 8 files changed, 20 insertions(+), 75 deletions(-) delete mode 100644 Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png create mode 100644 Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_safetyoff.png delete mode 100644 Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml index d120621559..5a94d34033 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml @@ -11,19 +11,7 @@ noRot: true layers: - state: nuclearbomb_base - - state: nukefestive - map: ["christmas"] - visible: false - type: Appearance - - type: HolidayVisuals - holidays: - festive: - - FestiveSeason - - type: GenericVisualizer - visuals: - enum.HolidayVisuals.Holiday: - christmas: - festive: { visible: true } - type: Physics bodyType: Static - type: Fixtures @@ -109,19 +97,7 @@ sprite: Objects/Devices/nuke.rsi layers: - state: nuclearbomb_base - - state: nukefestive - map: ["christmas"] - visible: false - type: Appearance - - type: HolidayVisuals - holidays: - festive: - - FestiveSeason - - type: GenericVisualizer - visuals: - enum.HolidayVisuals.Holiday: - christmas: - festive: { visible: true } - type: Physics bodyType: Dynamic - type: Fixtures diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json index 2828b13ddb..8a3608421b 100644 --- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json @@ -1,54 +1,23 @@ { - "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)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "nuclearbomb_deployed" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "nukefestive", - "delays": [ - [ - 0.25, - 0.25 - ] - ] - }, - { - "name": "nuclearbomb_timing", - "delays": [ - [ - 0.5, - 0.5 - ] - ] - }, - { - "name": "nuclearbomb_exploding", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "nuclearbomb_base" - }, - { - "name": "nuclearbombc", - "delays": [ - [ - 1, - 0.3, - 0.3 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d", + "states": [ + { + "name": "nuclearbomb_base" + }, + { + "name": "nuclearbomb_exploding" + }, + { + "name": "nuclearbomb_safetyoff" + }, + { + "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 f0b41b5bf171fd70fee580db632b82b4d2c2d814..cc1da909915440368543a86ea7e45234b6349148 100644 GIT binary patch delta 779 zcmV+m1N8i?3ZVv&BYy(uNkl1uSYLMkEAzc`w%}7vcUZ|lAK^H=^ z3KcKeqD5E>A;gU>BwD3JWZ)tqEX1N>x{!FmpuoH^QK>l_X(kUv&}7e zDYAO~;b_UOm@w$ma5&xJ4G7^1V+yfZrvd1E+f8|8)sDqpy?jA=WtAd0ZXMR-H3mWn z$D3;bs5jTrURTXrO*5Cv%$g#PZf0_=LdOHk8dq-p2x%fM!-#v@9+XoIwB)78YGHxJ z-lu@S1K@Apr+=^CmHfcNG5|7;n{m!|(|pxPY2E7}A=9Y>fFKjmYH@&N+vgy%#qOcO zzRW#iEWJIw9Lvf9V0Gd;0QyvkCtW@0Qze|UGE?u$i9UH>Q$z5A45-C7gSoMb-n*BW ztI1JfMFkS)&&309@x}trZYKcHH?+jas+KQIZ-lOC%zq>gac#Vt($OxgVHH|W!p zSZDVV`c#R|?j}w9I{|1n z>XrP7l79=hr|s-N5XZ`2e}}}i9JdZ@uVK@eM-oQ7-W8H#qSg&;a9&z`Cg30tD2Dbx zyfhFR_&BPF1BwYT6ClhWQX5gnqb8s8C%YPKqd2BrIA+`=B_`mTU%-&=f9E1D)_`*I zP}p=7zmX1;l<5Dm8<;@nbD!j1LY zqy*deA28)-%i@%RWXjK$x8ez?IUDP28#@vFA9W&#Ac9@RKRzKX$ST!%5dZ)H07*qo JLH*~^eu<1~n27YW#W0)@CD`9aT*)$r7k}Slq`2&oDY{o&r%wU4C+afbcmMlhQ z;xd_-kwA*N4CB`_6O9_hLFtH zKz?Z)t6;5hq+BHOotbb?%#_aSk z@MzZm$24*o0aBBhAQ7Sfy`1*U^S*o1%O8~lwe_#HV{GhCKF+JjM#t%T-naicjmMu_ z8x?#bDOh3_Bm*%yiDi!=k)W)1Rvf|$A64+V5}Wd_{C}NOIDY&{OmJ=XWK>>jOA0D$ zya-c3yLre6_{NwA1MaifiJu|{Hy0Xt&{*;pKVZbQ0C-cK3@OKeo-fy-;u**>6`&nF zp3;vZ)3f-Z2l%w6M=3!$D?whc1jpJE+3%9@t39|V2#wq9@IJO4e&;M7I~+@RGDn<@ z*f$|pWPhp?3#p4pN>0Ry4{EW%HeZq@D0%DQM4US5#J>HC#ME!9lhADSi|oJEDXX=Z z1P1JT@L9sg*fKeXy=yXq0R!(pe18?Tmk;s&?j6eMIQ#iu{JGF;!7H!M^ZF-cC~7SD z7um0J0zEhH1PN4Ezb^OMPKOa#yQ>wAPXj3@Hhh^^A zk`ipsbHe=`IA{d!a3~5T5O{vR1--Ti^7Lh5zK?a@8bvE3QG7cC&20^+f3qD$McYyJ zoFp<=2~g&$eZ6mnD}V=0V(#Q8GWJ*c(emCLzn&9Zt_hTumZH3*3ifN=Aq42WI&TK+ z*MI50i*2kW@PUB~jKF>39m!6n5>kyTpi7KMh$Oqa&rnh1ty|0Z#FfEw;w9Yy@odA+ zUIgYCkrz!0Ab}H!y2f+-Ol#$*K9Q(vyv4_Q1=P5kZkaHSDP<4DB0T!D+1lq;D^fGi^(@sN+5`*w7^D*}(qBkWI#3SJ<)SqV(x3aF;t6GUR$ z_IOg^Fq@-)3*vwH8JE;x zSAF=m%w|(AoTIKE*r(HN_|$mqgD$1PksId`x8w$Pk*A0 QS^xk507*qoM6N<$g6v*^xc~qF diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png deleted file mode 100644 index fa39a744cdd5f07aa3637736286dd29ffeecd20e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1310 zcmV+(1>yRMP)DnYT3IQXVX%oU#q!az zvO#t|@3}pvx3{!xi_t%OlY7s{J?DL%_c`x*+j#uX_JF_x0#ONM=cX(AxzXW?W&a6* z!VQ_qV|iKdO$YdRXwVhY$zo*n7L9xa0dhv*!U+8FCo>{Q&^oh!4xSZ>Ft1ACb4Js0 z-Ub4<<+`LKgXr@0mpuM3B4Gr`>4s-=!y;dkV+sQo(e6r3!evIxs0$#4&C{bdu|9jy zrD)ZV1cc*DKMu=HA~Nk7B1G0VFa~30Y6N&R>-%#O*^B_G$xM<6Q-D5BdS`jxGw$P$ zAVF=-TP+wF`HPQp_GY5>bPex2ew)P8&#jIMzK#?uwMdddpPa;!*N{k1)Y~c!;+0($ ze6BPoVEK_#ICkuCOmJ=VWOTf?#$;6P^&vt5ZSs&2@bwWd`aSK~hMyO8ZYeZ!r?KQO zdBljTLGXI30#lX&U0<(3#TF^p`b5(lCVetFOkC$U}`2g?l z*s9)+_AmeD&-w0ryz%BNKmWuuRgJm8JbSANUszUJuo|l)8?%qY@=}E_I z59_=)j3!2+ZVQTvHlylglZ;#tpvZ-NyL*Z&fJe=8?!;#b_EiSZ_|Xh6 z&+%^e7|P1ZP+nRE$JNd-0(4(pH$vyv=DCAn))IJs|9M8>A^DADCliE(aRqdN5eXS& zXXhC@6lK$<7x=_w`&s#sYCs%I*y#(v3?uTYSp_6;B4MpN%kQ*Se(DnmYu!yg)+-?V zuD@xHhEANvn91OdUzG}Q%B$~kyYwKmqq8E)bIf;0^M zFomgk25Zm}(2}UEd|l4fHy(xF8tSUi(RB^mr_}A|;6v@9*SK0kgX(P}Fg&bYzrt*K zCrR+@hR|=QBp`mBMu*Q(!;hn*Yk-5P3QThaE?iVgG93XjjCjIJdmMakYwL&7@z5+H z{-g--0>#6Qz#OT7Fl|l{iQ@5dynL{9LIJgZ^y8hp(E6QN7Xdag;13&neG44iP+Wj^ zyPXq{N`Nfxr(bYUIJ@G0EEWasB}#G0m2YH!r70fQM&@8jx%)rTi|ygy zL9;LtF};1~SCeIHwolHHl;ZqinSPHp^R+~x66kO{mJvf*=rmartJMl;Z*NG#B}~7E z&fH0*!X3WuuJj~8o6V+ZncwRk2Wu^ilzv@Q0u;U8A@0!@+apw6lED1{-VdRF0FM(n UT^vOUXaE2J07*qoM6N<$g1i-Mt^fc4 diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png index ac5c5d9654ff5a545b508efe26f5687251b3d7a7..937d431579e655161997457d3780c5d6c9567927 100644 GIT binary patch literal 1036 zcmV+n1oQieP)Px4XSbF*cz0`;vRl zIp6d7o!`0V-e16!DO09Qnfl+#QVM9Gu~`z=1Lr?m@fg&6YboFx{oC2--@ejlU4EI- z;NzQWB=!B}Cw3Mk2(Q~kES}6eZYB7-2@v3ruZGndo(G`&t3Dd{G%Xu;{@hs__cSTM z8b5!?^J!Qg&6+V(Qp+)m5xpk|UYZ`Sf^$jXPk^R&M8i*69Ebv}|4 zQNv(M!B-M+d{d321`ExEKLO+&0QvFx_J^O8{(;lG0a*7`ka(((_E&ra+P-)I-NQ6~9ak2e>B8W&PMvtBt!6U zkA@GB3CX3x8y`*4GC2)ES9K+w4tqg-&1dk)NZKL-$z*akR@oL3uqbnZ9a~`>e*NYS z0FRBYr^7c%V8>Ph_s0xe8CKwc62wwPkP&~I9v>hh|0F}u)f>j^agltso_P+s)7Uqi!#Z4HKJ45WAhkK2k|`YMOf<`OJxSuV>*5ip&=(eLnj9Dw*%~xEOHQ z@jC3pt_&BLTEu<$q3dbp}ue6jd>gYa*zlSGz< z$-lWy%I6bOdlt`Ah)T^@f>@TJ$n%t%Z_1P@Q>IM)NA)-6=w-4-<7lJ+0000YwUPqdp)= zMCrko=te#_*&3jL814G$F*wbLS#%?fWBGLGL)54CiW;1RP(YpYQ@>tR8;Ox=!HEz> z^VzGg%$gnqK2kLQ+lwSdfYgK_!PZm28lb{n&kdgL>GtwNkf3YPyH2#XU*q@5n`hx* zWf4!i{_4eZFU}qj{7F)9g)f`LO!{k)ToMW^cpmUu5$aecEb=yc>2_5B0qx?UAmGdG9<=lvMlOCg?A)Ge;hlz(Kl5=5E-2uo4hhyd zX4L;M7uigOkP6TW?uc#1GTW;-Ru6o;xt>qKCs}L?l4qe&nSwpLC$sY%wO!%XVUn?zeV-L#h%LV8MSjV5Zl8=p2RgBF zi!3pvOC45}Rru7=|EyD18zBj_xL(0`QD0$c_W;(-oZ;_KDgS)`6y#)`<>|Gn<)`ED z_y6&uu3-`0DY(JsKRRAkW5_qm&L*DrT)FKhu<7k3ISn`yL}2!sohW$;h}}0I+gO98 zW=3RCLfMXDWwalwb*pPU0c}YMw&pqEW)AER0(ZM*g`zfXdQV!oa1k1s4CHB?fg6o1 z@!>`6WF#_g#iML@F^WELV%f4BYTod zbx~biSFv*CN@T6r0M~_@00Q*9c3$z%Uscatq_Zo5x3ttT0*|R>Bs+y5B!VlT8yJyL z2U%0|4NZ!)eEG{f<8LPp8y6JkvD8IAb}GJN68WXOl#$*G?8$W+~oIq z1w_A#Z`#mdIxg=6HOH>iA-6Hdhy*EvyFl0Ct2oc@wF<;e0|%-ow+4({fKzmurz24V zOtFD&wyh>b0a5YKGmZQzNHjE6!nwOt?a0$>fz=}K{cE%5u_GV(Tgwzc@NJs5X0erX za7DE$cAaFtg^yC=(e_Ip`i2>-Sw}!iA}{YPHLtXM5A;!1Qi$sMOIXt25wxnJ_>sIEWD!DI#cxdJCn%3Cr` z0TL~E+Cv{333Zfr5U1E#?x!sw_#;Jtr${|)3Tzqz^2dStm7+Wgk|2@ZeUxt>Y&ju? zu79`S{e}LH*R8n{1a>_xaF6qN?{IK)dI}D=wsPWH1%hJIZ-3yV=pR34!>El=H7tR90lXJN6ZGdaLSWnpNE!RtIp3hf$=(|U50`)f&i(^~ zir5>INEH~>9|e{ndA&ctJ4;P-BaA-~0BS_mki7gC9zaCv52zy#;}1vzbd3H06n`LJ z`86-_6VQN z1Azv`IQRphcfuflAX)YYuuJv_4o3We2j~yrQS}G#$om5(;SaDM(ndu5f${VQoXXot z_yZWDKfv>J{y-4%Q2qdY9H?I@_uvl%fkpg*k=jK3frvja;rxOB0kGhpx<#wJG5`Po M07*qoM6N<$g1v$Xg8%>k diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_safetyoff.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_safetyoff.png new file mode 100644 index 0000000000000000000000000000000000000000..a28fb828c2a4f83f4d1d1e377f547bff76f0e8ba GIT binary patch literal 819 zcmV-31I+x1P)1uSYGCCZQp%Vy$AZ#QqlPjBT?{mbS8)70^pU9BIwY&i#Twsi6YwA$| z8eg`OUs$wmv1d=8kY8A&2=-aKHF=GJK*EuhQUEF~rPNmxGhR|dS)N7H%}FE8hc}NK7)~8nOH36a%#x@v>T2V58-7~+i`&-%qTQr5o ztsX3wn%F+v#@IkF0O94agqOtuFx%jvyxImpy-~054&Xe|TM|Y*o>}6;LKY1yac<5z2E*{<{R{xRhWAl#9LJn<4D&)w$Gcud98gS%I{}ut zh}1^Z@sMwi`JGk_1HBB5I2jss5o3$OJ2A;$gYTV-c(P&f8xT7WgcYyi7t#)5qJ3ZX zMf%Zso#;BREBTmcpSY+A1fAEZd7h8i&99&CwHW}2jgHW)AH3-zJH-H?hY0%j#Ps8ts(L|qg_M9@VM-CRXPg)UU2 zmePCG5+7I^rNR}wH6`Nn+Krf4L$YYZG<~Sul+InGXF5~UBx=oo&VQ4c@0{=a{`tc`u)yv|#>&Df*drt*0apDKHuoH{K8C~PcAQ$)%X7_ zs+|!N4x5#5B$l;bKKN-1Ai!Q{8FQAb0igAE2X$MweKqVx`*rHJZc~6Sf{(K1^*^i3`4Q_8fnc)`YdfNvtoF(X1YPr2r?F zm&t0d(6Ik6AT56^9zt`^-6$gi=Y?3Pz?w8 z-23>8WM3%G!O&;UI_Kc;^z-|YY5>Mw9ss~rF45A~iLG2B(l7J+P923y&uhjIdFcwE zC%;e)&m_;GHvDIHF;HKv#A;SbY}!x^z>cFs{QYMM0C&4b2#jg-h3QOxUJt(M$n&`5 z3&n{hhqIahc-@;?eh!;eiM4i&U@Mns?HEyF>UMSBRO!t(2@}D@DAD9_S|jQi5|wN| z)kt9M9Cy1%xEB~F(l0Zwy@1e(Q37Mw*b9huWC;wv+ze9wnaernc(C7YErrFa$u${1TciW&r-E-At@6#O%36jDAYZ zkl2=91RrTmg5Sfp_#_%a5dfN;Hl;lqU$YG!c^;R9kwjt?%dCP)15+yJ-ne$cLFy;w zg%+P5huunSRW)v)>p_nK2NV<29fH1x&qipPh`T33x$x5-gw#gV@q$;^_*k_adV2`> zMG3!)VJtlgT=YpNQ!=W#A2%=L!~1w9Y+m^p3ji>`v`BM(<$gCcm39CHo*W#~^qVdp z0C_O$i7=o1tOW?aOFb_&m3AJg-~bJw2u)5K39pRf$z+at`H6h3Vg#SP%IP!sNAt6q zaIL74MU_R8YekiuEl)_DGj*I?q&HtN@l^>kJdWOcLxv0)GGyo{)&FooVJ@Ev>*D|b N002ovPDHLkV1jv~z)=7I literal 1381 zcmV-r1)BPaP)?bI*C7=Y7t{ZQpqO%cc|12}C83otrLc+eU{cR{SFb z3O8j+_vK~5Hyz;5LxZlEP8K7pwP@rc2#_-ZSB${#e=sA01obof=iphD2=kg0-exqd z_WCgCC@X4C|b!rJN5n$kae z&?TwW5Cjy*7rq}BgOteBeTWcQ@4y(0nW+)r(X99PNn|quq$V>#B1{2#Iq99{bCp@4evkP-0J5ij~Yr?4GAF6!J;Xyi^~ z$zO7h5toDD4OR)JECaf}T!)G$A;naHR`6(YFN(}hp`6Vqfh<^uEVF7H6^wVNRVd-l94b=yxw5LmmT z8TF3?$wzZ>fDPDeU_|^98V}V4qkT*C?dbG|jU^@6n&*UjIdI4b-074RiYM^AynJ-q z7m=qY9kV^G^2RWl8Hth`X=rSzL+$IWC@R{Ds%K0ha)kgzuGrVRr?>*R*DTtOeIj9R zWdKd@&G6$n-t8VkSy>s%ORM0x+!;oI_N(h!X#Uzgw@}PV0`KcP%Lv>h-jVEN3L(X~ z0-C^xgb1>;^CV4*v}MZ^yy0U1Y4MWIfH<~br_TX1jL7q58IZt#Uwe3|kf24`+R`8#c_)o98RfHoXT^GU?ZdwPjX^;0W15a; z8E3eGHw)4*^xYJu<{7L(LqJWUvhqdI*3fhqT5GJYK}XjW?3j{=pMei`2VdZ74Gqe> ziNJ8Ty!{HZ>7FFOuNp$%P(eWXI*ksWq=HXJN7n!clNFfe3Yo!wEQ~}yMtXC9Sa#Fd8rzX&b>PY0?;}iA|+qN>T!9Q;Zs$sz{F`H59593Lf7* zDx~YYv$xCb-UpPx&Kh`g+ zeT!fajN%V!fbB)f)OvG(re z(YV5d*>qoEDZ5XX9!mejwr(kuH$?EO22dux{9}hYNU^Mc9}+}pYP|_t{PF$iS9{?zJ_ zCs24-l*Ax6 ze;Ct&hW`_pKeJJOmOTsn8Uy$*9t0x3(dj{R?-^{z&p{`5q}%wU;leND0UNIQ$cvm3 z>V&Zg%#UoDzj_wgyN$G{Q1eMch$bNbso)F@&sFR zx!@*FJP9IqyS-{#B)^5oQ&LiKp)r6TmWGuWZD5tRJ5b6*WZYSS;_?Ca1Y?YSoL1jXA<`1dQtMh5I>%Z=C}0p+(cGZ7P2$*;JQ|)5kUK8 zw_m8%^xnl5RuXx0^LZxVKJ^)e9YGPKfO|mq#Ylt#(fpRWy3_PhNSil5!*5(^IjcUT zJvf3bn1dIAAtvOdSecN>NrbcTEZ3h4tp(rXF!qs>Mro>?+v_EM9`vC zSze@0xR*tfq+~>6#Rz_Iw;GMJ;X#ZgV1LKTV zcN7rCuh|9_5xKdqsP~FWjzN#&!UL$Szm6RP^6+yQM!}JnxwqQei5-& z+eZ=bPYQ)RP3mPKsC_R*@drH!`M;ASV#}>_{P@6@6Qoi3M>F0`ne4v{>jKF7T1PZ( z&+r5%w{A(pnU)qVJQR%N4|x)d_~{p1QYO1Pg4sd~BX_x&#~cm`J)!#<#UJ)4oN@IV zwZ6=5!S&8D*q2WKAIZVSaB?3UOoV@11b^7sz8jGji*1RMf4fsC>EGXA(2vot{NcX1 zk^CVIP}}2Lqw$qa0HGd;&JQpO zrpym85~j-!FdC-H4-f&<Y4QU^!Ib#{ zM#8lD0Y<^p`2j}2)cFBMz_j@RM&W;vA263NZGM1JFl~N-QTPukvAF~A(<$}<0000< KMNUMnLSTX@H2rh{