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 2e8d7dc46f0f549943b81a9cf8173233ebf92c25..89e457598c9e4e86f35e9671b61115297a766ea0 100644 (file)
--- 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 2b64a9d0a945e7a0d75e6e38b1389e5c69ed2797..38bba021c20ab9e6902d979cf979a3dce60415b2 100644 (file)
--- 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 3ae39df5178ceec3ef77bc652532e53732065a06..eac7a80edc9da14d33eb8ae93371f9f7414e4f74 100644 (file)
--- 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 (file)
index 0000000..c4c14d7
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 (file)
index 0000000..90193db
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 (file)
index 0000000..1b26cfd
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 (file)
index 0000000..871da0c
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 (file)
index 0000000..5df1cd9
--- /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 (file)
index 0000000..8bb7fd3
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 (file)
index 0000000..650482d
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 (file)
index 0000000..aa985c0
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 (file)
index 0000000..712f508
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 (file)
index 0000000..5df1cd9
--- /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
+    }
+  ]
+}