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
2023-09-18 10:30:30 +10:00
parent 7fa3761dd6
commit b27e65fcf8
20 changed files with 47 additions and 1 deletions
--- 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
--- 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
--- a/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png
--- 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
--- a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
+++ b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
--- a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
+++ 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
+    }
+  ]
+}