From: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>
Date: Mon, 18 Sep 2023 00:30:30 +0000 (+1000)
Subject: Beret resprite and security beret (#19958)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b27e65fcf87b3cf3f7899b8d3bc57d5dcf417f59;p=space-station-14.git

Beret resprite and security beret (#19958)

* Add files via upload

* fuck I did an oopsie

* Security berets

* fixed science beret

* fixed engi and merc beret
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
index d03f9bf322..59e6d62ac6 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -6,7 +6,7 @@
     ClothingBackpackDuffelSecurity: 3
     ClothingUniformJumpsuitSec: 3
     ClothingShoesBootsJack: 3
-    ClothingHeadHatBeret: 3
+    ClothingHeadHatBeretSecurity: 3
     ClothingHeadHatSecsoft: 3
     ClothingHeadBandRed: 3
     ClothingHandsGlovesColorBlack: 3
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 6e7e35af61..922c2cc790 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -25,6 +25,22 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretSecurity
+  name: security beret
+  description: A stylish clothing option for security officers.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_security.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_security.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCasa
diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png
index 21e22ee5a0..78c8b5ba38 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png
index 7e2ef801dc..bd379f8771 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png
index db26e66334..9f338d183c 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png
index d919a17ddd..f7f37e478b 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png
index ff8182d153..662316ab8d 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png
index d25f88a133..95e97b47bc 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png
index 7878ecdc42..888d6f9814 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png
index 3605b07345..2a594d8f98 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png
index 85ccb58573..f057a398fc 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png
index bc251460a7..14f97f6a44 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png
index 91b196d1f9..240b1bf276 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png
index a8a1791d23..83f38ce6c4 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..8f503d6237
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..fc1ad2e939
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
new file mode 100644
index 0000000000..6f489ec36b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
new file mode 100644
index 0000000000..e15f148f01
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
new file mode 100644
index 0000000000..74bcd6a723
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
new file mode 100644
index 0000000000..ade65863af
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}