From 743b86bfe61cd87d6e513ba55c5450ab823fe55d Mon Sep 17 00:00:00 2001 From: Kai Shiba <100050424+KaiShibaa@users.noreply.github.com> Date: Sat, 18 Jun 2022 06:23:49 +0100 Subject: [PATCH] Nun Robes And Nurse Hat (#8681) * Uploaded Nurse Hat * Uploaded Nurse Outfit * Uploaded Nun Robes * Edited for Nun Robes * Edited for Nurse Skirt * Edited for Nurse Hat * Edited Medidrobe for Nurse Attire * Edited Chapeldrobe for Nun Robe * Removed Nurse Outfit from Review * Edited out Nurse changes * Edited out Nurse Outfit --- .../VendingMachines/Inventories/chapel.yml | 1 + .../VendingMachines/Inventories/medidrobe.yml | 2 ++ .../Entities/Clothing/Head/hats.yml | 11 ++++++++ .../Entities/Clothing/OuterClothing/misc.yml | 11 ++++++++ .../Hats/nursehat.rsi/equipped-HELMET.png | Bin 0 -> 280 bytes .../Clothing/Head/Hats/nursehat.rsi/icon.png | Bin 0 -> 173 bytes .../Head/Hats/nursehat.rsi/inhand-left.png | Bin 0 -> 253 bytes .../Head/Hats/nursehat.rsi/inhand-right.png | Bin 0 -> 263 bytes .../Clothing/Head/Hats/nursehat.rsi/meta.json | 26 ++++++++++++++++++ .../nunrobe.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1223 bytes .../OuterClothing/Misc/nunrobe.rsi/icon.png | Bin 0 -> 247 bytes .../Misc/nunrobe.rsi/inhand-left.png | Bin 0 -> 628 bytes .../Misc/nunrobe.rsi/inhand-right.png | Bin 0 -> 639 bytes .../OuterClothing/Misc/nunrobe.rsi/meta.json | 26 ++++++++++++++++++ 14 files changed, 77 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/nursehat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/nursehat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/nursehat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/nursehat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 99902ec506..ed22e08d47 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -9,6 +9,7 @@ ClothingOuterHoodieBlack: 1 ClothingHeadHatHoodChaplainHood: 1 ClothingHeadHatHoodNunHood: 1 + ClothingOuterNunRobe: 1 ClothingHeadHatFez: 1 ClothingHeadHatPlaguedoctor: 1 ClothingHeadHatWitch: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index 001ee08276..4467664e14 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -8,6 +8,7 @@ ClothingBackpackSatchelMedical: 4 ClothingUniformJumpsuitParamedic: 4 ClothingUniformJumpskirtParamedic: 4 + ClothingHeadNurseHat: 4 ClothingOuterCoatLab: 4 ClothingShoesColorWhite: 4 ClothingHandsGlovesLatex: 4 @@ -16,3 +17,4 @@ ClothingOuterWinterPara: 2 ClothingHeadHelmetVoidParamed: 1 ClothingOuterHardsuitVoidParamed: 1 + diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 852a547455..bc16137775 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -445,3 +445,14 @@ sprite: Clothing/Head/Hats/fishcap.rsi - type: Clothing sprite: Clothing/Head/Hats/fishcap.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadNurseHat + name: nurse hat + description: Somehow I feel I'm not supposed to leave this place. + components: + - type: Sprite + sprite: Clothing/Head/Hats/nursehat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/nursehat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 9e92df7da7..6ff60e79a5 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -209,3 +209,14 @@ sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterNunRobe + name: nun robe + description: Maximum piety in this star system. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Misc/nunrobe.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Misc/nunrobe.rsi diff --git a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..3d45343aea8102c1863d2b48c319dbacbcdbca1f GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|E_u2*hE&XX zduul@lc7M%Ltc$1T?@H_+^;xnG8HJ`ouRdWVOK<~sxyO~o|DrjU8g_sjPt%Kf1dHM zcx#wzOWq_Ur>$YB&tK2f)il3x}_=KtU{1^EYi$9Tv~z#j`dd3KJ0tEb#FAsM)Q`@-pbCkNG(yp4Gyeb}3p5~b| zWsha|KfPzw7jFH2`|9U4OQwo0YZ1R-#kn`m!F;X$hO%?!)|@ay7!L67WpF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b9bc475b1721696370d08c31b244155579612a47 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*ELpN7IXU_M{reC9 z|8Hn$`2YWZ)U@3Pi~lSKs$nb%@(X5gcy=QV$Z_^`aSYLzn4BQN8qqMJbF-4s{JDdqh{%Q-MQeL6^z_scDa5MIK#f4~ zT4Sk((w9jhf?7*6^5X8VS#tBI@6O#SnNv!3*_ymMd{=#HLHSk2t2`E_`?=q86rbAu zbIxWZC(GyiPKD<-#(yep(L2oyF$qW>kb1Shxg+9BMODP-p#LR%?RA%?XfAbqUSfUV pX^n~T=0pjzeJ9i^pXq@Z{Ki~l?h@Rko=+iZrzzb_k^~b``rEa692As#>SgJ zzujoz!@YZ{{FmDNw6y7$6ANdYUA3KMZ81pKj5n-P?WXS9#?=2C#PxLbb6Mw<&;$S~ CTWSmd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json new file mode 100644 index 0000000000..4a7c120f3a --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/988f795be2dee02a8252d3e584fbb94d43d4a965", + "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/Misc/nunrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..dfbf5b037d38fcd3cdbdfa1e847e1a8a8b8f42f7 GIT binary patch literal 1223 zcmV;&1UUPNP)Px(fk{L`RCt{2n?Y;aNEFBaUTjIG7-OhYJGGbK5MNS~gMH2iDBWY|-JhV4TYJu- zpu-;avX?CFZP9U|AE0M1WzyY4Q(8*5_3nBP!kA!52}}?6n@X~5YZOaioB4rJWDWCw z@6FR_ta$+x3WY+UP$(3uX*KH{0AFyK&#wQk_)elN_bx7BnkFpE;(jd4;-+beb}88D z?|b0@q^ZqY%{pg{1)TODIp>@)##dy?m27C#s=QIFQvZQZ=vr)Yam8EBIw~8RI5|1N z-rgPn;K>gS9RKzS0C0MGie9e=dpN-Rzy6l#JC=T-$0&g|z0KPg%XoY;_cK~AR$C?8wg7ng8c50!E$PPeh4{>V9Ek@GV8t0KfZ_u67aX(Rxkvau=t zrjd7C4}ZS>0Lqx(|2T`IA*~;FoX`q+(JrojtPGf?lQ>q&CD_A(`1qaow_6us{c`D6 zARFjB+%67F1Hc$V|MeSi&VgAZi-ta(3w&v2kH#2{&*?PBIYB)C@wqWQQ9M^-PYp_RSVbClC);asn>C(m5vTMwbWOIaM1=4EqM?f*Bta?wmSv&cZUcZ=3jotK005kw zo#F8CFtIV$p)Y+4(31B@^C`-uTNsVc#W6_=%Ide8brcO*T8XQUNF$I<~*xj1JumkNVhm+s@>^ycoddp@y8GDrf$IF2X}e6LWSsb zI?_Rqej{WL2k3UYf$zHAE?zx*goEw$-^v_pYk2kSQKSv_a3I}ZqIZJfApHCJBc6Yj z)=tFBcOIViJpdmAHrT^KqL-wJHb-eM&cA1$(dOvdZAi2)aFYp4I#dF1q33$+T?<7iPw> zah(J@Z#C<@QLFOZoh{B7qe{)R;fyi9yR*d`wQ5v-a=LQ>LRFi0Zdc&AUZ7$lZAk0R z?F#JC7!>$ffrb>)b3mh36~zhHy)_O5tHt~S6PLu3VA0S68*8vm9h2wflZHvQN3MBjmlUXov+(4yjWjg6~(q>XjdcH}E+t13ussgwq)V=M{s3ubV5b|VeQsq=Jk4AGdFoFL)j z;K9)J(BX!u?p03DhCo|g9i3P~Plv@i#%q~89Wnxczj^7~El{-iVAREJ9R%z|ZHD824?)P-{b6Mw<&;$V9>P_JQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0e94f2282889dc670fab7d593eabd9bb289d64ba GIT binary patch literal 628 zcmV-)0*n2LP)Px%E=fc|RCt{2+D(hoKo|$`f2B=Qq?982((QJw)%Mcf_LS3{f+CCH7ZC(ceujLL z9K3k&3-q>^Ie78~-Ds6AOAwK~6&??5LbsxJ(@ECa=Lezi&}TX`&CCSy0E{ul7-Nhv z#u#IaF}6OkZJQFdZ4&@mHMwf&So%KAW6G6PH)!Y@4t8(BvaB>_Sr)qOCdQKs1Yz{Y z{F_w+je3m$K&zA~il@*jWkm6myl>x2Km0&xe@jYRo1sCk13w7y;^iver)q?EtSbsPt->p}>DBrll+Ap~64EpQ}jFijIu z%5)QyQj%$!h2>vGF6+tAHTXeDcaILz*m!bL`r8JW(6tKg-ENT|gaBrz!rPCZOJNi% z@2m1t004q8O4n*~e9dDkO?Vi^w3zD$VG>jRhvhN>05I&|L8D&FoNwrw!rm0`6tf4J z#p|@de8w1Kj4{R-V~jDz7-Q^zF&d4K)E&%Uyl$80CoNipD->TW%k9lj-rCJw?6r>I zO~%*Vm1~jK3?!df8@i#cPsM7~Yk2nbN$K6$_}{J=$%ErKL`3xH;e7yrlrr-ju&J|` z)*(gl6raAH0~yD%u}c7$Ed#Bx-afvu6OdGoY^zK41Bd%N+xIZU6!{7KUj!4$L#uuO O0000Px%IY~r8RCt{2+B3x=mY1ormf9NnVb8t#gii@3rI$Fvb{Tj4{R-V~jDz z7(kX~QNpq;0zjKi>R*&K70BjH^H@gdY(P^L9PHnPX_{%wG);6`4UEPU1Yxv-bn~@S z*05Kt5CAB0iK2K4MJ^$Vr{w+kCH?k;^j>MfcAE~`Nw^l1Ko^y+up1c3BGk50cC+sH7Cb2T*UHR`k)X$_Y? z!1Fu^A<*x(so!m<4G==W^E^0?vz9`ZW!pAf*M$%QN$yD#gb;9D_v(ijh5^TM(nZj5 z95M`J_1Wj>Z);dM7c^CYAB6Pi{y`cWjVDqO7Qlq6$awtV9{E8CV74oK{BkUXQJlH& z+%5nBK^Ud;B-uLVu_7#h0Dv%x2{_5$55gptsbOIQ0ASF2h`nlMl{v1QrYcL1J;LlG z;`DWtPg-m9Kh(e&V~jDz7-Nhv#u#I4JKWj54FF`@c5;5;X3=#${qJVmc3~TE;h&+a z1V1Mj4u=4M@5f(rOK9D0U1zX29>E)rP_69bmCxEO-GC=gpGj}tzLyrAySWjPb3@5L z_)X`t3Dm6DNFVeH-GHU1K(k&;=YFfPpIbufwsZp&dA5NBVN~cv@H!_x&c61AIX%MI Zi9bD(_s^l`VTb?#002ovPDHLkV1f&R9YFv9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json new file mode 100644 index 0000000000..217a3f9511 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/a20589c401fc9b0f23c1dea08c56d4a1697adcd6", + "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