From 6fad90072f056fb1ef2e83a67da46d190a76c58d Mon Sep 17 00:00:00 2001 From: Krunklehorn Date: Fri, 1 Mar 2024 19:01:09 -0500 Subject: [PATCH] Re-implemented the warden's unarmored coat, with sprites from Dutch-VanDerLinde --- .../Clothing/OuterClothing/wintercoats.yml | 17 ++++++++++-- .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Recipes/Lathes/clothing.yml | 8 ++++++ .../WinterCoats/coathosarmored.rsi/meta.json | 4 +-- .../coatwarden.rsi/equipped-OUTERCLOTHING.png | Bin 1851 -> 772 bytes .../WinterCoats/coatwarden.rsi/icon.png | Bin 761 -> 324 bytes .../coatwarden.rsi/inhand-left.png | Bin 623 -> 493 bytes .../coatwarden.rsi/inhand-right.png | Bin 621 -> 484 bytes .../WinterCoats/coatwarden.rsi/meta.json | 4 +-- .../equipped-OUTERCLOTHING.png | Bin 0 -> 1851 bytes .../coatwardenarmored.rsi/icon.png | Bin 0 -> 761 bytes .../coatwardenarmored.rsi/inhand-left.png | Bin 0 -> 623 bytes .../coatwardenarmored.rsi/inhand-right.png | Bin 0 -> 621 bytes .../coatwardenarmored.rsi/meta.json | 26 ++++++++++++++++++ 14 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 3966a06ccad8e7..bbf1926185351d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -454,9 +454,9 @@ description: A sturdy, utilitarian winter coat designed to protect a warden from any brig-bound threats and hypothermic events. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi + sprite: Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi + sprite: Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi - type: Armor modifiers: coefficients: @@ -469,6 +469,19 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterWarden +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterWardenUnarmored + name: warden's winter coat + description: A sturdy coat, a warm coat, but not an armored coat. + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterWarden + - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterSyndieCap diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e9640fd7669d76..1db55da0859da9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -953,6 +953,7 @@ - ClothingOuterWinterCMO - ClothingOuterWinterHoP - ClothingOuterWinterHoSUnarmored + - ClothingOuterWinterWardenUnarmored - ClothingOuterWinterQM - ClothingOuterWinterRD - ClothingNeckMantleCap diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 47a755f95f2dc2..0b49f03d876e67 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -650,6 +650,14 @@ Cloth: 500 Durathread: 300 +- type: latheRecipe + id: ClothingOuterWinterWardenUnarmored + result: ClothingOuterWinterWardenUnarmored + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 + - type: latheRecipe id: ClothingOuterWinterQM result: ClothingOuterWinterQM diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json index 0ce24ecb3a1de8..4010520850d58b 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, recolored by PursuitinAshes", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, recolored by Github user PursuitinAshes", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png index 28cf03f49ccd09649ec2e4a5fb5f7a0dfac3c8c6..baeeca8781a8ee083076b01f0e67c418c752b5f2 100644 GIT binary patch delta 759 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 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png index df033631e9d7cbbdfc6b4b9674714336b92386b0..464c4bfc5e3212ef1ab94fe1597b9a9750d7d53e 100644 GIT binary patch delta 455 zcmV;&0XY8e1nmQmFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pG zXh}ptRCr$P+P_KzF&x10)OJxPEeM@leFpIXd;xE87X_zo;vmJLYo`vrfQvqWi<=1U z4sM5wg5V;kAZYX#6F99(F3BN*?+1?jF71!Y<fn0tL3WJ`H0Q`SJKe3EcNc}f|ik!OJb?>d5PHkx>~kOMn-J9)i&|7 zel=zFe)M$z=QCsT>q@!=WVDt?+iLiDH_=F`li%b&wrWCbeu(5Vz;SEWsXKD9`Mw(Y z2nsiCMK$&nn}6@CkzW06nyzi`dp$2U9{>OV00000002M8dZ*>=i4ko7OJ?f@Gap)(-MZ@>rB?i2?nvYY|(5j^g_nLra%ZVB8xbUH;*e4eTT;76%< x1_7%6EA8%Y0000EWmrjOO-%qQ00008000000002eQHb`pHiB^xWTEH1Ad5E5Ot=&PGE3^7%Xf zwrz7Z8e(c%=y|U~*#gaeA6?h6Z5sex*J<|qa~H5^-iu_AgVm}fx4xd8xlDJur-}M{ z_S^$)(fog*8TQu)Q zpj+Tiox&E!ttQ8-!ojmJ=`-49H|M>|aY`IS%Qh z|1x4Z0RX*TkKO7Ep6tHj-P(0jx#(-0Se^ls`vaEa@b&gBZhSff@O6J6lsiIEFqW1` zCzF_;k3+EVS3JaY3oJh@&>0T-F&a&ueLVc)YXV}q1z`MNpm8!@!0mRMN~IFpTEs>A Y4bBS>D*cLYKmY&$07*qoM6N<$f~=GpcmMzZ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png index 77baaca885f2c08226c86e3285c5aa4a3f661150..d537128b824be397369e534f96a0a8bfa07345b4 100644 GIT binary patch delta 446 zcmV;v0YU!l1mpvdFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pG zUr9tkRCr$P+A&MRKor37ORGY4l7ism>Squ)7e9b5?xN7CtAm6N;?}8yU%Im2;3zaU9!|l{G7)CXbY*P0JvZ%^^smBcs&{ny&nAhc0I8 z{kP|_{&iF~htU#{k=p8a%-QQxE=g&V-=t64R7+KInEFNiy74r8`AJ1{$ZdkcPZ^Od zYf?0a+^GCC&42fgdTM6DEaU(H000000002+?@FJP++1JUqla~-Q9-n)aUR?G8iLw{S zESS3in1u@z-k;WP=HkKp>;X{}Ei8T{pHh}3Aoh|*GdBpsFINGehcVwxfUW)#LHTB=`DYK99dz%>lcM?(OL#UcPf5O6*k z;u^+M0{p9}875uLVgn3C$&j9y4Rp#o zv`>86CqA9>PR!-TW8Mr?8(`ZurK*=IRlSsL+p!fHr@zi{)Hu*bjRQUFa}r#I3_=JY zgb+dqA%qY@2qEGS`Lrked%1n$15m1Zi8(P^i155kDSxFaSxc|_f$3!;eS3vMK|k&G z0C=6f`DZ*yw@1cJJsO)O3=i<|>o@ZGJef>p;YBS|qy_+Nrqi?r1K!=(#Ih{<{eB#E zEls2bD6hiX!Yv-}zhuAuoNl)pS6xdJ>D{elEe-JH-d%2g{Df;5iMu;6F477JgFg6t z%=X3x_CeZOJXI}GH*rhs(h0j|a2xmLC4eG-|Knaa$!kJovYtk>n& z5nQo=TlC+*kHPw9F*bHe zyG`2y)Ya7)!FLY>AMPdBDby@l zgv!cFo@(*i5@5&TGQ;25iSdma@zJrLux~qLr%P@OiE^pz{6TTOMcmsd?(12rp^CY0VMgE(-?Yf3l0kRt1d3az?BK~ zA37lGdwYTA=4KR&>qos_>=XC#exykRD?dt#P+D3_Z$MXne}uerq2wPK89^`@l=tcI z+wy=ve0~(VB5lzCl95!nnly&zyiNnAjfe97bi&F%F)<-aehxfV_NeQ+{BsIG^*PuO zVZ)eZfP$6WdLN(T^Qm}2Jbrd~a&l50yM!p}SiJyUep?=J`{6?b#Yn3LAwqRpy#-~& z;Lqowj7}G<{8ql$W7g~PClnxd&TZeh-?hi<!2h@W+VKtK+LeB%U5cHS$-AYJ~10`TEakDV1qXU%KCjE&2BgH^Ycye>FH^V&dkVqClL;ZQUBfd z@_49MaQRx~y#KVA`iOG{`PyyT7Qmd6ga?dnSdUFFufWR2Mi&RGp0gKGC9We4Q{P5xlbc2qPm^4gC|M=Cy)~WS&p0l$a3TaK$asX0J0o80dyaT zU5`8c5AZm|Zl62;FAy&#pA2!TNc3Z*3vB_u_V1RFm%sD!CcIG$d|0WcNV7J%Q{ zny)@F7aSF$JSwI^+V9+XWO`w|Ud82^qu1Ej z2q)1Q%@cZUdk;*%m&qzLCyoX0MCJroLQCr1$40>n#H$nPx%vq?ljR9J=WRXu3iKp1_hWeug6!wz)>qFySnh@g5aK1!EL}1MWM~N(1V>Bam=a1Ygs(%;VbeH~3LXl6 zi=^+qpQm@TD8m$b~o6d*g?1v$C)-8kaKw~ zFIiAkmF@5EGgVdD@{$EPmj`V&;?{={)lt(l=1>ad?IJJspD%7fF7RJfB{8jY_6QIoo-mPx~*ygr+y$)U1`JeYH5UvC0 zi+l0(%KFjI0pOx1K4))3QIx+F@H`Jw-+x5v{9eR53B^(oR_hF&=i%t+sPAdD&LEbG zanb?!2L;4Z5uzwUk|fN{&0%L}2fptk2m%BjKMhZTa3se!w-5vY=4U1`Jv}YV&rBi+ z0*r5N@zEO!fe4C|V9eS=crhK@*6;|3r6PRahn5X^@v!TSSzFMu0es(&JqeKs*aZVq6Qu8C rdvI@zzstEirX~pNf)R_r2qXLf9s(+BUc6yD00000NkvXXu0mjf%M?mq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..df033631e9d7cbbdfc6b4b9674714336b92386b0 GIT binary patch literal 623 zcmV-#0+9WQP)Px%DM>^@RCt{2+P`ZPVI0TtchX+`L4>0@YytHb`pHiB^xWTEH1Ad5E5Ot=&PGE3^7%Xfwrz7Z8e(c%=y|U~ z*#gaeA6?h6Z5sex*J<|qa~H5^-iu_AgVm}fx4xd8xlDJur-}M{_S^$)(fog2oZ{nfm}+H19>ATi{Qf!WPG^CdaKN zox)b+`FVvl0fu3)xm`|dZkH2=VMLz4PzUur_n^M#{_A_#c_D-lLI@#*5JCtcgb-r3 zP&z|VnDhv9Ya0OEeegK8wRl#mmfYe>X4*ScO1XZUrm>v0$qf>KN8RrLyuN&iR;%T? zp3qujVM?V^>7@TMVmSc-yI| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..77baaca885f2c08226c86e3285c5aa4a3f661150 GIT binary patch literal 621 zcmV-z0+RiSP)Px%CrLy>RCt{2+P`ZPVI0TtchX*pQsK-U<^l(?TOSEH2u`~AKcwj*4nnf~2V}U# z&BZC*99oh32gJpxli;93bEAboP||V~(flxZoK9$d(46K%u6|$B<$(vjpKqRf2zee5 zLI@#*5JCtcgb+d;)@yp&bCS%PVSRi+DW%6JDW!C?*-S0E$hbtwaABa5weB=`DYK99dz%>lcM?(OL#UcPf5O6*k;u^+M0{p9}875u< zzt_VwO@bf*z%)(#UN12XfM^-g;lp9QrW;$%)MdVRcA9EzIV-;*E-ZtWbF@-QE2XrT zb5=U^Ec0fV=u{t7E zv?u&~xqadTP^x-~IWby@@Vrear7KxWulj-MWg>lhg+f6;?e+k8oxS;IJW01l#!WpM znD