(Add) black cap and some contraband (#23933)

* Add black cap and some contraband

* Bot fix

* bot fix 2

* Price increases

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 56db79484d9097988fe18e5aa525cb41fe1ac73e..2e8d7dc46f0f549943b81a9cf8173233ebf92c25 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: 4670
+  cost: 4750
   category: Service
   group: market
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 05177a4e4c0f4994f9bec78868d2f4dc8fd8c766..2b64a9d0a945e7a0d75e6e38b1389e5c69ed2797 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -64,6 +64,7 @@
     ClothingHeadHatGreensoft: 2
     ClothingHeadHatOrangesoft: 2
     ClothingHeadHatRedsoft: 2
+    ClothingHeadHatBlacksoft: 2
     ClothingHeadHatPurplesoft: 2
     ClothingHeadHatCorpsoft: 2
     ClothingHeadFishCap: 2
@@ -81,5 +82,6 @@
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2
   contrabandInventory:
+    ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 1
     ClothingUniformJumpskirtTacticool: 1

diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
index b8594c841f7f26fa179d1ba357130510a7265899..50be724c4159731af09bd7423c4b5005ae78f367 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -113,6 +113,28 @@
   - type: Clothing
     sprite: Clothing/Head/Soft/greensoft_flipped.rsi
 
+- type: entity
+  parent: ClothingHeadBaseButcherable
+  id: ClothingHeadHatBlacksoft
+  name: black cap
+  description: "It's a baseball hat in a tasteless black colour."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/blacksoft.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/blacksoft.rsi
+
+- type: entity
+  parent: ClothingHeadBaseButcherable
+  id: ClothingHeadHatBlacksoftFlipped
+  name: black cap flipped
+  description: "It's a baseball hat in a tasteless black colour. Flipped."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
+
 - type: entity
   parent: ClothingHeadBaseButcherable
   id: ClothingHeadHatGreysoft

diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..76a49f5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/equipped-HELMET.png differ

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

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

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

diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
new file mode 100644 (file)
index 0000000..a470e00
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/blacksoft.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",
+  "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/Soft/blacksoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..a7e6099
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png
new file mode 100644 (file)
index 0000000..0d61aa6
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png differ

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

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

diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json
new file mode 100644 (file)
index 0000000..a470e00
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.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",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}