From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Sat, 15 Jun 2024 02:19:08 +0000 (+1200) Subject: Adds witch robes (#28965) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e803871172f3ad5aca65afb58e2ff373d516aab3;p=space-station-14.git Adds witch robes (#28965) * ze * autodrobe entry * autodrobe crate cost adjust --- diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index dd43ec4094..e202d2482b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 5e3c7d9401..8ef72f557c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -29,6 +29,8 @@ ClothingHeadHatShrineMaidenWig: 2 ClothingOuterSuitShrineMaiden: 2 Gohei: 2 + ClothingOuterSuitWitchRobes: 2 + ClothingHeadHatWitch1: 2 ClothingHeadHatRedRacoon: 2 ClothingOuterRedRacoon: 2 ClothingHeadPaperSack: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 08bbd83c48..ccf6f09b19 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -190,6 +190,17 @@ - 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 index 0000000000..b797c8dce4 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 index 0000000000..acdc1b394b 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 index 0000000000..a93d4a5af0 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 index 0000000000..0ee8f62362 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 index 0000000000..7651332179 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.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/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 + } + ] +}