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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNf?Vc`ki(1`A&;JQ=PlX z*wcpN8+&oqvVZ^AugY5yqBZruY-Ltsm`#GK9M|XezO!&(#T~S?-(93b&`9SxDDg8+a!Mi@#s;*0VQnB&JVz-Kp zAA53h#h7|IxJ;B>HvhAkm3Wk);Y5L*dDx#9A1=hT95`a>7p`rmKRv+bKx~z<@~n$1 zh0c1cYA$szO}Mvh+hf~wof#)7E+|KV`IZxpc+m{rSBdeY?v{ zmG<1a`&Rh*q#sXy&6<8WbN;IhZM1wC9|)e$I1Y`|rzVc^SeDAMLo``Yyj` zLGaV)9+meWl}b{dajAq}b4?Lr+I}>`>~QyokDrPPxY?(FsMt8+t?&JRAG5t`ZsyEr zEx12d>EFXgNmoSW|MKm*cl-C*qrV0DeU}EU4Ea}C$8@Xb&Q8srf1Mc^7#KWV{an^L HB{Ts5seac1 diff --git a/Resources/Textures/Clothing/beret.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/beret.rsi/equipped-HELMET.png deleted file mode 100644 index 2918a7d0b3dde3e344fc4a9e1f368dfde54e4e74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE1(9RL6T diff --git a/Resources/Textures/Clothing/beret.rsi/meta.json b/Resources/Textures/Clothing/beret.rsi/meta.json deleted file mode 100644 index 831fc7e571..0000000000 --- a/Resources/Textures/Clothing/beret.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/tree/Bleeding-Edge/icons", - "states": [ - { - "name": "equipped-HELMET", - "directions": 4, - "delays": [ - [ 1.0 ], - [ 1.0 ], - [ 1.0 ], - [ 1.0 ] - ] - }, - { - "name": "beret", - "directions": 1, - "delays": [ [ 1.0 ] ] - } - ] -} diff --git a/Resources/Textures/Clothing/gloves_white.rsi/equipped-HAND.png b/Resources/Textures/Clothing/gloves_white.rsi/equipped-HAND.png deleted file mode 100644 index db6ccef964140168ff5698db8c2491263003cdf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE1WogT6HZdHSO!SE!S49+EwlL z%)W|m?(?0?b(EBrW!?(4x2pflI4!laqoXu-H{YAJuT8D&jf%gA+g&QYUIQ|Mf#HFF z?%6l%WxVQ6S#R#YuvPxUx$Wf)eO9~s3tljOJNIV2$rHZv+57LmwPRrT)1+?Z+P&MT RTzV2nucxb@%Q~loCIF>sSK0so diff --git a/Resources/Textures/Clothing/gloves_white.rsi/meta.json b/Resources/Textures/Clothing/gloves_white.rsi/meta.json deleted file mode 100644 index 2a3252cfc8..0000000000 --- a/Resources/Textures/Clothing/gloves_white.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", - "states": [ - { - "name": "white", - "directions": 1, - "delays": [ [ 1.0 ] ] - }, - { - "name": "equipped-HAND", - "directions": 4, - "delays": [ - [ 1.0 ], - [ 1.0 ], - [ 1.0 ], - [ 1.0 ] - ] - } - ] -} diff --git a/Resources/Textures/Clothing/gloves_white.rsi/white.png b/Resources/Textures/Clothing/gloves_white.rsi/white.png deleted file mode 100644 index 4732b24b5b0a09a0e3848464eeb5078e69619fdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNfQ$1ZALn`LH4UO(wV!*Se z=aoU?+yg;QM ze_g%8Q%j9K&}-KJTtTX6G*oY)t;*9Rv*@RiDE^p87p_wc+U8=U%_ z6`t56Gc6Y7xcyGaDWC69%f$x^ZO?>6Uw%3B%Io!=LG~FlUiSamAO82%;@6@H1`<4M z%?A@MG#ASSoO{0Xye0pWz#03vS+X4jL?6##&vtmgv{P!~D}5cE7I&$?mqk8mH5@g( zE63hJEjy&-`y%a7)7CN@ikNdTjLnDeEfsUUz+&6L~t}c%f1Dm2!5ue|z8M>z#V~$s=9m{=WCWKiKf^d;eN&b!*hRn%|G-e7ETj z`F6zM;T-lJ!!N)8eu&wk>Eax(G~fHO$fGZ^$1fJeg~wYnr8w5)Glwm2t?s|1>P9Eb5Gl3B48*dn5IDd;O zGBC(8=pB{f{cG_&_qJSSnaJNx(FcARN?+r|XUje~bN>3rjkg*Y40dnU>piQ&_2|pv zIsHx-)g@P5-u&z;%co1%=W%#uwdWV^vuXa>)p~3)f5u(w_Pu`@{>#fOvNd+s?d!QR z{Y?0pkY7)@GR~i2oX@z2ecr!+kFRqZC(ECl5)l8%Zm!)$Xmtf560J zw|V0pr6+Qm{S%~gm{ueuNPmqiN@_6_Tee)!wtj{csnTP&SDAh+@oc)do$na%UqMEx+>4z zmTMiOp{v4lC2CqVYgZ1}r?>le7rpMV^;Bw@BenZt9y7x~mJbcZANKNc@ce4#KL2hq zug9V1+2tE|YkxSr;c~Pf)7*#i8unYLPj&5LI405Hc(0CgLrVVYZ=9|hc55HH@5GVK zx#7;k4z=7Xtul;xDKDm+?24?ovPh`-f}X%Jy7ym>unWy`IHw?Evt zcTPWe^WI*Et6EdNqRjl1F1oC^n-~45{>!{Q>aLSbvbRP#%;lKa8_FACZjiRu`iq71 zqFX|%csrjl_G}by$PJYgr+Ar*7pPG0E8>?qK- z-&-pxir-O$u|rK%G)2q6SDt~#vsqzkhRFGVR)>Xx5+S9|2I@By1ZIaYGzr@<7O2nC zd6aQ^ndTc46^?JkyRCmdKmAUJg{kpCz4|4Q^)hpI%+Io0cRpk$>wPD|La~Bgv!z9; z?`&%8m8*6*y38>=7JbOu!DY_ccX~N|0b1c6(z!Yc4|E@@CiFNma4+Fj*|fu-<;rA< z