death squad armor tweaks (#23965)

* death squad resprite

* fix boote

diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 59dfb526c52b3d84b1657928176e7c7c18b5b775..e71c615c135f9529a485bb41a124d7d1c163a9a2 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -322,6 +322,9 @@
     sprite: Clothing/Mask/swat.rsi
   - type: Clothing
     sprite: Clothing/Mask/swat.rsi
+  - type: Tag
+    tags:
+    - HidesHair
 
 - type: entity
   parent: ClothingMaskGasExplorer
@@ -344,6 +347,9 @@
     sprite: Clothing/Mask/ert.rsi
   - type: Clothing
     sprite: Clothing/Mask/ert.rsi
+  - type: Tag
+    tags:
+    - HidesHair
 
 - type: entity
   parent: ClothingMaskGasERT

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png
index 498b000fd70d6d9aa394498d9c61bef01e3ddcb8..fe62e15b50a318736a67f4d86183b304268a9821 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png
index 1c995317a4f085baefa9221fe77f3fb5685d69db..1b712fe67473daa77789b28aa667abe78926ccee 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
index a470e0094432b54e095fa221e474399e0a4651fc..f1d91cbc4cbb2681e0f497c3d49850a95b0c3eac 100644 (file)
--- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png
index c13e2c8e8a2fb70fa5288e1250a6894d868e9ffb..6513ccf2738b2fae4326221737779c3b934c5c0a 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png
index 56f4367782600f8f814b345df8b62b80e148bdba..6bcee818b2b79536ea256332fb4533cae52d5c30 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
index e482264df5f8b7f13d1a6a889a05f90ccba884a2..6ba7a445cd7de08cd2c93709472b7e8cc91272d7 100644 (file)
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png
index e57d2b74fb3d90480ac26adebbfa883e35af9840..539f08d86c668d2a201e24565b2ffc5a25cb3930 100644 (file)
Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png differ