HoP's beret (#38601)

* added HoP beret

* added beret to loadout

* added craft to machine

* added beret to hop ddresser

* Updated the authorship

* Change on request

* added 4-spaced

* Hot fix of dresser

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index e111b51cff6df55ab7a9f44fda1865d57ca2c014..237b8a474862e0d70c6b85f1c0cf0f46eb04695c 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -50,6 +50,7 @@
   - type: StorageFill
     contents:
       - id: ClothingHeadHatHopcap
+      - id: ClothingHeadHatBeretHop
       - id: ClothingOuterWinterHoP
       - id: ClothingEyesGlasses
       - id: ClothingNeckCloakHop

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index ec7801802b5e85c242fee235f5572f6cef9951db..26e0c6aba228dd51abb741361fa123b40472c261 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -1360,3 +1360,20 @@
       path: /Audio/Items/flashlight_on.ogg
     soundDeactivate:
       path: /Audio/Items/flashlight_off.ogg
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretHop
+  name: head of personnel's beret
+  description: A dark blue beret with a ruby inserted in the center, for true connoisseurs of bureaucracy!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_hop.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_hop.rsi
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - ClothMade
+    - Recyclable
+    - WhitelistChameleon
\ No newline at end of file

diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
index 45223bea149b9c483e25df2bd93bd014b3303754..0855100e61dc57266b3746b047d934a206592cdd 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -35,6 +35,11 @@
   equipment:
     head: ClothingHeadHatHopcap
 
+- type: loadout
+  id: HoPBeret
+  equipment:
+    head: ClothingHeadHatBeretHop
+
 # Neck
 - type: loadout
   id: HoPCloak

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 39b6be2b040b60de686bf8196ff262ef0cd9d037..b3c8aa812916eb0b88c109c8960d6f0c1840b2e2 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -153,6 +153,7 @@
   minLimit: 0
   loadouts:
   - HoPHead
+  - HoPBeret
 
 - type: loadoutGroup
   id: HoPJumpsuit

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
index aa95781729fcc30267b86beb4884cbc110a0c22a..808f1c680abf8c28cc30aa6950e725aa61e22bdd 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
@@ -33,6 +33,7 @@
   - ClothingUniformJumpskirtCapFormalDress
   # HoP
   - ClothingHeadHatHopcap
+  - ClothingHeadHatBeretHop
   - ClothingUniformJumpsuitHoP
   - ClothingUniformJumpskirtHoP
   # Generic

diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index c5f81153e2600749dcaa14f0f759ba5a9367061c..cf6e082b6448d9cc3f6ab13762687e0b2d38f8e4 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -810,6 +810,11 @@
   id: ClothingHeadHatHopcap
   result: ClothingHeadHatHopcap
 
+- type: latheRecipe
+  parent: BaseCommandHatRecipe
+  id: ClothingHeadHatBeretHop
+  result: ClothingHeadHatBeretHop
+  
 - type: latheRecipe
   parent: BaseCommandHatRecipe
   id: ClothingHeadHatQMsoft

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/equipped-HELMET-hamster.png
new file mode 100644 (file)
index 0000000..b55441d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/equipped-HELMET-hamster.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..1b491f4
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/icon.png
new file mode 100644 (file)
index 0000000..09a41f2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..d1612bc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..28035a4
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/meta.json
new file mode 100644 (file)
index 0000000..b5ca351
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_hop.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by upnostnote (Discord), resprite by 96flo (Discord)",
+    "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
+        }
+    ]
+}
\ No newline at end of file