From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Fri, 12 Jan 2024 07:58:08 +0000 (-0700)
Subject: death squad armor tweaks (#23965)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e93231ebaa674ba5513128404add91012a1ba61b;p=space-station-14.git

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 59dfb526c5..e71c615c13 100644
--- 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 498b000fd7..fe62e15b50 100644
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 1c995317a4..1b712fe674 100644
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 a470e00944..f1d91cbc4c 100644
--- 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 c13e2c8e8a..6513ccf273 100644
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 56f4367782..6bcee818b2 100644
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 e482264df5..6ba7a445cd 100644
--- 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 e57d2b74fb..539f08d86c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png differ