From a4b6ce73a3b161d4d46de41de15a10e44a731dc9 Mon Sep 17 00:00:00 2001 From: Finket <42383212+Finket@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:03:23 +0200 Subject: [PATCH] Port over hopsuit (#22) # Description Port over https://github.com/Simple-Station/Parkstation/pull/87 With changes from https://github.com/Simple-Station/Parkstation/pull/105 - [x] HoP Hardsuit https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/issues/2 Note there are other changes in the original Hopsuit PR that I'll just list as tasks here just in case. I did not make those changes. --- # Tasks - [ ] command encryption key box - [ ] command key box in HoP locker - [ ] command remote in HoP locker ---

Media

![image](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/42383212/3c227250-ac6f-49c0-a2df-a9585a877556) ![image](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/42383212/a21d9f62-55df-4d4c-a099-af0f0284c3bd)

--------- Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> --- .../Catalog/Fills/Lockers/heads.yml | 1 + .../Clothing/Head/hardsuit-helmets.yml | 41 ++++++++++++++++++ .../Clothing/OuterClothing/hardsuits.yml | 28 ++++++++++++ .../hopsuit.rsi/equipped-head-light.png | Bin 0 -> 925 bytes .../Hardsuits/hopsuit.rsi/equipped-head.png | Bin 0 -> 1144 bytes .../Head/Hardsuits/hopsuit.rsi/icon.png | Bin 0 -> 641 bytes .../Hardsuits/hopsuit.rsi/light-overlay.png | Bin 0 -> 314 bytes .../Head/Hardsuits/hopsuit.rsi/meta.json | 25 +++++++++++ .../hopsuit.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2203 bytes .../Hardsuits/hopsuit.rsi/icon.png | Bin 0 -> 840 bytes .../Hardsuits/hopsuit.rsi/inhand-left.png | Bin 0 -> 917 bytes .../Hardsuits/hopsuit.rsi/inhand-right.png | Bin 0 -> 926 bytes .../Hardsuits/hopsuit.rsi/meta.json | 26 +++++++++++ 13 files changed, 121 insertions(+) create mode 100644 Resources/Prototypes/SimpleStation14/Entites/Clothing/Head/hardsuit-helmets.yml create mode 100644 Resources/Prototypes/SimpleStation14/Entites/Clothing/OuterClothing/hardsuits.yml create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/equipped-head-light.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/equipped-head.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/icon.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/light-overlay.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/meta.json create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/icon.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 9dcfa77d90..30ebe81ab0 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -135,6 +135,7 @@ - id: ClothingUniformJumpsuitBoatswain # DeltaV - Add turtleneck for HoP. - id: ClothingShoesBootsLaceup # DeltaV - add fancy shoes for HoP and cap - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap + - id: ClothingOuterHardsuitHoP # Parkstation-HoPSuit - type: entity id: LockerChiefEngineerFilledHardsuit diff --git a/Resources/Prototypes/SimpleStation14/Entites/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SimpleStation14/Entites/Clothing/Head/hardsuit-helmets.yml new file mode 100644 index 0000000000..842796607b --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entites/Clothing/Head/hardsuit-helmets.yml @@ -0,0 +1,41 @@ +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitHoP + noSpawn: true + name: head of personnel's hardsuit helmet + description: Fancy helmet for a fancy hardsuit. Doesn't offer much damage protection. + components: + - type: Sprite + netsync: false + sprite: SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi + layers: + - state: icon + - state: light-overlay + visible: false + shader: unshaded + map: [ "light" ] + - type: HandheldLight + addPrefix: false + - type: ToggleableLightVisuals + spriteLayer: light + clothingVisuals: + head: + - state: equipped-head-light + shader: unshaded + - type: Clothing + clothingVisuals: + head: + - state: equipped-head + - type: PointLight + color: "#ff2034" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.9 + Radiation: 0.6 diff --git a/Resources/Prototypes/SimpleStation14/Entites/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entites/Clothing/OuterClothing/hardsuits.yml new file mode 100644 index 0000000000..7f26eeb1f3 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entites/Clothing/OuterClothing/hardsuits.yml @@ -0,0 +1,28 @@ +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitHoP + name: head of personnel's hardsuit + description: A stylish hardsuit for only the most esteemed crew members. Doesn't offer much damage protection. + components: + - type: Sprite + sprite: SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi + - type: Clothing + sprite: SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 4500 + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.8 + Piercing: 0.90 + Heat: 0.8 + Radiation: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.8 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitHoP diff --git a/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/equipped-head-light.png b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/equipped-head-light.png new file mode 100644 index 0000000000000000000000000000000000000000..3258b0918f77ee6b761f07f159e3cf85623e40bf GIT binary patch literal 925 zcmV;O17iG%P)Px&S4l)cRCt{2noUR)VHkj)*$jos=x=k|OxG+gMHy1qhSVV_qD~ofs6%zCgLJ4v zL5ILD9U}UnLv%1Au%HN}Zbf9j3l@5*OxJXi7D|-bH z`-8hf&^-0imhY(?a$hl$Ng2uI#BK5r&~w1meM8B;C*C+U?K@2;m*dpG;{pIIUA%1c z^Si#c?xOO6$@VV@g7DAb>Mr1h9h+*k)uo@+ryoNAlofo{j$Rv5!Fik*!G)v#x<^3} z1VIo4VbZzu;?|UT-gEPtpks>F&nZ)YX+aqMFmt}@dzuKswC@Dc0c%pXgD@KiffQgW z5l8_RO;=Oq4DcN2p^@12;0i0;t#@)1;KvZ44{&c~p7U1DEU3+CmWpaG|;1 zQ~XY6gE?8ZVio|;I#AGW4}5f}sbV!)lNb++4eRYRm;UiwxSQzgpIp}!{dp4lTYt8}>Y~r;*Aux(ohn({q8_$~T4Rk{wZk`mq^AE;5i+OvME>Dn zU6cMApSUxdXBdKmd+BUS5We&jF{`zv%(!`87iU%quG9 zW$#?=&iyC3CJ=%k2!bF8f*=TjAP9mW2!fs8V%jhgwceOW00000NkvXXu0mjf8z{Z2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/equipped-head.png b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/equipped-head.png new file mode 100644 index 0000000000000000000000000000000000000000..a11c3bf5171260e853d369d0f8c828e6101b45d0 GIT binary patch literal 1144 zcmV-;1c&>HP)Px(GD$>1RCt{2n(u2{RT#%VX`6e~ZrzftsdI#~c81Z(D2R;V5DJ2CW`i%RMhRsw z>tHAd`e!Hz4nb?*lpx#kW~+N41tD6*ZioytwPHLTC(_$z>{c%t8?xNylTfauy3g+JZp-ah7JEDp zGd z*L7W{Ny}V_^c&jYHug39cC53yoH0$ZJOP#s7>o|MK78*ZBRDkei@+Om6C`q* z0BrdDeD>9+wrzps`;*KU#E#{fTbG^ysV&g&@o;%@5rBL_&`|GYW3zzfE_V9+D>q4oYBIHt=FJ= z^_i=|WI4A~8hA7|WZx|SFj`olB{@w)Ydhw7ypfz{w6G%Elr*}oBZS!gq#j!?i_~nz z<8k2814#(+kNp9%g3Jo2tEGczY{>O+CjMQ6mqmIDnEaOqT~19a;Qxd&z-a+aqYQ9b zfYT@goEG3T$^fSYIE^yEX#q~73~*Y2(0H*~wjWWP#0Z#MO8z7Y*P|a@n z0(1F3iHi4%Y z)pcWajaW8IESu%V>Kfs#JbLFjZjGELok^j&bu_nbDVIo=NN=BEwx7|(w0NeOx1(p6`Id}F=zTQ8WakJLZMJ76bgkxp-?Ck3WY+k8-D{T^sfL3+LAf|0000< KMNUMnLSTY-v>NaL literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/icon.png b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5b5c948d8a71f49c7749e85f25e66eff45c33567 GIT binary patch literal 641 zcmV-{0)G98P)Px%J4r-AR9J=Wmd|SwK@`V7X|hcW(GZHILXcJ|MMZK8f)sM{W_xL251}{3g9pLC zL-621>aFxps28P&;wf4L@wSLcDcT?bOQnRgA!fSy;bEQ4?z*#^#EW3Qm))JW`@Y}# z&U-TpBaHCBBcckFN+ke_%PZZ#Az0sBivSb~1>blq=wnGfky{*!{K$Agae1XHMfgD( zxSXBs0%WFhn28HR3DBC~sg?}@zEt*nxdI)?Oy}%GUJ>^yZ(Yw%vp4@BmpP<}fdy2{ z20{n`rsndlSgmD}j%oJ2B$PPVeGfo99uJ}jFTw|RA9iDtGp^Xu!LIK&&!^^G&#l9K z9>vc#g+613VT z0OMNE?)&L90MD9DWdTBf1F{Pww%@$w+Qh4kAi)wJk8bH(w-;QwR3gSyNrVvOI~qo# z-4CZPj7FP$N3#pr4}H}DKyh&iK!5l0dY}t87Cz{(ir!~l<=SM=U+e@-LuJa$aa<8Aj#J^*CMJm zRMvn>b?b27CUlZJV@?E}1JGv;?3i`twUmn>HaSDaN0_|I*@q#}0qD8lOz5@WI~KO? zPJ}w}drOXhbv(hae_{00000NkvXXu0mjf540!n literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/light-overlay.png b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/light-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..82ce3424e0dc36a161f2df282aed206846ead560 GIT binary patch literal 314 zcmV-A0mc4_P)Px#^hrcPR9J=Wl|2i>Fcd|PZ3Q=>L#Gakx;yy)e}RL$N*y|75ZnZ{b*P0H^I{Z* zLUYFS-J6@2k3t|2=sN@HLp@ndMbTkh{7PdD;4-qAep>GgV3_3=pYqK-PK_BN`M@Xx z)MGpoG|H&ey{y5XI-srIHc1K`9f9A~sy2k)g~-$JZ%A9vu0GYqmcYi-*Q^yg*Vzsz znl9+cH~60c?^@S2lx~3!8K7>1#y+lVupB_>@D@OmSnq<;#$Duqs^W#5k6TbC>l2n2e}9p4vIk63Nx>i_@% M07*qoM6N<$f&qGoa{vGU literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/meta.json new file mode 100644 index 0000000000..028d44850e --- /dev/null +++ b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/hopsuit.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-overlay" + }, + { + "name": "equipped-head", + "directions": 4 + }, + { + "name": "equipped-head-light", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5e904b8e113a72982718792b878de92029b01a26 GIT binary patch literal 2203 zcmV;M2xRw(P)Px-RY^oaRCt{2n@wn2R~E;AmTNy*vE#gvUPiHnqQnu3J+x}5(IRdLlv$)?kuJhO z7lmxnMF|vUF`dP9(^ctWHVxB7H{Cf5SxgxyUIa?UG%x})h#^jl6MqQRQT-&|*s@e# zd2G$%<=#BWU+>A1yBPgJ@ILjw=jhyX&%O6A=%9lRI_RK-4m$WhMb|IgfMyUeqBTv^ z)VUCXoSALP7S}I*e&O{RK&G-y_SXhK{Oh55cjD63TJ$HAWS|>>KR)|+%N_gs$c5UA zon8Q@w>AjrhPqdXKdMwGK?>^)4 zg9%ENb@W)0?(ui)Li8vI=>{9YH_&5AMBgcd5QGycG)?32g9$WEBb-Pfgh2G2LXRcc z2)^N(|3D9oMB=s3Tkiu z*?d8{WKmj~Cz!kez{b-lp3HvB=-3VVFJ1$nnE950p*SZ7bhi9w*myd1DF2}m0I*%0 zMF@ellu^buegLec3_=LDi?hwzybDg_HBF;u^Toc;X_`i9WnP`T!M+X{iNtGqEXj6p zmi$~=4KqJJ`bHU8n3)7@2mScy8vt@a+w;|oYTFOwEnM4RdVP?_}d)+_?0l=NXLE;NXkAiZ^ z0$^Y$uK2B`4CRuA5Q5+Q_6LLzluMS1KIilD{e!Tt1B4L77iLKYy15@t5HX@P0B!U- zLI^(m_*16-@sJNc{uChu+URw_&f53G36gLh-Z<;R-(CluH(xrqO@#8e2~O zUX4OA%NgI{z3;#b88M&|x$<3F@$pKkH0qlwc(lHQw|8}2Bpe6^XJFvuFszz zqf}XMTlhEf?}cXhU3<&94kyDbXJ)%piR`%7jwq1)&Jb?}zpDsnG``W(&WVtwX?4X* zE6`|sW1?%k=Y{{!B{2!7=Nl89Ja1PG(D>brJkFY=gAO|Apo0!N=%53a@LaP;jA-p_ zxry)b)aZy2t^H2x-F5x1 zqRQFGxnpy}#HFjX<=i6swZ%&mc%BZ+3CG#UIi(E%dx`uwoFI*t%kkDyhOjZja&8fL zH8XVU1lJ293(u$2>Z?;T&>bA3J2=L(>38`4;a7~meY2%gVJF7lzFGVJ;a5DHen;^- z^$2psc;We!>+f{!0J#&JpG({OgR2$fE-=8=PoiA;;2wd|agS!XM__cED<9nB>L>P+ znB2J*s};1->*VLsb!~M6&q+`&flJuCL-uiZa7<|h+5!39&TTm7`S9giYMb6ITt|R! z=nr*d)>1}ERh$ixnt^tpFf&f>W~N)FU|C>IR4$EE>Ab51Z zNFPx&0!c(cR9J=WmcMHgVHn3hXBQp+WL!raI2;`8<5nH6^(6qXV$o0%J>4cZ^t8X&e}P=jA@36B5JJ#9 zI85333_#iWOz+?@LI~a^&XMamWU>DOhMxBS3W1cS6P>t$ma*8Y?Xtc+#p=>Sw2TFS zma$k}ddT|n6nnK@w2Vb`;sz;A?-;kM5@Ze2PhGtOfV(zd4?ZxC7>xb4R_@gBDmK;a zJdJxklr~%D>g|Srf>*JTQr3eHj3akyE!S1I^GGT2DmKx9@s2S=OOQ28U&~l{6`S%# zj*?T10DM|~idV6L`Uw@mPpeM>C^^MQc_W8cvC%RXS;K6pg|0PV7HnpcNdTmjq%@uC zb{=jRvX~V>gjfGCli%7cWc0*ZtR__4Ib(C8#UATW1rK2W^UMR_Af=#QPptvUd0lOKzKLe?;SRZk%VP}fQ0v-+=H@Ba~jMzk8Uolg62!qC%x zyCI^GHB3LublM?w4k$BeM?$?1Go5w_^#Zr*1QYPdkpN3hF=FUxUkJh7vu6RAJ5u~# zCs1;VkvZyfVDh`iD}GM2$?ttU>p6p4bxth4uDl?n>Fm{Z*&O-R*)~VU*{kiI`1+yC zQQX|)ss!-sEI7$6bi9G)Px&Pf0{URCt{2+Ruv{Wf;KmZ+`5)ZAiApY(h51xIY?00}{)Y2)1GALGk8gFQpVb z_!oFk{{-p5zrcgggBA9oLJx|)taunAvIq$wZFddR7&g14m^91VbUPmG#AcyvCeB#H zJ|75gCSjg=-)G+UosjnhA%qY@2qAjsDlTd zC&BMlpj(%(V)zFb_ ztEwYhNx(`vYxS#T07}?7tF-<+=1>kNZD= zNxxbq5X0cT&22W4xrt&-bpq_QNTn3zpEf2M&QqO$`DmQIU%nb{$U2eUe0|j# rXB*!0OzrOg_-8-CzcJNAzzu%^pWH-j!sw|l00000NkvXXu0mjfoD#2W literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/inhand-right.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fee0c1b994c73b0374c4b1000e8cf463410cfd9e GIT binary patch literal 926 zcmV;P17ZA$P)Px&SV=@dRCt{2+0Tm`Wf;KmZ?e0cHf&ns?kw4KjLBxl(14_}B?oPg9uz%!*-I^j z9{LybApQyB!GEHMR@jROJt!7*?ZF{Zf{-Po?XDrju-PT0Nwd67x8tEsXwpgCPTiW( z=L6x*kKyHgp7$5z0U?ACLI@#*5JCtc{#OG3_5cpU6=T`{`E9${-DhL=7}E<$9&c}Qs?G(L1_GF!mX}ql-k- zIT~fFpN#(VZk;HlXp}89O=EwzL~E-^B#{N6QML|0ikI-P-J;g41~g5xkIc1LN_|8) zX42WMQfpQN;n?8hxvqfx%q-D#uAhi+zWjN-4~H zPXjmam0UA8iSE`afpF;fz<1%$@#mI59AFDL2i|(GiXm=mD z-U1^NVCZpsc*d1duANL8XQG~MhYv*|gb+dqA%qY@2qA#Q!;Z5T43h zSB&L;@W1FMxpn);i7%Ip^0$?tVUHe^?4J^+DSUjHTPvUP!?h%5&aV1)HMmxX$9Yo! zlBu~2-Hif`vc=iUPb;@)!5AoZ-H8~8dz^&Bvh4hNjroZFPmaew zQif@terv_I*Pp}l3Q$V1(`x#nTt1HH1pHV030rkZAUg`K@c;k-07*qoM6N<$f^W*j AHUIzs literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/meta.json new file mode 100644 index 0000000000..9c0b0d7378 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/hopsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DSC@Cabbage#9633", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}