From 1c6b83fe0546eff61b7981c730f41e4589317ba0 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Sat, 7 May 2022 23:57:14 -0600 Subject: [PATCH] Cybersun Juggernaut Suit (#7852) --- .../Prototypes/Catalog/uplink_catalog.yml | 6 ++++ .../Clothing/Head/hardsuit-helmets.yml | 15 +++++++++ .../Clothing/OuterClothing/hardsuits.yml | 30 ++++++++++++++++++ .../cybersun.rsi/equipped-HELMET.png | Bin 0 -> 465 bytes .../Head/Hardsuits/cybersun.rsi/icon.png | Bin 0 -> 336 bytes .../Hardsuits/cybersun.rsi/inhand-left.png | Bin 0 -> 427 bytes .../Hardsuits/cybersun.rsi/inhand-right.png | Bin 0 -> 421 bytes .../Head/Hardsuits/cybersun.rsi/meta.json | 26 +++++++++++++++ .../cybersun.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2150 bytes .../Hardsuits/cybersun.rsi/icon.png | Bin 0 -> 775 bytes .../Hardsuits/cybersun.rsi/inhand-left.png | Bin 0 -> 804 bytes .../Hardsuits/cybersun.rsi/inhand-right.png | Bin 0 -> 782 bytes .../Hardsuits/cybersun.rsi/meta.json | 26 +++++++++++++++ 13 files changed, 103 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 96b9131598..a7839348ce 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -283,6 +283,12 @@ description: A simple EVA suit that offers no protection other than what's needed to survive in space. price: 4 +- type: uplinkListing + id: UplinkClothingOuterHardsuitJuggernaut + category: Armor + itemId: ClothingOuterHardsuitJuggernaut + description: Hyper resilient armor made of materials tested in the Tau chromosphere facility. The only thing that's going to be slowing you down is this suit... and tasers. + price: 12 # Misc diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 0596c68c18..73bdfe08d2 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -337,3 +337,18 @@ - type: PressureProtection highPressureMultiplier: 0.72 lowPressureMultiplier: 10000 + +- type: entity + parent: ClothingHeadHardsuitBase + id: ClothingHeadHelmetHardsuitCybersun + noSpawn: true + name: cybersun juggernaut helmet + description: Made of compressed red matter, this helmet was designed in the Tau chromosphere facility. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/capspace.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/capspace.rsi + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 0cf537ea5e..935292eaf0 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -479,3 +479,33 @@ Slash: 0.95 Heat: 0.90 Radiation: 0.75 + +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitJuggernaut + name: cybersun juggernaut suit + description: A suit made by the cutting edge R&D department at cybersun to be hyper resilient. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/cybersun.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/cybersun.rsi + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 0.5 + sprintModifier: 0.5 #extremely slow + - type: Armor + modifiers: + coefficients: + Blunt: 0.2 + Slash: 0.2 + Piercing: 0.2 + Heat: 0.35 + Radiation: 0.1 + - type: ExplosionResistance + resistance: 0.2 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCybersun + diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..d67b95fdff3b7c84a3e6fcc214f4fce873e19b37 GIT binary patch literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zyFFbTLn`LH zy=Cux*g=Br!}6p;9X(CQr59EPFDxw-{3BM{b^pl1c$b1x#|z#Fu`U$rO70`aA~7KkuIYJp4Ctb#AIqSKsyXL5FxD2&u8L0`aT{FpBbXT29$NvCU;O2Gw|sxU9lt&@Y`ew0h5gsu zbs6Ut`F~&kEo2B;!^&O?3nD-uV~=0)73Wi{eld5QI{c#| zCUv*{f)h4d)E?~KTzMd_-r-_p#`H63H=kY?`^9YbxPEH;JEI$>o=&_s=D1pP^E148 zeCVW4+;ZP(tTTPAn^Kk+9ze!rms5V+jg;j*bxC9@$iM??Aa0U#*&cQRRo{Q!d| zU!v0SPoMqe4(lFgoAqSszsFNljx)ZPCd}MX%HqhbaNK<3w8@V+7CAA9J>SAmAXfvoS>&{&gvW}W1jWMFzs2{wdROz`Z^}^>>xRb0f{R|Oo&tT{ f(-df+!N3srBt2*9@)Ie*AY$-z^>bP0l+XkK2#JE( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ee1c8d1c4b6a6c365526059f1a6f92d244d5c50e GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zQ$1ZALn`LH zy|vNnu!9WShxJK?Z^Sq?8hvImZS)qOzu3>N%Q?=a;8e23t|d*u9Ihf$FZqehN_kPh zH_4>;%Ck$m9bSB&eQWW5?{}Z}>-}Uz#d` z>W3$O(9`RF-}t!8>~*Tf{f0l!=G)tEJ63yo-PR80*QuJhYxm?97f#BvOV{?<%){S( z^IZ0{*Xs{0e^d_CV)fNm<86b5=f*kv4su`raLAM)LFTJr->)72{Jw|eo2}VX!4UPI zd5XV`#X5`my8n9a&;R<(ZtsD@qxIc;O??*bV&3v5=j)zV8L=>Tf@#aSb+Ms!v+tOA zEL2sv*p}77lp(g{#S^wST!9Rq9J|iRHfC`!-{4C+A=ezt`u)l-o0^XnKMvh7>H269 z?Roy{PTr2mBBu}LGbHCp9Tonr8+~W*{<3w8r9bLMzu@u}6qKDR|HxprHS^u3GGOR4 Nc)I$ztaD0e0stJ~y7&M9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fa19eea1f7b3c55f112e6790a7d3b467cf11d6e2 GIT binary patch literal 421 zcmV;W0b2fvP)Px$Ur9tkRCt{2+Pi83K@`UE&k#u|X}pjG!OChu)1(RHElg$J#TN;r+PAQ^*#uH8 zVi8C{u!<0O3yVo1YsSlpabs}s|Eu;g1Lw@1*=CLe000000D$9?OMCHrePbl4KZ$f7 zzNU^lWZUF$k~Xn%c{RWH>z>(5gnP7Y4l4_gOnmuxUwGcB)|^>{-{i1R7D>q@`jhDA zI{wlij`cJe9`tswb7%&=d8~fjGwX6#sDS?`4$J&9*d&Py)2LJ#700000006L2 zrt?1gDB9IdlC>Qo+gR?vklgGf*=YgNIxr-+I!UA*7oZvRa(41|Cy6vWgU=S$|2fSv z*-pGP9O-U+A?aKX#W-tRZm{=!r&=@JLfLc+W#du>{Hb=aa=gg{fQ!BX1JaqYNz%{t P00000NkvXXu0mjfHw?e* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json new file mode 100644 index 0000000000..855e3345c9 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise SS13 at commit https://github.com/ParadiseSS13/Paradise/commit/a67c929b7394f78e7787114457ba42f4df6cc3a1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..77ec6c04be9e05a01502eb67c386eef90fe8f2dd GIT binary patch literal 2150 zcmV-s2$}bZP)Px-AW1|)RCt{2TTN^m#})nT1_|ywFdfh6PgIFbq^G6=btn(QRF!4A6;adV0ERLBhyD$^+=x2%!wnj;NPb2nxUQ zr%s&$(3=t3_ML@GryH)n_~x+yfQg9-BoYa?+$$94JTf;ohvntvu(Gtp+}s>=T^Ga? zi^Y%|89`=u7u9MNB-fjnNaT|%w*%MvV!NB(ie_eJ1n?MzL;}GDPb7@LM#?TJRXN_+sN$h0st6eux%TLVc^C+O&~;Y57Y%_W@bb(nM69B z#%p_fkR%C;qPQPPlJMHz9%e7Rk1>|Q)5KI?yTkbl?}#y$LakOqJRW!X|GvHL^2g(G z)M_=zvb^6|!O+nFq&xtW%Vhw7rfIM&%l&AY*6_|4OVvH04PNP$(3zzP=u){<_2)-`_*6-gB?FHJ&lL7#&{k~27ojic}0U(pf zbo7EiqkyWakY!nrqW+fkmdUa#R8<84eDH%>km@^ftEvi83OMk9KR$lkF32LNnuZ)1CV z8}FYvgSFcSbCqZ`3RP9zcY>g;Ycj^fH_H{w{^TXMOi>gRi$%z??3S6P>6Q~#Zal&3 zbBT^Ys2#q0LJ>>Xws7v$4wUaHc)D9dtyaT{6DLqAmE7m(IvS1Q#gQnA|0&|u-BJAX zXXDr`6}u0DAHB-~09Sr@;L48UKv5K!rs;kZMQP|3^gO-aEq?KK-JnZfOZfP*So&IOc)uMww$5*V2@!iafw$hSL?{jbbx$C8Ti!Iy$mgFWMD@QFymz_x z{RTfjDGbynJrffX?schD3e6uzK*1OTV+@>gcg&@+naVlmVe1XWFG&(cM@O-?2QfKdE_4X|+OG&D^^DwTpa5(D)iD3waN%VPgdQa?ca z>2$hj`Ry$a%N;5RQtMMoaL(O%xA)$lg5V(d+fIeO&@>ISF=AO(!+P6)Z+|H2D+a|M zYDRIp->Z+>FH_lW+oB= z8q;Rq29VN=IUx##LjRY;3ztq~F(+IDw8Eeb)2Vey#-MV9@&Lw|pbYF{PKZPzfj3^Y zTh`GpW3*HH`dVC6Div2I!!QQ3A3#DFh5;hdbsg8&;)hN;`soR+>bkxb7rL%D$mEqZ z2m%}6!<$b8V+;V?vj6~~>pB*5LbNi(AaH#xE*5h_&^EbOCdL>(y!oVm*2%snngI2r zMKYO$Wm$ORRXfxPjj+gOvx2yEUB|iEi=gy*nQvh8-+#qFc6Kmv?_MC?IxdH)Kh58l z!SCL6l_#7%d)7TCP+zfimkA0AQl7ZI7-K2m%z4ajtYTrNp3Ldg7=iZ#u0DJStyXih z#gr~D5&+yY3Hf{;^OKYKF`9Fjhaqqfy!!AVfadc8-zJc3Bx?|KGywG>imd5$x}o*` zJGH}{B73=)4Fl;m{o9^9I)#}B1Tw%US8ii-a}xlt@t}yMYg=wNV2mBw zB7=gLiza2du4C!imU}Q_b8|CrR}Aa{blQt@?tl1=yEhNY8V}0=-Ym6O7LqN@$+W=3 zAmP`)R{`jVy?k(1m~-wXCi-zEpcUS`j0j^8es9z57jXMe&c1Bn8X>f>{vhXVi9uw9 z+R5PMCJZb$*owfLrV3kEw;(Qmm+MA`p8hdHZZApFKoX*@uyE;g19vaz+5p2m6VM60 z$kOwFhMuJ%`oY~*zopZdBO@b7CX>kL^FxgRBttr#hGkjU-Q9JM^MPx%!AV3xR9J=WR=;c8KotH|5{mVMGwB5*K@SAM*+OueEzkx`=PcPfbZCckDA_w? z?bJf&?xD~>zz_o6N*8Y_1`#b8axuC{R$L6Z4vDUkDp|5aONV@L_

*?|XMo&kwl6 z9p*%*(~;BG+wJz$^#u3k6%a*Hsfa3ZX=rr~_jXn@<4=d@5&)K#mSCD@M%ZvT1ORZ( zwQjeIUawbr?m}Gw?+%Vte`8}q0_XT)nrPpUB^VBe*YizgP+?HB+6#+Z!b7>qG+&J}qcmSw^7JanGDz}GMDq3b$)-!J5^7(=t!#9%Ne6fx5i^!xqHIF92&yZn5=-!HYT6@+>3Ip-Q7 zL>h)sy658J0zwE4fV2z)-!%=73`2S+Cz)HAIT10&KnRh*wWoQ{(sP6m$ru9wym>q+ zJg>HZ#QOw<5C|a@VY&$+KnPK`;b?@TZwm-Vqd(5A9fXupdDx4v`Q*Nuvuzuvr>7Y* zA%vPw@b%~?wz?)b=ko{Q+gBU_aPaZ>RmO1)+qNNuP|ddO%(Eo+$^JZQXTsfmXdf_^ zjfWywrb!c|Jr_b~{>YTapJVLq7vJ_wi6{k0DFvkzoO4Vj6BQGSi;HTWb6&|Y zmjFs>?Z4ZicTZ#PdO+88=(=7=lwbQR0@7sD#&`JdQR^$9luAmeO0`LlanA94>w%Uo z*Jed!5bo`)!gXCZj)PXK1psKZT5udkRX_QHbrw|K0HstWk)3#-^nvQ{yb6`6*mYeb zbzm5VnZDR1~j?Gy4Dl002ovPDHLk FV1g8SU~2#X literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..671fe901fd7d785c24e28e60a8edcd2d7cdf3667 GIT binary patch literal 804 zcmV+<1Ka$GP)Px%-bqA3RCt{2+Rtm#U>FDRZ=Ay}G|iU1607iHM~OqE8^d}Mak8TaFW&bTc=Eq+ zC(jBVg>B$j1`gRp52Mmu*28|}vV~>sXhSGOeLW?l+i+?7W*YWeAF0ES_p(P*UBPN@~Yet8c7@Zrm`;G6>h zJkLY3*~IMZtg^PYc3~Y03k#^#YGQ0`3_nIjV0m7ugK$k|WlPK3*gU=?R8@thY0xwc z-EJ3;U%bN4d^u4#=kGodj4>38MR=_iIOlL22i0mdm2|i+vog-PI5{~%sZ>Iz(*Xc5 z#<2PM9em#h=Umvfec_#ST^EHy0r`mu933420364W+0=;C2=IL$wr!tjtPld6bNIgh z*Yb=pvGM6`bndlU@!z6(K_;mKz&S?{1U((~eIM<18vyY9>5U7^$Js&9b3QXOBdMh+ zs@HO2dU{%L&IRXO=(;X+T^IFQF45hq*K$!AUDt(WS%NVpL>sBh0a7CX0M=K#I5;?f zs;W>`HTwSB_hi$}`f3-ZX~Hy3jE;^10D>UE`;U3qO$CtBbHI7I>bh>?YYkhzAJQWL zKy>F_*HunOLO;Sz4_ZEnR0g12E=R{&?Tbrg08Z014NJ@0 zLzPcU8hI7ZUnQQ;3G;Z^@`MmV2qA7;=U;Bq`#V`ysn@udvPY(3P_)^vdWV^}O@BPEJ0syz~KLcY7U-$Ka7Ed$zo_%g^ zP5?lGKf>0=3IL#y&%@Z;>$^XhjDXPA#>$yJ1^vp@91x0cz^F_)7$2_yJ3IfdMVE{* zCc;m>mJ_$kqTrlgojE|}{((%+0gLmKJ^K!ZSv1Y$0LYZd6aaeDV3-KVPx%$Vo&&RCt{2+A(X}Koke?zmqskgcLR6hzNxvqDFNWCrh?c+LEC|hc5jZox1iL zWNOzIx)cf_&^ZK}p-Vdi*O`)0OE6LF;Hbi&!0QksWJk7R)oFC){U)7sn0HTi&q61F zF~%5Uj4{R-V~nx?hU>aCs!!=(1acdM5Cj00W#Q=PXy7<|F1&g5008jm+bKyY0RTY| zpw((&ZEdZzySsaH5l_g*#s=#3I?d0|~+CjUWzLwO5w4MY=DG^0c&p^X4M5ogM0K9l|XYx@`P+YfSUKI7TS65d@ z|Hwgoj;hrvNhwK6Nv3I%X_|CUpHrd+9MtEMm`&3p*L6t`p>zwpH`HctFkW&nWX z&ilS!>YoWJi3dF_{>%haDwX6oo=)*Yk_u|IT5{|-4s6>V*f%o){S3pv=GNigM|MjL z!x(riYh9$*Pbs~g6sZHM$IlpJj4{R-V~jDzSmCJjhIo`*FA3u>FLYhUv-`h$enYjl z$73g;wX#BP5F~BOvS7?!;OWD1NwvWP*W4G#67R(7x(=GXtK6NBjg^2wYk%0rL(%1) z0iNe2$MM%BDjIvw`}xumq-6oPOoH$G%5I+K_Wmts=d(sa2&z`Al(ikLid=t#{R38c z&n;ICNbkF=KK*kSLDdHy%l+X`(Lb5HuG|T590$PVGeD!!AXV$YAJ41n#J>dAaR2}S M07*qoM6N<$f&|`o`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json new file mode 100644 index 0000000000..20f48be4c1 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by emisse for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file