From 225bc86d738eb0b9076c2f59ab9cfe991b8a7516 Mon Sep 17 00:00:00 2001 From: DamianX Date: Fri, 16 Aug 2019 18:08:43 +0200 Subject: [PATCH] Revert "full mime outfit, HoP hat and uniform" (#305) This reverts commit 89c485200bcf498565bfda9ee3cd30c87ccdf5f5. --- .../Entities/items/clothing/belts.yml | 2 - .../Entities/items/clothing/gloves.yml | 17 +-------- .../Entities/items/clothing/hats.yml | 34 ----------------- .../Entities/items/clothing/masks.yml | 17 +-------- .../Entities/items/clothing/shoes.yml | 19 +-------- .../Entities/items/clothing/suits.yml | 15 -------- .../Entities/items/clothing/uniforms.yml | 36 +----------------- .../Textures/Clothing/beret.rsi/beret.png | Bin 448 -> 0 bytes .../Clothing/beret.rsi/equipped-HELMET.png | Bin 270 -> 0 bytes .../Textures/Clothing/beret.rsi/meta.json | 26 ------------- .../gloves_white.rsi/equipped-HAND.png | Bin 216 -> 0 bytes .../Clothing/gloves_white.rsi/meta.json | 26 ------------- .../Clothing/gloves_white.rsi/white.png | Bin 462 -> 0 bytes .../Clothing/hop_coat.rsi/equipped-OUTER.png | Bin 1078 -> 0 bytes .../Clothing/hop_hat.rsi/equipped-HELMET.png | Bin 452 -> 0 bytes .../Textures/Clothing/hop_hat.rsi/hop.png | Bin 352 -> 0 bytes .../Textures/Clothing/hop_hat.rsi/meta.json | 26 ------------- 17 files changed, 4 insertions(+), 214 deletions(-) delete mode 100644 Resources/Textures/Clothing/beret.rsi/beret.png delete mode 100644 Resources/Textures/Clothing/beret.rsi/equipped-HELMET.png delete mode 100644 Resources/Textures/Clothing/beret.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/gloves_white.rsi/equipped-HAND.png delete mode 100644 Resources/Textures/Clothing/gloves_white.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/gloves_white.rsi/white.png delete mode 100644 Resources/Textures/Clothing/hop_coat.rsi/equipped-OUTER.png delete mode 100644 Resources/Textures/Clothing/hop_hat.rsi/equipped-HELMET.png delete mode 100644 Resources/Textures/Clothing/hop_hat.rsi/hop.png delete mode 100644 Resources/Textures/Clothing/hop_hat.rsi/meta.json diff --git a/Resources/Prototypes/Entities/items/clothing/belts.yml b/Resources/Prototypes/Entities/items/clothing/belts.yml index 84cb15b8a0..b023279c80 100644 --- a/Resources/Prototypes/Entities/items/clothing/belts.yml +++ b/Resources/Prototypes/Entities/items/clothing/belts.yml @@ -24,5 +24,3 @@ sprite: Clothing/belt_utility.rsi - type: Storage Capacity: 30 - - diff --git a/Resources/Prototypes/Entities/items/clothing/gloves.yml b/Resources/Prototypes/Entities/items/clothing/gloves.yml index af0b3af5a7..a47c382c76 100644 --- a/Resources/Prototypes/Entities/items/clothing/gloves.yml +++ b/Resources/Prototypes/Entities/items/clothing/gloves.yml @@ -53,19 +53,4 @@ state: leather - type: Clothing sprite: Clothing/gloves_leather.rsi - HeatResistance: 1500 - -- type: entity - parent: GlovesBase - id: WhiteGloves - name: White Gloves - description: These look pretty fancy. - components: - - type: Sprite - sprite: Clothing/gloves_white.rsi - state: white - - type: Icon - sprite: Clothing/gloves_white.rsi - state: white - - type: Clothing - sprite: Clothing/gloves_white.rsi \ No newline at end of file + HeatResistance: 1500 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/hats.yml b/Resources/Prototypes/Entities/items/clothing/hats.yml index 423ed9fde7..26aaed52c0 100644 --- a/Resources/Prototypes/Entities/items/clothing/hats.yml +++ b/Resources/Prototypes/Entities/items/clothing/hats.yml @@ -40,37 +40,3 @@ sprite: Clothing/captain_hat.rsi Slots: - helmet - -- type: entity - parent: HatBase - id: HatHOP - name: Head of Personnel's Hat - description: Papers, please. - components: - - type: Sprite - sprite: Clothing/hop_hat.rsi - state: hop - - type: Icon - sprite: Clothing/hop_hat.rsi - state: hop - - type: Clothing - sprite: Clothing/hop_hat.rsi - Slots: - - helmet - -- type: entity - parent: HatBase - id: HatBeret - name: Beret - description: A beret, an artists favorite headwear. - components: - - type: Sprite - sprite: Clothing/beret.rsi - state: beret - - type: Icon - sprite: Clothing/beret.rsi - state: beret - - type: Clothing - sprite: Clothing/beret.rsi - Slots: - - helmet diff --git a/Resources/Prototypes/Entities/items/clothing/masks.yml b/Resources/Prototypes/Entities/items/clothing/masks.yml index 37ed00bff3..9a0c7d2388 100644 --- a/Resources/Prototypes/Entities/items/clothing/masks.yml +++ b/Resources/Prototypes/Entities/items/clothing/masks.yml @@ -47,19 +47,4 @@ sprite: Clothing/mask_clown.rsi state: icon - type: Clothing - sprite: Clothing/mask_clown.rsi - -- type: entity - parent: MasksBase - id: MaskMime - name: Mime Mask - description: The traditional mime's mask. It has an eerie facial posture. - components: - - type: Sprite - sprite: Clothing/mask_mime.rsi - state: mime - - type: Icon - sprite: Clothing/mask_mime.rsi - state: mime - - type: Clothing - sprite: Clothing/mask_mime.rsi \ No newline at end of file + sprite: Clothing/mask_clown.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/shoes.yml b/Resources/Prototypes/Entities/items/clothing/shoes.yml index a046c1d5c8..1d7d2a03be 100644 --- a/Resources/Prototypes/Entities/items/clothing/shoes.yml +++ b/Resources/Prototypes/Entities/items/clothing/shoes.yml @@ -100,21 +100,4 @@ state: brown - type: Clothing - sprite: Clothing/shoes_brown.rsi - -- type: entity - parent: ShoesBase - id: ShoesMime - name: Mime Shoes - description: Comfortable-looking shoes. - components: - - type: Sprite - sprite: Clothing/shoes_mime.rsi - state: mime - - - type: Icon - sprite: Clothing/shoes_mime.rsi - state: mime - - - type: Clothing - sprite: Clothing/shoes_mime.rsi \ No newline at end of file + sprite: Clothing/shoes_brown.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/suits.yml b/Resources/Prototypes/Entities/items/clothing/suits.yml index 991628dcfd..fa6132001a 100644 --- a/Resources/Prototypes/Entities/items/clothing/suits.yml +++ b/Resources/Prototypes/Entities/items/clothing/suits.yml @@ -58,18 +58,3 @@ - type: Clothing sprite: Clothing/chef_apron.rsi - -- type: entity - parent: SuitBase - id: BeltSuspenders - name: Suspenders - description: They suspend the illusion of the mime's play. - components: - - type: Sprite - sprite: Clothing/suspenders.rsi - state: suspenders - - type: Icon - sprite: Clothing/suspenders.rsi - state: suspenders - - type: Clothing - sprite: Clothing/suspenders.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/clothing/uniforms.yml b/Resources/Prototypes/Entities/items/clothing/uniforms.yml index d5986f3ef1..fa65553d34 100644 --- a/Resources/Prototypes/Entities/items/clothing/uniforms.yml +++ b/Resources/Prototypes/Entities/items/clothing/uniforms.yml @@ -141,38 +141,4 @@ state: captain - type: Clothing - sprite: Clothing/captain_uniform.rsi - -- type: entity - parent: UniformBase - id: UniformHOP - name: Head of Personnel's Jumpsuit - description: It's a jumpsuit worn by someone who works in the position of "Head of Personnel". - components: - - type: Sprite - sprite: Clothing/hop_jumpsuit.rsi - state: hop - - - type: Icon - sprite: Clothing/hop_jumpsuit.rsi - state: hop - - - type: Clothing - sprite: Clothing/hop_jumpsuit.rsi - -- type: entity - parent: UniformBase - id: UniformMime - name: Mime's Outfit - description: It's not very colourful. - components: - - type: Sprite - sprite: Clothing/mime_outfit.rsi - state: mime - - - type: Icon - sprite: Clothing/mime_outfit.rsi - state: mime - - - type: Clothing - sprite: Clothing/mime_outfit.rsi \ No newline at end of file + sprite: Clothing/captain_uniform.rsi diff --git a/Resources/Textures/Clothing/beret.rsi/beret.png b/Resources/Textures/Clothing/beret.rsi/beret.png deleted file mode 100644 index feac165f6d246fd7969c41f5588cb8dd898d5d9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmV;x0YCnUP)y_L3(MPk9V|gMcp}Fz2I zX(tPUGf6xM_6KunrvCr0s&1%MDwY2od1`@q+nNJ*yeFHH%{V$c8(sI&2Ig&RQ}3BL z$1~?pAe*sP*c(cE6jR=mrb~Pfr+THCF z=aTs3`kI&1X`kNA7|uV!KsF;dhiuI|=M2!d`_s)009P^MxZj2DZ;YT*^Q@OZJ1?M>hQ@oP$a*=(4FaNnIG{^8*cHkO5EYL-r)K z8I68VSDxZYSy`YkRm*uoQkUSP|9zd8to-uyFU`MQySss7@+$e=9=q7S31=PfT$OGf zrgD~(ckZoc{c|g&*Cg&psJ`^q)lJxE)wQ4Po~2vb7AC2$TxT7Br{);%ja!Pl3|^mN z23iaOH(WGs8&4Ow&7a&3YjGYH3?Wz;5~22g)DsIk)<6*!J_$s|@xF zwc9_ODzLd{^|yd)=CsT6%zuRaxOHpQXa| zcKlyxsTkQxa8$bFLsEBK6)cd8(?{>-DW6-X7o)2{Wtr9!=9&9BtbI zfC9j)L0%3(MCzQw>2z9104yZyH~=(FgTC*VS=UeOEfA3sk*1V1rKIyb7gtJ2$8juj z^4xV@?va;IfQU4Nu-vPD);i~496z5)uZdDWXqf4b`oCBG>Z9uwU@#aA z27|$1(1UXxP|oM2&p8j|QJB691ZzML72})-Ye3)vxf-GBFDxvCM;iUp6!9v6#WB|x zmHS-4q8dWccN`}(eXScg=fQuMe??Gj;HMWZ4h{|=gs{}><#HL7N(BJmdEUtNv~bP? z>Gb~oey9TgzVAcK|AL^}7&z2vVRmO-TmO`1lUkpTCRNi+JFEsyR$Bh%_Iuq^y8e5LeVD~s?)RP)dcd=*PaMT zYKL!ezC45ZiiO6L4`|&xhrRs({~sKpJu^owj*Qfo%vY>b`s4~|&&&az0lWvE{{G|F z3o~OM$&^rE@;;qDxdIqtBkj)j{jd{KhpW7h`chZ5BZEIb!y&Jbg_u~1 zS_Lu~30;pnO8}(UoVuUdk zrl&4Ff0#M}nuh2?sazSR*h7v0byfDw%}2Se1W!VBUgibItr$-t(V}R**M-$-0T?7J zi>`#I^J)Z8NxUjNyR#0f(+ZQ7MI)WIZ97~jEhGZeT9$hSifjtxex`B7mG4 zyU}g~0R9B z-hK(NWN)kX2}Q8GE5hGG2x|$j+~J5OZPbMv0d8dIl*x)&c+{d2bMe*7fp+A)3s^Pc zT!0h-aoN{Wsf60$+wj=l&M#B5y^TQCDwRrFHcleZM5x_vTk?POp1dbTlQe6!T0or$ zk&RUiP&Y7Uy*u>Fnr&90ZeNqgu<-ClK=n!07*qoM6N<$f{mg7qyPW_ diff --git a/Resources/Textures/Clothing/hop_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/hop_hat.rsi/equipped-HELMET.png deleted file mode 100644 index 866e91981aea4586a8aca7cd572bd5d7bb9ffc41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC?pEaSW-L^Y)fu_8|um_7C+7 zoQt`fp08Qgp1iQ6aC@-T55rB?yPhXom`r}B*M1>z(=ID<7T-H@?UPKnGWV|T4ESd+ zkfied?%rxYeL0zx29q9Hc_*DWJ-7DmO}l`c7&hl0bM-zQmg5pw@YTuV=`G9kSDT;D z)_>A&yXUKr!)MnOW%n$n-?=6`LDf*CA^GXN@H_m(!LIVv~`bQro_ z5=rWr_$Y31XQ0@EGvR+3Cd}WpxG#9?mTQ;Ze?R?x_F1;fS=&DSzaDixZ_`>+0YM~C zn_1;narMWw%ZUr>T;{5NydPFQQJ;{Mmf}<)a<5qD2p`WbRx2^CaJ9l{Wj>DfvB5CQtOf(H-(RWwKyMX)NEzHU6jO z>zxw*aLwCh&wfURw9S%Ld($)SzIe&Za7kp-ZONYF$qWaMKYs10{$%pSquD!dC9T%? o$k~4TSl5LxIVB|UE8mXMf_wI>P4kFVdQ&MBb@0GfczMgRZ+ diff --git a/Resources/Textures/Clothing/hop_hat.rsi/hop.png b/Resources/Textures/Clothing/hop_hat.rsi/hop.png deleted file mode 100644 index 55e5a58f117e4e2f823c1df6cf7296eda09373e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmV-m0iXVfP)!P+3na3*PXyGH z7-Ni2tiQmRdJ*_RL