From 854f88d69c4478be85a33f5dc1b95fe2a403e089 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sun, 19 Mar 2023 19:45:38 -0500 Subject: [PATCH] Waist bags (#14474) * Everything (hopefully) * makes them actually obtainable (oops) * renames the fannypack to "waist bag" * Removes and replaces remaining mentions of fannypacks * oops --- .../Catalog/Fills/Crates/salvage.yml | 2 ++ .../Inventories/clothesmate.yml | 3 +- .../Entities/Clothing/Belt/waist_bags.yml | 32 ++++++++++++++++++ .../Belt/waistbag.rsi/equipped-BELT.png | Bin 0 -> 273 bytes .../Belt/waistbag.rsi/equipped-trinkets.png | Bin 0 -> 179 bytes .../Clothing/Belt/waistbag.rsi/icon.png | Bin 0 -> 317 bytes .../Clothing/Belt/waistbag.rsi/meta.json | 28 +++++++++++++++ .../Belt/waistbag.rsi/waistbag-trinkets.png | Bin 0 -> 171 bytes .../Clothing/Belt/waistbag.rsi/waistbag.png | Bin 0 -> 317 bytes .../waistbag_leather.rsi/equipped-BELT.png | Bin 0 -> 382 bytes .../Belt/waistbag_leather.rsi/icon.png | Bin 0 -> 461 bytes .../Belt/waistbag_leather.rsi/meta.json | 18 ++++++++++ 12 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml create mode 100644 Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-trinkets.png create mode 100644 Resources/Textures/Clothing/Belt/waistbag.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag-trinkets.png create mode 100644 Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag.png create mode 100644 Resources/Textures/Clothing/Belt/waistbag_leather.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belt/waistbag_leather.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 4f01f57d14..4227c3c1ea 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -42,6 +42,8 @@ prob: 0.1 - id: ResearchDisk prob: 0.1 + - id: ClothingBeltStorageWaistbag + prob: 0.1 # - Service - id: CrayonBox prob: 0.1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 19eddd7060..3bc68e609e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -58,4 +58,5 @@ ClothingHeadRastaHat: 2 ClothingNeckScarfStripedRed: 3 ClothingNeckScarfStripedBlue: 3 - ClothingNeckScarfStripedGreen: 3 \ No newline at end of file + ClothingNeckScarfStripedGreen: 3 + ClothingBeltStorageWaistbag: 3 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml b/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml new file mode 100644 index 0000000000..6d47010efc --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Belt/waist_bags.yml @@ -0,0 +1,32 @@ +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltStorageWaistbag + name: leather waist bag + description: A leather waist bag meant for carrying small items. + components: + - type: Sprite + sprite: Clothing/Belt/waistbag_leather.rsi + - type: Clothing + sprite: Clothing/Belt/waistbag_leather.rsi + - type: Storage + capacity: 20 + +#Colorization on worn items doesn't work. If this ever gets fixed, you can duplicate this entry and change the color on the sprite to add color variants. +#- type: entity +# parent: ClothingBeltStorageWaistbag +# id: ClothingBeltWaistbagColorRed +# name: red waist bag +# description: A waist bag meant for carrying small items. +# components: +# - type: Sprite +# sprite: Clothing/Belt/waistbag.rsi +# layers: +# - state: "waistbag" +# color: "#bf1313" +# - state: "waistbag-trinkets" +# - type: Clothing +# sprite: Clothing/Belt/waistbag.rsi +# layers: +# - state: "equipped-BELT" +# color: "#bf1313" +# - state: "equipped-trinkets" \ No newline at end of file diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..09a5ec4d694cd12df9e0d7659c3b87601da9b472 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z=H%o|nl!1Zs;a)e9w;Vr$}=8Fv6ck+1^)*EhTq%xf`I~@1s;*b z3=DinK$vl=HlH+5u*%cLF(ktM?KDTO0}4DWi=X|^&s(%K;%w8SrBmiMFNkcvBXrSO zW5I!i4NT9onF1&Jrpj+Wuc^9bgV*DI;m7!j>|Pv@_`?0>nL0#GI}?`-S6q|XjJGbr zzi#sWIxuIeDl_LIuP;Fp7O+fJ;GW*Ifnn3@fDg=#uUIXO?IjB;`arH=@O1TaS?83{ F1OUgPV3+^^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-trinkets.png b/Resources/Textures/Clothing/Belt/waistbag.rsi/equipped-trinkets.png new file mode 100644 index 0000000000000000000000000000000000000000..29a8e9ae0698a9d9a5f35a9d8d5e785bc3816896 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBpogc6V@O5Z+nWn{4;b*UI7}~NdB1-myBG5r zC#TtWJoSJ6G-d}XW7x2CmD~K7lT08s5Lg7H?KAej-dg_itqudjgK#Cg_J@2Oi;C>( OL9(8%elF{r5}E*}Q8O6; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/icon.png b/Resources/Textures/Clothing/Belt/waistbag.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bf87f0eea5aaf5a3f9466401db640bc7771d1871 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?STVOLQSc887 zDV~xbzu^A}z#w%0+&Q2)XMsm#F;LYJ5N4dJ%_j{M?DBMR46*QkJK-Q-vjd0A#_o=% z|Nn2_V6BkpGwWXMbjg{KF{-~021on}UC^q{=2+>!?RrAm_vkAQQc3ro|J<3FzK+3Y ziN4yTiJVU|3Im!&IvX2KJY8K-;p`)BBtKE-W7|C5wc*R$78k~@?71JKdw#qAt~nF; vHGb2)qPV8~9rwrWjBJkIx7)NHc*8t%z51f}J8vffUB%$(>gTe~DWM4fz>$3F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json b/Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json new file mode 100644 index 0000000000..3c74d08cfe --- /dev/null +++ b/Resources/Textures/Clothing/Belt/waistbag.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bb7fbdc95eb79ca8bdaa2e046b99267f2cfe4247", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "waistbag" + }, + { + "name": "waistbag-trinkets" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-trinkets", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag-trinkets.png b/Resources/Textures/Clothing/Belt/waistbag.rsi/waistbag-trinkets.png new file mode 100644 index 0000000000000000000000000000000000000000..f5d936df2589ea53fe40626984de1cd617609a6b GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!po6E2V@QPi+lvQzfkrt8K3eB<$MuFo@*yUz ziKpwucWm|KWe7NWH+`SG+dXw_8>MyLQ!;puhflh(OI(VOLQSc887 zDV~xbzu^A}z#w%0+&Q2)XMsm#F;LYJ5N4dJ%_j{M?DBMR46*QkJK-Q-vjd0A#_o=% z|Nn2_V6BkpGwWXMbjg{KF{-~021on}UC^q{=2+>!?RrAm_vkAQQc3ro|J<3FzK+3Y ziN4yTiJVU|3Im!&IvX2KJY8K-;p`)BBtKE-W7|C5wc*R$78k~@?71JKdw#qAt~nF; vHGb2)qPV8~9rwrWjBJkIx7)NHc*8t%z51f}J8vffUB%$(>gTe~DWM4fz>$3F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..6b59068186749f91792d48f8bafc6a701800f70c GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TRh zr;B4q#hkaZ47m;&NVLv>@ZiBS(JI!1zP3*9AG~-cxu?1O1BVq?+``!wV&a18s|ACc zGMDh44Y>b%nMv!PdizUdC#0KXI2kO37>ZOFo_H{vn8+|enNh)=$)S&>0VLtbH0k7u z8}jEp#4i`=ou1G9WkML!ndaLc%eEfTk*q(y{7u}wZp}k$-!IPn8^-kJ(XxqW-!+t4 z@$1Pr^+-9cZ^(SI`7if(DO=Sa$~T_3mtBm_7_qWt?+6<&!ZT!r zr4PWsz=oKZ7}(fYm_lU5Y11^E-O_}?ZUU()B%kESO78yqd}lj04r~U%02lxR@V@|j z2c_!U`ScQZH<6sbbM!g`s3)~a*6R1===CjFy>*@-oFa~632}cL{fOBGqXiH`M|PEv zrx~y;)}v-(<@E|U?hs|M!m21pqbPL{N&u1E8vrRKTWk{QgrX>_Vv)%Th>8gfG9`q* z1;-;SbJnV-bx_#~(g10wOb;+;@J1v6wq3!*Q*T6JuSu0$#?G0}eRlO7+ z_V|J@I8}yBytGVm$QYUYw-s2gn3Y0kKpW8a$MXGE7{DJ7HPl0#(DUPSfgCP4)3;Dt z0TC!xPTN`vwy~T}0q5!8j$s{w(_Hj)_V9%3i!-JF^IL|5v2E-w{YE#TgxFjzq6JN3 zn)tQ;7qo3fX8_-uvbk@^0Bwc$0afF_!5;u+`=00000NkvXXu0mjf Dm9EF@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json new file mode 100644 index 0000000000..51f6b66a7e --- /dev/null +++ b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bb7fbdc95eb79ca8bdaa2e046b99267f2cfe4247", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} \ No newline at end of file -- 2.52.0