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 d03f9bf322ee690941389cf3da5f175818d1d028..59e6d62ac65bab4a75c72d8dcf79c0d11d75275d 100644 (file)
--- 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 6e7e35af61ba46d0b762c54957131b4991290b35..922c2cc790de748bed2ebf75a046491bcd102a5e 100644 (file)
--- 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 21e22ee5a0d68a831ca00c3cead44e080cfb9a65..78c8b5ba38a4f01837ece052cd21f93ee0be7ead 100644 (file)
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 7e2ef801dce07b30007fd83f9dd11364fedb6e8f..bd379f87714dc2a34235df299ab44f56fbc9e704 100644 (file)
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 db26e66334bdce07804775d49b08a7f7134aa5b8..9f338d183caa35f28cb5c58cfed7563097d9dd43 100644 (file)
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 d919a17dddf6c54370e6a35c92495754376bc442..f7f37e478bf472641b06f088e4a484cd42151abe 100644 (file)
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 ff8182d153df7ff5aca673a81b799523bbe99a9c..662316ab8d4d0c55d3dc1e4dd2d71ea3ca14c6c8 100644 (file)
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 d25f88a1336bc8579a7bd32bc0f8ad929ddaa52c..95e97b47bc557bc5ac0043991052a2d92cbaef6b 100644 (file)
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 7878ecdc421532ec329379830e5324556828b302..888d6f98145436064b15ab731b131f99f2ac9ef5 100644 (file)
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 3605b07345bad72d6112ada3c5f98437a20c87b7..2a594d8f9821e33a1f47556912542806c670f5aa 100644 (file)
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 85ccb585735815980f7c38406a347247dc0bc356..f057a398fc00c0bd323c327d94dddb6d0c3cef5f 100644 (file)
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 bc251460a7475a7210362009aadfef30764f761d..14f97f6a4452a3c8ab0f98a616e12a0856dba638 100644 (file)
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 91b196d1f9cdb6d97559fd1022f07d402edbeaaa..240b1bf2766fc896a7527b2b53994742a674d78e 100644 (file)
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 a8a1791d233c03ea2c1bc830ee9b2761644e9dbb..83f38ce6c4abd349c83e433d0b9625c4b0e21f41 100644 (file)
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 (file)
index 0000000..8f503d6
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 (file)
index 0000000..fc1ad2e
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 (file)
index 0000000..6f489ec
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 (file)
index 0000000..e15f148
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 (file)
index 0000000..74bcd6a
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 (file)
index 0000000..ade6586
--- /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
+    }
+  ]
+}