From fbd0eea0194eb784576eda44cc484f63b23da074 Mon Sep 17 00:00:00 2001 From: Swept Date: Sun, 21 Jun 2020 19:56:15 +0000 Subject: [PATCH] Puddle icon fix. (#1175) * Fixed, nice going metalgearsolid * Removes whatever the fuck golem is --- Resources/Prototypes/Entities/Fluids/puddle.yml | 12 ++++++------ .../Entities/Items/Clothing/OuterClothing.yml | 13 ------------- .../golem.rsi/equipped-OUTERCLOTHING.png | Bin 108 -> 0 bytes .../Clothing/OuterClothing/golem.rsi/icon.png | Bin 108 -> 0 bytes .../OuterClothing/golem.rsi/inhand-left.png | Bin 96 -> 0 bytes .../OuterClothing/golem.rsi/inhand-right.png | Bin 96 -> 0 bytes .../Clothing/OuterClothing/golem.rsi/meta.json | 1 - 7 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 Resources/Textures/Clothing/OuterClothing/golem.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/golem.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/golem.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Fluids/puddle.yml b/Resources/Prototypes/Entities/Fluids/puddle.yml index 3f9717ec95..15b0ab864c 100644 --- a/Resources/Prototypes/Entities/Fluids/puddle.yml +++ b/Resources/Prototypes/Entities/Fluids/puddle.yml @@ -36,7 +36,7 @@ sprite: Fluids/gibblet.rsi # Placeholder state: gibblet-0 - type: Icon - icon: Fluids/gibblet.rsi + sprite: Fluids/gibblet.rsi state: gibblet-0 - type: Puddle variants: 5 @@ -51,7 +51,7 @@ sprite: Fluids/smear.rsi # Placeholder state: smear-0 - type: Icon - icon: Fluids/smear.rsi + sprite: Fluids/smear.rsi state: smear-0 - type: Puddle variants: 7 @@ -66,7 +66,7 @@ sprite: Fluids/splatter.rsi # Placeholder state: splatter-0 - type: Icon - icon: Fluids/splatter.rsi + sprite: Fluids/splatter.rsi state: splatter-0 - type: Puddle variants: 6 @@ -81,7 +81,7 @@ sprite: Fluids/vomit.rsi state: vomit-0 - type: Icon - icon: Fluids/vomit.rsi + sprite: Fluids/vomit.rsi state: vomit-0 - type: Puddle variants: 4 @@ -97,7 +97,7 @@ sprite: Fluids/vomit_toxin.rsi state: vomit_toxin-0 - type: Icon - icon: Fluids/vomit_toxin.rsi + sprite: Fluids/vomit_toxin.rsi state: vomit_toxin-0 - type: Puddle variants: 4 @@ -113,7 +113,7 @@ sprite: Fluids/writing.rsi # Placeholder state: writing-0 - type: Icon - icon: Fluids/writing.rsi + sprite: Fluids/writing.rsi state: writing-0 - type: Puddle variants: 5 diff --git a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml index f445b49531..7dbc1a155a 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml @@ -635,19 +635,6 @@ - type: Clothing sprite: Clothing/OuterClothing/gentlecoat.rsi -- type: entity - parent: OuterclothingBase - id: OuterclothingGolem - name: golem - description: '' - components: - - type: Sprite - sprite: Clothing/OuterClothing/golem.rsi - - type: Icon - sprite: Clothing/OuterClothing/golem.rsi - - type: Clothing - sprite: Clothing/OuterClothing/golem.rsi - - type: entity parent: OuterclothingBase id: OuterclothingGreyhoodie diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/golem.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index d2bf9f89724f656de12d3a6c4252b44c16a1acfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzV^0^ykcv5P&lw6b7;vy0RR5R0 u!Lz&h#Dbf~1<|)BpT74}7N`mdD4b-!w~=YZ5sssKL86|nelF{r5}E+H;vPZ( diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/golem.rsi/icon.png deleted file mode 100644 index d2bf9f89724f656de12d3a6c4252b44c16a1acfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzV^0^ykcv5P&lw6b7;vy0RR5R0 u!Lz&h#Dbf~1<|)BpT74}7N`mdD4b-!w~=YZ5sssKL86|nelF{r5}E+H;vPZ( diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-left.png deleted file mode 100644 index 0858c19f0521b74f4a058fbddc280ea48a5751bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>Ygr+Ar*7p9%SSN@(wNd?w`wN fz5vKX1`XxR4h{^A{hv+-f`mO?{an^LB{Ts5qcarg diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-right.png deleted file mode 100644 index 0858c19f0521b74f4a058fbddc280ea48a5751bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>Ygr+Ar*7p9%SSN@(wNd?w`wN fz5vKX1`XxR4h{^A{hv+-f`mO?{an^LB{Ts5qcarg diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/golem.rsi/meta.json deleted file mode 100644 index 61d7ba4ddf..0000000000 --- a/Resources/Textures/Clothing/OuterClothing/golem.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https:github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 1}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}