]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds witch robes (#28965)
authorK-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Sat, 15 Jun 2024 02:19:08 +0000 (14:19 +1200)
committerGitHub <noreply@github.com>
Sat, 15 Jun 2024 02:19:08 +0000 (22:19 -0400)
* ze

* autodrobe entry

* autodrobe crate cost adjust

Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json [new file with mode: 0644]

index dd43ec40948601cfecc184f072856b98292fd715..e202d2482b7e40d09bdfe4ad132008b0dd67915b 100644 (file)
@@ -43,7 +43,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockAutoDrobeFilled
-  cost: 1200
+  cost: 1300
   category: cargoproduct-category-name-service
   group: market
 
index 5e3c7d94010f6d92ff027fcadb8f471f47d49b71..8ef72f557c4bdfc45dc3be17f44b758a6ffc4fe1 100644 (file)
@@ -29,6 +29,8 @@
     ClothingHeadHatShrineMaidenWig: 2
     ClothingOuterSuitShrineMaiden: 2
     Gohei: 2
+    ClothingOuterSuitWitchRobes: 2
+    ClothingHeadHatWitch1: 2
     ClothingHeadHatRedRacoon: 2
     ClothingOuterRedRacoon: 2
     ClothingHeadPaperSack: 2
index 08bbd83c489b31d9b88d47a3906d988b66051dce..ccf6f09b19400c1ed396c499c50b860c4da1b927 100644 (file)
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/shrine-maiden.rsi
 
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterSuitWitchRobes
+  name: witch robes
+  description: Magic is all about the spell power, ZE!
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/witchrobe.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/witchrobe.rsi
+
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterSuitMonkey
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..b797c8d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png
new file mode 100644 (file)
index 0000000..acdc1b3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..a93d4a5
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..0ee8f62
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json
new file mode 100644 (file)
index 0000000..7651332
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/36039/commits/b3bd70ae925ecbe7c625f70c4c3d09d3ed2ed32a . Inhands were made for SS14 and available under the same license",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}