Scientific beret (#15042)

* Added scientific beret

* Added scientific beret

* Scientific beret added to RD's locker

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 1c90a21593aa569d5aff4f2d4ae8856de1b3b16f..ee8f4b440cf207b9dc2b1db80e6a2c16228794e8 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -161,6 +161,7 @@
       - id: PlushieSlime
         prob: 0.1
       - id: DoorRemoteResearch
+      - id: ClothingHeadHatBeretRND
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
       - id: BoxEncryptionKeyScience

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index d7f51a77b2ee15720a140da56ff55becaecb5a64..980bc3552ece11d0c83acc4ae5c93dee33d8274c 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -20,6 +20,17 @@
   - type: Clothing
     sprite: Clothing/Head/Hats/beret.rsi
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretRND
+  name: scientific beret
+  description: A beret for real scientists.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_rnd.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_rnd.rsi
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretEngineering

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
new file mode 100644 (file)
index 0000000..bc25146
Binary files /dev/null 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/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.png
new file mode 100644 (file)
index 0000000..af32d2c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.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
new file mode 100644 (file)
index 0000000..91b196d
Binary files /dev/null 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
new file mode 100644 (file)
index 0000000..a8a1791
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json
new file mode 100644 (file)
index 0000000..1b11033
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed by lazik",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}