From 5a4d2fb064ea1cf44020658d5e6bef7957c50f4a Mon Sep 17 00:00:00 2001 From: ninruB <38016303+asperger-sind@users.noreply.github.com> Date: Tue, 4 Oct 2022 03:01:43 +0200 Subject: [PATCH] Combat boots, but cool. (#11652) --- .../Catalog/Fills/Backpacks/duffelbag.yml | 3 +- .../Prototypes/Catalog/Fills/Items/misc.yml | 8 ++++++ .../VendingMachines/Inventories/secdrobe.yml | 1 + .../Clothing/Shoes/base_clothingshoes.yml | 16 +++++++++++ .../Entities/Clothing/Shoes/boots.yml | 10 +++++-- .../Roles/Jobs/Fun/misc_startinggear.yml | 8 +++--- .../Roles/Jobs/Security/head_of_security.yml | 2 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 2 +- .../Boots/combatboots.rsi/equipped-FEET.png | Bin 0 -> 302 bytes .../Shoes/Boots/combatboots.rsi/icon.png | Bin 0 -> 246 bytes .../Boots/combatboots.rsi/inhand-left.png | Bin 0 -> 323 bytes .../Boots/combatboots.rsi/inhand-right.png | Bin 0 -> 340 bytes .../Shoes/Boots/combatboots.rsi/meta.json | 26 ++++++++++++++++++ 13 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 Resources/Prototypes/Catalog/Fills/Items/misc.yml create mode 100644 Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 9b3cd820e0..5474573193 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -256,7 +256,6 @@ - type: StorageFill contents: - id: BoxSurvivalSyndicate - - id: SurvivalKnife - id: WeaponPistolViper - id: PinpointerNuclear @@ -276,7 +275,7 @@ - id: Retractor - id: ScalpelAdvanced - id: BoxSurvivalSyndicate - - id: SurvivalKnife + - id: CombatKnife - id: WeaponPistolViper - id: PinpointerNuclear - id: HandheldHealthAnalyzer diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml new file mode 100644 index 0000000000..cc1153cca1 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml @@ -0,0 +1,8 @@ +- type: entity + id: ClothingShoesBootsCombatFilled + parent: ClothingShoesBootsCombat + suffix: Filled + components: + - type: StorageFill + contents: + - id: CombatKnife diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index fc08acc06f..f82efdc227 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -16,3 +16,4 @@ ClothingHeadsetSecurity: 3 ClothingOuterWinterSec: 2 ClothingEyesBlindfold: 1 + ClothingShoesBootsCombat: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index 9c468ab143..86f8cd7f77 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -19,3 +19,19 @@ spawned: - id: MaterialCloth1 amount: 1 + +- type: entity + abstract: true + parent: ClothingShoesBase + id: ClothingShoesStorageBase + components: + - type: Storage + capacity: 10 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 757dd14c39..433b8a8569 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -43,15 +43,19 @@ sprite: Clothing/Shoes/Boots/performer.rsi - type: entity - parent: ClothingShoesBaseButcherable + parent: ClothingShoesStorageBase id: ClothingShoesBootsCombat name: combat boots description: Robust combat boots for combat scenarios or combat situations. All combat, all the time. components: - type: Sprite - sprite: Clothing/Shoes/Boots/jackboots.rsi + sprite: Clothing/Shoes/Boots/combatboots.rsi - type: Clothing - sprite: Clothing/Shoes/Boots/jackboots.rsi + sprite: Clothing/Shoes/Boots/combatboots.rsi + - type: Storage + whitelist: + tags: + - Knife - type: entity parent: ClothingShoesBaseButcherable diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 5e0b43005d..49727f1bf3 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -73,7 +73,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitOperative back: ClothingBackpackDuffelSyndicateOperative - shoes: ClothingShoesBootsCombat + shoes: ClothingShoesBootsCombatFilled innerclothingskirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -87,7 +87,7 @@ back: ClothingBackpackDuffelSyndicateOperative ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat - shoes: ClothingShoesBootsCombat + shoes: ClothingShoesBootsCombatFilled pocket1: BaseUplinkRadio40TC id: AgentIDCard innerclothingskirt: ClothingUniformJumpsuitOperative @@ -106,7 +106,7 @@ ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitSyndie - shoes: ClothingShoesBootsCombat + shoes: ClothingShoesBootsCombatFilled id: AgentIDCard pocket1: ExtendedEmergencyOxygenTankFilled pocket2: BaseUplinkRadio40TC @@ -126,7 +126,7 @@ ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitSyndieCommander - shoes: ClothingShoesBootsCombat + shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: ExtendedEmergencyOxygenTankFilled pocket2: BaseUplinkRadio40TC diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 6e1d1c22a1..eb0ab319cb 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -32,7 +32,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitHoS back: ClothingBackpackSecurityFilled - shoes: ClothingShoesBootsJack + shoes: ClothingShoesBootsCombatFilled outerClothing: ClothingOuterCoatHoSTrench eyes: ClothingEyesGlassesSecurity head: ClothingHeadHatBeretHoS diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 31d6caa2de..4fbe108711 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -24,7 +24,7 @@ head: ClothingHeadHatWarden jumpsuit: ClothingUniformJumpsuitWarden back: ClothingBackpackSecurityFilled - shoes: ClothingShoesBootsJack + shoes: ClothingShoesBootsCombatFilled eyes: ClothingEyesGlassesSecurity outerClothing: ClothingOuterCoatWarden id: WardenPDA diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..71c3009e8969b6958af00053fc705f35ae102761 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`=mz+NxE?rg zfR~ro%ECfWP*7G@*38UIMMWhjC`d(FSw=>txv|m5$EP4SHzp=#{rdG>BB!~58u?3t z{DK+&qkyNq^Oganrg*wIhD5Z!on|Q1Y{0`(8?njp!2kWyk&<0!BJ_gPwzKMevv5|O z>cpYg@<-=J157DC0yIc#l ztqSMP$e(uvX=Asm`utM9QFs13=Hk72AGC8G9^Kx(i(|%n0kzdkTQS%XQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..04c5464445cf8152e2cc6a2a2a5afaf83602ea73 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|6a#!hTn`*L zAR;1SZEdZosVOfn@8{_=mxgDGf zDwlM>I_F@{tE@Vg+vLh)VUs!Ba@?wut(3H7*6LY{7&E(ldh=n~wsVE&D_>`bv21SW i+)}#V;m_gaI~kr_Ve)^RlW+%UFN3G6pUXO@geCw#_*>)v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..03bdacf9fb56813399ffd95046919fd81774980a GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3?2aSW-L^Y)fuUbBJ3(U1LF zpUtD>I$f@PVL01S#5KR6_@~B8%R?PTznI>+OyP??wOI4i|Lq%X9=10=+$;$+2M8Ke z@9fRf{O&9H>|N>oZKqD`uD!i3sA&yD`Fc%N>yo)zpJqE>kM#14Yg*Fq^W^3SYy!(3R zd)*@$mgz4aojoG&Sjw5LUuXI*ZmM;{+IR)98$iUil$TdLtfXt&mKvWpD=v@}Q<9c& zne|NfKa06_dxgt>-TqZQe|qQ5S4--~J<)#0dDO3&e78sm}`&b`8=^x+yjj^}? zMJTV|WX534=lm(PMP@DMfwJ7{-8~Ae^3A4)*{%t>c6Be$tM?*f_W>FVdQ&MBb@0M3k$`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json new file mode 100644 index 0000000000..f5bb702feb --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @ninruB#7795, based off tgstation's jackboots at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}