From 5a35cecc50be63516354ea753ff88e91feccd961 Mon Sep 17 00:00:00 2001 From: Kai Shiba <100050424+KaiShibaa@users.noreply.github.com> Date: Wed, 30 Mar 2022 15:19:06 +0100 Subject: [PATCH] Plague mask/suit (#7284) Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../VendingMachines/Inventories/chapel.yml | 2 ++ .../Entities/Clothing/Head/hats.yml | 2 +- .../Entities/Clothing/Masks/masks.yml | 15 ++++++++++ .../Entities/Clothing/OuterClothing/misc.yml | 11 ++++++++ .../plaguedoctormask.rsi/equipped-MASK.png | Bin 0 -> 448 bytes .../Mask/plaguedoctormask.rsi/icon.png | Bin 0 -> 395 bytes .../Mask/plaguedoctormask.rsi/inhand-left.png | Bin 0 -> 308 bytes .../plaguedoctormask.rsi/inhand-right.png | Bin 0 -> 311 bytes .../Mask/plaguedoctormask.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 2364 bytes .../Misc/plaguedoctorsuit.rsi/icon.png | Bin 0 -> 603 bytes .../Misc/plaguedoctorsuit.rsi/inhand-left.png | Bin 0 -> 978 bytes .../plaguedoctorsuit.rsi/inhand-right.png | Bin 0 -> 1014 bytes .../Misc/plaguedoctorsuit.rsi/meta.json | 26 ++++++++++++++++++ 14 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index c7c7521934..c35bc66387 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -18,3 +18,5 @@ ClothingHeadHatWitch1: 1 ClothingHeadHelmetCult: 1 ClothingHeadsetService: 2 + ClothingOuterPlagueSuit: 1 + ClothingMaskPlague: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index ee61cfcc17..40b91b6f74 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -199,7 +199,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatPlaguedoctor - name: plague doctor mask + name: plague doctor hat description: These were once used by plague doctors. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index ded3f0dea6..6e43f650b2 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -93,3 +93,18 @@ - type: AddAccentClothing accent: ReplacementAccent replacement: mumble + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskPlague + name: plague doctor mask + description: A bad omen + components: + - type: Sprite + sprite: Clothing/Mask/plaguedoctormask.rsi + - type: Clothing + sprite: Clothing/Mask/plaguedoctormask.rsi + - type: BreathMask + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.1 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 41f9d4d924..cc6730671c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -198,3 +198,14 @@ sprite: Clothing/OuterClothing/Misc/skubbody.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/skubbody.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterPlagueSuit + name: plague doctor suit + description: A bad omen + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..dc2fc97139ffdfd8765e86748cd310f8dacf2c1b GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`ga`P9xE?rg zz{bYr`pJbCk1V-TYK^_f0z zo+K>)vb^C_$G(G!cW&@qy?FJwqBUo4V9Ap-_MGLFl^dC@k{!#KyzV~zyYPnSmvd+C zzG3vpl9{Q)><~UDy(L-t;n%a*ma^rgvA?SLZ&7uB%B<>`A2xGq59d478z}7LWpNZ> zInR1x?ti1ZXAYKMO)cB>c!&4=X*VxDPyHlp!jOH|WqZh?80}q*M|L%*NPT$j&G5h> zQe0%8xGf>3&iM|6eU(Y{J{hFpM-&B3SA#i}u8dNgT$ z+|j$+(!bNlvC6%n$hn-{)4tr(ztqUF)ylKNvXIx#xZKmg+|s|>(Y@KvyV1q0z_5?#-;`2_@pgc(Id#l&$akdTy;mXT#-l#|DyKtWMS zSw&S%6^An!8Pzp3wY0PuRdsNx(ACq|H!##UGRCd~7y>3tjEtscsyNJGgaKnyEpuE( pfOG;03rn2A30I0=!6+ad000f^2%j98;Aa2;002ovPDHLkV1o3Yv%~-Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9d290b341598f4470f147adb764bf8c8dbb3666b GIT binary patch literal 308 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 nUUSyUG7rmPIsRJ%mL;AO#t>DJv4*C zK!1FDsr`Omug>-Ref_?-p@YFdZ(4to+%!hr=a0?1g$Gp^2xZBOCrey~*m&0Cw9Elm zUtia+_k%sz{1R>rVC{FS%Ca%tZWj?a23|c~!Wt+89F?AX$)#h6HqCiAAI5}rd5*P~cDs$L5<r#LshZX)>SbxfJp^}5Kz6mi9-lfRaHaG6u>!$bFQxY3BaU383R~d zU5#!Xz!*au#~5QMiURLFB7(IR5xJHFJ3BkYtpf~)L+Nxnq-k1j7{@V-i;H;g+1}o6 poP~`pqFLzQ`4PPx&j7da6RCt{2+QDn1MHt8N@4PefCTT*_(kcb_=ur?ap4P)2yolW`s9Qvq_0*Ff zD!qt^l=ZL|^-xe2L`5pP?2484ARcm3{2x3jnC`YVsf6^Md1uB$HnAYv)^=P7J0EyS zcnLpdp7+T+hZ#tcBuSDaNs=TAAxaF#0WqFQARgDk=Jt=s9?Kf6xM!f#(ooHiL(UO3L zg$1OP?%cT20)vvMhP#_r434E{Tnejbn2@>)HU8>z@qk<-I4%GWz{K@BT#~ z;)9FY0kgBS!CH$Dg8BJ*LI?;U=yW;&XssCx24Zt_^S&K0Jw1*0J_sSG*XtBTL7wMm zt?Bi8WLd`E-d?nEXR(3+oO1{vn3|fR)9Ij;Vtad=X0u7NkrP57gm7erF(wm2Anr}E zR;wYU}lQdX0m^<$0c?l%gz4DwPV( zIVzP3M1F5YT?G~w7g0(grNnzbE`)P#eDAP!yA2GN#L@SAjMkc>D8@xlN}-gZD2k}7 zK-3NZs8p&r=LjJnr34sHWYp5f4l2tCA)vJ$caSlLvMf)WaZ=F>Fj@&%IB+3l9eWSU-Hq- zg1Nalv9q&ts;r4Dz+K~m4;f$Fa&)_0thJ}!Et<#z-1z1o`VP^=Xn%EuR;v|8SF_m+ ztyb&kEvF+y-x~YBjrJSs^*Y~ue374TUOrRa#1+6fM_HBty!_^m+}Y`2tvz+##Ql*P zjRsQ6ptUB?bBr;B5ZK+_J=I($t^>UHPx&ut`KgRCt{2+RtmFMHs;G@BDhxG$m=Nx&^l3Z-z6)-(L?UN)y2*J$E4BmT$5Y%cl0E{uTS}n1@zJ6jWU~+PjEX%wQ zf>NnO9LGdagfWIjqk)u?dcB^Jrkv3Py3z(oIUfTc=^J203=C*wH9LxX__*>{4L*Ke|2(WV`F&H z^x^#CQz#{{NxPZ>n$0EvLbR`U>q)>nmsWxHRM1+Zl)`(D*6p?O`Q=-U|2%>LEuO#1 zLF}R^iqKkD$oo4g6vlAQ;k`#G1(0{tDXEiAN{RO#V@zJb)>_guJru*C z1ax+SPDerr#>U1*Vh31ST9N?Xdy*u{7r!jaFvei5JygX#>6n_D%7bigCGA(1W%-Sb z#))4Bs8lKlA&~N~=i43l?(Xh!3@ZqNAP9mW2!bF8f*=TjQTOSUXZYfSr;mFW1L^yR z{z|0+;4iN{!6^;OC)`t!xNzy`qZ{22=znkW&q}2d*KZz>Wf^ati@0;AbyVXTnt>{y zR4Vyqv&ro2EO8tIh|SH-qZ{2296A|#P@R(^=NvmbJ8W-nGka>Ff;tv`CjemWv$Nd( z<|Uv#9X@*Zxs!c%_BRGfz`|QUa<|r=_i384a^;87I6dvs_khdgve#NuC=^JNgeZ#G z-`^LbcJ9`91tdvA=M27cnry8dxhc^1s%4BpN{KNBAp~if=Km)cC4E