From e803871172f3ad5aca65afb58e2ff373d516aab3 Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:19:08 +1200 Subject: [PATCH] Adds witch robes (#28965) * ze * autodrobe entry * autodrobe crate cost adjust --- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../VendingMachines/Inventories/theater.yml | 2 ++ .../Entities/Clothing/OuterClothing/suits.yml | 11 ++++++++ .../witchrobe.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 612 bytes .../Suits/witchrobe.rsi/icon.png | Bin 0 -> 330 bytes .../Suits/witchrobe.rsi/inhand-left.png | Bin 0 -> 725 bytes .../Suits/witchrobe.rsi/inhand-right.png | Bin 0 -> 730 bytes .../Suits/witchrobe.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json 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 0000000000000000000000000000000000000000..b797c8dce44d41c7f83ad86b3593e43a8f83ec88 GIT binary patch literal 612 zcmV-q0-ODbP)Px#1ZP1_K>z@;j|==^1poj55>QN3MGg)Q=ib-MxTqKy7#kZK00021PX_D&000Jb zQchF<|NsC00JFcOzW@LL32;bRa{vGi!vFvd!vV){sAK>D0m(^3K~z{r?N#lPgdhy# z%lCifOWJ~ht=!Gc+};l}yGltdA%Ldi!*~U}0$u^HfPW<*rA(wq)Q&%nl1s5>fPxfj zDlWxJN(J?Kvz{3{o(e^yMGi#%Jb^PP| zQJo&e0%#y|0s+__2KSV2`K>@V;RgbE$`ru}@_rz1@eSmd;0rj%_Z8?F$q(C*N3gMs z#W%1rpTCwrOYsyN+-)QRG8F^@Ql+{F3#2rQT%R9JZV)`oAGXnb1UZ8oAya^-053VS zAlM^X8!zK3XF)M4@iPmSaKE?Us|vvI-ViW=$CQX1Qj$W?gtG;Cx<#=T)-_?rcb0H1 y@DnDjT%&LWfoEPg{aeohH^DXQFY#dk$MFTU2}JDU2kWf>0000I-;4gq%n_--Ahy0yuYEURpFEzTpeMQsa(O zs`{1RFYIuxs5quk`%ZAZ<+;wXl@m3L^`E*rER~X+w&ELa#U*Zo=ls6{1(t^{e!~rP OI)kUHpUXO@geCyvk9&~- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a93d4a5af0340300aefd324a724d1df5fbecea1e GIT binary patch literal 725 zcmV;`0xJE9P)4Tx04UFukxeK>Q5?m8Geabz%tEqw3#=$1DI128qNXuw1`F@KF+- zctlGiXSJGVLR8a4D?_^J=0~E@Nh*$yTLNmm=~h|%Z#1M9T@wPD@UWS83c?G*1FMC+ z;vM0zxumCrPldZ2xuEd9(v2d&D9-pCRGDEX9vc-73u~D&Hp zj*-RaABAHxdRw{7k#s& zweLgYI-FgWG-DgiH=yMquRFRgg=7ZPX?Q)6Z%RV*HPp=&d;8hv_zvRI)#MfI?m=fp zvga$jySBWyKhOC65%~suiE^us=7`$>000tDOjJb<4i3z?sOR3-8yg!K7#IKm0GAGk z5dZ)H26R$RQ~&?}|Nj89zofqa000SaNLh0L01FcU01FcV0GgZ_0002UNkl*3CvrllgQmc=A+UoC*F=f)XetD1lOfR|45-ty1Cw{l8DM;sWHB69A_Z zEVJGuXgPsw{JB>kV##n37U=nDUWRxAIq=P=m$=|YQqcPc_lHfk>b3l(00000NkvXX Hu0mjfUGYjr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0ee8f62362720f49506bdce053ff5ddc7e26e144 GIT binary patch literal 730 zcmV<00ww*4P)4Tx04UFukxeK>Q5?m8Geabz%tEqw3#=$1DI128qNXuw1`F@KF+- zctlGiXSJGVLR8a4D?_^J=0~E@Nh*$yTLNmm=~h|%Z#1M9T@wPD@UWS83c?G*1FMC+ z;vM0zxumCrPldZ2xuEd9(v2d&D9-pCRGDEX9vc-73u~D&Hp zj*-RaABAHxdRw{7k#s& zweLgYI-FgWG-DgiH=yMquRFRgg=7ZPX?Q)6Z%RV*HPp=&d;8hv_zvRI)#MfI?m=fp zvga$jySBWyKhOC65%~suiE^us=7`$>000tDOjJb<4i3z?sOR3-8yg!K7#IKm0GAGk z5dZ)H26R$RQ~&?}|Nj89zofqa000SaNLh0L01FcU01FcV0GgZ_0002ZNklBo&1SL>PumymG-&|uAfkGBXaQW@h;G4=ZwQzPiNpUOJ4UO7 zG0LHU9F4^RnyjZoki_TvB=D4=1WE}?pp@VgWcu^Q38dLUzMwehy>Xx{qEYcaDTnc*s0p7?>wmd(FW&i*H M07*qoM6N<$f-oIP5dZ)H literal 0 HcmV?d00001 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 + } + ] +} -- 2.51.2