Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Readds hand items into the backpack tab #169

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Readds hand items into the backpack tab #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/__DEFINES/loadout.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
//backpack
#define LOADOUT_CATEGORY_BACKPACK "In backpack"
#define LOADOUT_SUBCATEGORY_BACKPACK_GENERAL "General" //basically anything that there's not enough of to have its own subcategory
//Migrated content from the hands category
#define LOADOUT_SUBCATEGORY_BACKPACK_SMALL_ITEMS "Small items"
//#define LOADOUT_SUBCATEGORY_BACKPACK_TOYS "Toys"
#define LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS "Backpacks"
#define LOADOUT_SUBCATEGORY_BACKPACK_RATIONS "Snacks"
Expand Down
2 changes: 1 addition & 1 deletion code/_globalvars/lists/loadout_categories.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GLOBAL_LIST_INIT(loadout_categories, list(
LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS/*, LOADOUT_SUBCATEGORY_BACKPACK_VAULTGUNS*/),
LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS, LOADOUT_SUBCATEGORY_BACKPACK_SMALL_ITEMS, LOADOUT_SUBCATEGORIES_EARRINGS /*, LOADOUT_SUBCATEGORY_BACKPACK_VAULTGUNS*/),
LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL,/* LOADOUT_SUBCATEGORY_NECK_TIE,*/ LOADOUT_SUBCATEGORY_NECK_SCARVES),
LOADOUT_CATEGORY_MASK = list(LOADOUT_SUBCATEGORY_MASK_GENERAL, LOADOUT_SUBCATEGORY_MASK_BANDANA/*, LOADOUT_SUBCATEGORY_MASK_MISCELLANEOUS*/),
LOADOUT_CATEGORY_UNIFORM = list(LOADOUT_SUBCATEGORY_UNIFORM_GENERAL, LOADOUT_SUBCATEGORY_UNIFORM_WASTELAND, LOADOUT_SUBCATEGORY_UNIFORM_MEDICAL, LOADOUT_SUBCATEGORY_UNIFORM_SUITS, LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS, LOADOUT_SUBCATEGORY_UNIFORM_DRESSES, LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS, LOADOUT_SUBCATEGORY_UNIFORM_PANTS, LOADOUT_SUBCATEGORY_UNIFORM_TRADITIONAL, LOADOUT_SUBCATEGORY_UNIFORM_RAIDER, LOADOUT_SUBCATEGORY_UNIFORM_UNIFORMS, LOADOUT_SUBCATEGORY_UNIFORM_JUMPSUITS, LOADOUT_SUBCATEGORY_UNIFORM_ESCORT, LOADOUT_SUBCATEGORY_UNIFORM_TRIBAL),
Expand Down
6 changes: 3 additions & 3 deletions modular_citadel/code/modules/client/loadout/hands.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/datum/gear/hands
category = LOADOUT_CATEGORY_HANDS
subcategory = LOADOUT_SUBCATEGORY_NECK_GENERAL
slot = SLOT_HANDS
category = LOADOUT_CATEGORY_BACKPACK
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_SMALL_ITEMS
slot = SLOT_IN_BACKPACK
cost = 0

/datum/gear/hands/briefcase/crafted
Expand Down
Loading