From 6cba5b42781ed80071318f5a2742a1f4ecff3ead Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Mon, 8 Jan 2024 05:55:40 -0700 Subject: [PATCH] salvager maxim suit (#23734) * salvager maxim suit * why unversioned --- .../Clothing/Head/hardsuit-helmets.yml | 25 ++++++++++++- .../Clothing/OuterClothing/hardsuits.yml | 33 +++++++++++++++++- .../Hardsuits/maxim.rsi/equipped-HELMET.png | Bin 0 -> 1086 bytes .../Head/Hardsuits/maxim.rsi/icon.png | Bin 0 -> 568 bytes .../Head/Hardsuits/maxim.rsi/inhand-left.png | Bin 0 -> 499 bytes .../Head/Hardsuits/maxim.rsi/inhand-right.png | Bin 0 -> 677 bytes .../Head/Hardsuits/maxim.rsi/meta.json | 26 ++++++++++++++ .../maxim.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2469 bytes .../Hardsuits/maxim.rsi/icon.png | Bin 0 -> 910 bytes .../Hardsuits/maxim.rsi/inhand-left.png | Bin 0 -> 493 bytes .../Hardsuits/maxim.rsi/inhand-right.png | Bin 0 -> 516 bytes .../Hardsuits/maxim.rsi/meta.json | 26 ++++++++++++++ 12 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index deade899956..f42b3a9405f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -130,6 +130,29 @@ radius: 7 energy: 3 +- type: entity + parent: ClothingHeadHardsuitBase + id: ClothingHeadHelmetHardsuitMaxim + noSpawn: true + name: salvager maxim helmet + description: A predication of decay washes over your mind. + components: + - type: BreathMask + - type: Sprite + sprite: Clothing/Head/Hardsuits/maxim.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/maxim.rsi + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + #Security Hardsuit - type: entity parent: ClothingHeadHardsuitWithLightBase @@ -714,4 +737,4 @@ - type: PointLight color: "#f4ffad" radius: 5 - energy: 2 \ No newline at end of file + energy: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index f88ad818ac7..a2242efed7f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -156,6 +156,37 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSalvage +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitMaxim + name: salvager maxim hardsuit + description: Fire. Heat. These things forge great weapons, they also forge great salvagers. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/maxim.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/maxim.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.3 + Radiation: 0.1 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: TemperatureProtection + coefficient: 0.001 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitMaxim + #Security Hardsuit - type: entity parent: ClothingOuterHardsuitBase @@ -913,4 +944,4 @@ sprintModifier: 0.9 - type: HeldSpeedModifier - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitSanta \ No newline at end of file + clothingPrototype: ClothingHeadHelmetHardsuitSanta diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..e501c154bd982dea9cd34ede4495070001e6a53c GIT binary patch literal 1086 zcmV-E1i|}>P)Px&_(?=TRCt{2nn7qBWfaGM8JENzx9++G6{!o$1d`?PK}REMBRgpN?N9Ei(chokGYN-z#iAFA2m>Ca=p%HxBkCb66?|vHq>Ms z_0219si=Wc=}|Q^mQyM{s-lMeelm{g2^)dj0X<>E2{vk=P95!1XL7yj)X}b*iSVl5 zu-OaUw|3#BEUORf;7;WhO_3dhe!s=gM;YhZn`@gN*N^_o&$ZIo663LlA7o)^h2Qe$ znX2F{3orVc-UDu~(QquK*ZRI6=K&b(>I1Z$2*I&bI*{OP{cNoEy92L%&D-zY4L%$5 zo_tRiM-5aq29FG60ceWoy8z(V&ogAo!OXr}Khhc>q#P1{d$F z1)BidiSC%m7s(+`@7~GarFr(v6*yb21{%Cue`x4g!nd!`*%IT2pUd11w^Jy5=1bp~ z!%+j32>%YS;0$8&!G!10M* zC-6fNeUvIy>jxOlnk5Baa8q;$E#t*itg{2ktww+|E0<-8of%-)F z@@50>75FSBQx(|Tc9Mmq6~+&?de-$-8gturg$Ur?=U?Z(NSsd!CwOD=r!8F$Z$8?l zUK~2iUzO{OfBFu9QUQI|)JQ zyMwRScl+jLOixdNVzJn;xV#KNbJ7Cz+V75;BqApH;Vc8^t};E6-SQ+%k7U)rxvS)d zvm_#>*8Hb4%=Tq*d6{Cd7;J+C+-;1kK5lVsu2|Ee7G$r0-Iw6jYED|1zZ3y~e}p{K z(Wr01ddIe_QF1-Kd-){@f*=TjAP9mW2!bF8f*{oKH=HBDOTIlj_y7O^07*qoM6N<$ Eg7L8#vH$=8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b69487120ad7189c0585799695916db7274ac82c GIT binary patch literal 568 zcmV-80>}M{P)PbXFRCt{2R=-OEQ5^po5g|cNMNn-HQPv+&Ee=i&1yK+Mfe>wp zOK?Gh&_PS-;85t4OHC~;uGJqSw!QT9~kXTs|e5wm4ToS6%VZ|tC@fXk}t zE3=dyY|FItRH4IjnTlFJt=v9Ra_fknnYy{BvzbvUvtCH8N;Et&L_6s?DRs5|9sp3s zOit1e-SI|}+b(7&Oh4b(UTJqNN&ERd(TFxj(e@Oere*y!q6g{1+7`h3ARXsp2m%n@g*MHI5&g7s z!hPrwpra))F2w6+5JXFPij+izQGFcY!>jo6@k>uJE@lK8#ta?bcpDmH>V({}07C>L z(!{Jc;D+3l0ILY=kC7X4*8&U?tS{O|_x&UC1b71eoq$gSdGU*`O8!d#0000+)&mMJ6mQt5*T-eOqotRQoSa4bWgJccc zqep6tzCIoH?c8iiLbrFbdGDLwD)aLFj`}Um`xykG;AVE1;_6$j*V7lqluKxxs7zp! z)$-V!b!*|T+bTJ)Hy3SV*vxoLZo}5)g6wt-3Vbz}zlp6cj@@6zymqPZPovvA>$d#3 zxyH$AqCWH5>3#>c)xEt{s`{7XQ$?Zb!ln+tC;vW0xu^?ieXg}{+VVQlh&#QL4 z%J`RYZ{D&QdFCGsB^QgCJlNY?SakXCzOpYrKbPme{#;bXFHyVbQufUMuO41DW_VEX zpP?c1xZH*8m+|cR(etNYKIg>hS>AAWu?Rx|_ZdB=1E-zE?_R&UJ3acpe#@ylYh2We z%BOX`Z~?k1Qm)zTYozF=Sqqzv%&TnSRevwxxB2ay+*+|#+2ucFPa9XEa5Q@=PuO#8GFsF@d2~7pN>~-L%sT iuA1Tu2@OprChD66IIy(-p5Y3NMFvk-KbLh*2~7a8?${py literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e10648fd9b2d935bc18b472236fe0f50973efe67 GIT binary patch literal 677 zcmV;W0$TlvP)Px%Ur9tkRCt{2+A&NMVHCjeKVKTK=aD0~xR54{##GXLgM*rMVz3Ob$iku_)xkJ2 zFfeprU@;^vWpQD!F74oKOpvjuN(iF~VR3`BmXMG>hqJW>H1w$Eu6e)Z?z`Nj-+S-7 z?}k25N-3q3Qc5YMlmgPD$lu1p#GJq28Dz-~g7yrO9u3BxiB}S?TEtEQ+5x5#aAV4n zavcCtt`m$Cz4t{~KSk^$U_E2W`HlcA*Q(6W1Ym|H%e5*1Ip2}>jQu}RgmA4QW|KxX zeB{IPHSr80HZSFuuS9HKJQG~s@R4lNM0N!ft(BbbNW1bIe(y0oisXDpiq>{w7-^q$ zXJzY2fwPwZkx6RznK6iIFd6Bj}t5zc!JcKJ^ z&sSi%R%OYB()1*!jXIURZB83?O4E}pxpek|s5)*jvYrXv_1Vvd04&^l1O($$BG~J? zSMY^udIotg;qZQHk<#=e3ttYI{kFxYqh@56emBn`g$cMdR{&tl4ORib_sS}(M^|`- zyElyXhVsv6K0uxc<}NlbZ=V)KY+iD{b7>rZ%tZIiaj5)xo? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json new file mode 100644 index 00000000000..2d5aaae8c75 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d", + "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/maxim.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..b4c05095dfb82db22b39b6ea5ec6b2370b1221bb GIT binary patch literal 2469 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b4b447ab1293abad9c6df695a06fbc167475c6a9 GIT binary patch literal 910 zcmV;919AL`P)Px&NJ&INR9J=Wmd|S&M-<0Dng|CO!v=Xl1%p7Df?OlxAB$OnE)v9GD^L?b4hE4+ zb4y8~q~vBw{(|~of^knp&|WIvoX{R>45kP-c9WPALl?mkK?*A(Ls~gS+38`~t##3^ zlJ=(WY3I#%-uuqZyzedyF~kr<3=t96lB4Qca#U#ob@xVAou9jVBdaul@;QU#jYlCB z5<-2P`3L~}*<-f8KjHSxa!_ciS|c3?pYvzuNbPpq*nc9RkPvEhYL2tUV*ti42*Bmj zPbye;6Pcc1@4Fh~7ev5WoigCJXd*-um44#wj-d6{ca`V0r|Vj)R_&*j>1P$&2e5 z$qVO<&%XSM7tR@aMgrcv-Sy_vac_N?fWFu?47Hv_`H2b%p*9UeX#ypsR4b*Dl2R&7 zpf(Ld6%s=E!q<~t?7ak-rm3WqfdIeV{Gz65_Kf}ZoF4IFrfG%>=z9c-rw815Wnp(A zpU*3R2lq^zhJ~Jyd@w$ao{=~WiwE~i0Hl=4?!ui{7Kx_^p_}Y0V0CJawYGPrx~2iJ zu@|RODdRLOb|38oVm9`?j?QJX=o!gc+gl%ozPD5pC_N*|WwRWgoN#?U&isd$*l$ko zX#YvTTguOnpJ;OUdzTfA#o7l-_@50lxqLYW>0S&-+0< zcO}oPOaZX*O>Ll@k*wIqFDFfw7mLiw6uB#TPF-St@#V#0&$0Y30-hh#+4}Y&^E0_% z$FnjO6#o2+`vVIY29g1R;4J#TjeM{itCU1FL*&0Q2+Pq+Yl z{TiPA9X)TPOXwH>fl=1lpcR*xT=2Yqa=}C^F0t13=5LJ+_8E?(^t=I0E|@ru6WFY8 k*SfCr{GcAJiE2py0Dq)Z#l>zj_W%F@07*qoM6N<$f^6Ej2><{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8c4a7e0264043edabe346d2a2806c75e797bc262 GIT binary patch literal 493 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zmwUQ6hE&XX zd&|+A$x(*&!*K;}xulcp4N44dIr}I)Jle5HrQ_QkmQt=?YIpa%tUWmUd0s8k$FSoL zHWeRaxE}3q-cjm3S2FkM-viA$`3G)FrYFifxWK@cWy>@dr}nroKKW@kExK=(g$&SzK{xVTs!cCSBhyP7e+ z=&t;RslWd<=*s_P)PK)b`|+auiK{GcTFVdQ&MBb@02}n<&Hw-a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c6f785c6a9bb6d2d73b1cd94a26efa268c9ac99b GIT binary patch literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z_j$TFhE&XX zduzYf;Q$HN4~LhsSb1z%Ur@MWhU2<`BTJRK#2nAau*_w-e`Ia+ZuUD?yMMAQo!#eD z_~L<%?vy&dr5mq_oV0&?^>Z_y=k&|{OTHhnWe|jcztOtEuD2yV%A7dcs=uyjOYg+0 zNYB$D_15>cUwWdidr!iyoRLAj{dYyB?4x%N<(@zF+<3Bhist_34l$;G=a@<@+Bz+b zbZ=FO~nnJ9Ej&_0RO*$yMLbUYq>( z#pAO#Eblth+x*SDy7c7#OoqJ|S(*zdB&_ty<> zOT3{q@c)js4pH84_=3>Sa1kdh&l0 z{|wH