From: Hanz <41141796+Hanzdegloker@users.noreply.github.com>
Date: Mon, 15 Jan 2024 23:07:51 +0000 (-0500)
Subject: Flatcaps (#24134)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=87b88fb93fc2f0ebf48805c6ac15e7f76d7362b9;p=space-station-14.git

Flatcaps (#24134)

* Brown and Grey flatcaps added

What it says on the tin is what it is

* Fixed Copyright Jazz, oops

What it says on the tin
---

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 2e8d7dc46f..89e457598c 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 4750
+  cost: 4800
   category: Service
   group: market
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 2b64a9d0a9..38bba021c2 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -11,6 +11,8 @@
     ClothingHeadBandGreen: 2
     ClothingHeadBandRed: 2
     ClothingHeadBandSkull: 2
+    ClothingHeadHatGreyFlatcap: 3
+    ClothingHeadHatBrownFlatcap: 3
     ClothingUniformJumpsuitColorGrey: 8
     ClothingUniformJumpskirtColorGrey: 8
     ClothingUniformJumpsuitColorWhite: 3
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 3ae39df517..eac7a80edc 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -867,3 +867,25 @@
     sprite: Clothing/Head/Hats/party_blue.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_blue.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatGreyFlatcap
+  name: grey flatcap
+  description: Fashionable for both the working class and old man Jenkins.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/greyflatcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/greyflatcap.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBrownFlatcap
+  name: brown flatcap
+  description: Stupid clown! You made me look bad!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/brownflatcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/brownflatcap.rsi
diff --git a/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..c4c14d7a94
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/icon.png
new file mode 100644
index 0000000000..90193dbb4d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/inhand-left.png
new file mode 100644
index 0000000000..1b26cfd887
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/inhand-right.png
new file mode 100644
index 0000000000..871da0cbff
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/meta.json
new file mode 100644
index 0000000000..5df1cd9c6b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/brownflatcap.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Spritework done by Hanzdegloker",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..8bb7fd3ad0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/icon.png
new file mode 100644
index 0000000000..650482d0e1
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/inhand-left.png
new file mode 100644
index 0000000000..aa985c0778
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/inhand-right.png
new file mode 100644
index 0000000000..712f508686
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/meta.json
new file mode 100644
index 0000000000..5df1cd9c6b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/greyflatcap.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Spritework done by Hanzdegloker",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}