Skip to content

Commit

Permalink
Category Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Max-023 committed Sep 3, 2024
1 parent be3ffa8 commit 085361e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ GLOBAL_LIST_INIT(slot_to_contained_sprite_shorthand, list(
#define ACCESSORY_SLOT_HOLSTER "Holster"
#define ACCESSORY_SLOT_SGPAINT "SG Paint"
#define ACCESSORY_SLOT_PAINT "Paint"
#define ACCESSORY_SLOT_M3UTILITY "M3 Utility"

/// Used for uniform armor inserts.
#define ACCESSORY_SLOT_ARMOR_C "Chest armor"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1904,7 +1904,7 @@
/obj/item/device/walkman,
/obj/item/storage/belt/gun/m39,
)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_PAINT, ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_PONCHO)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_DECORARMOR, ACCESSORY_SLOT_PAINT, ACCESSORY_SLOT_M3UTILITY, ACCESSORY_SLOT_PONCHO)

light_power = 3
light_range = 4
Expand Down
2 changes: 2 additions & 0 deletions code/modules/clothing/under/ties.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,7 @@
desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden."
icon_state = "m3webbing"
hold = /obj/item/storage/internal/accessory/webbing/m3/generic
slot = ACCESSORY_SLOT_M3UTILITY

/obj/item/clothing/accessory/storage/black_vest/m3/m40
name = "\improper M3 Pattern Grenade Webbing"
Expand All @@ -1132,3 +1133,4 @@
desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden."
icon_state = "m3webbingsmall"
hold = /obj/item/storage/internal/accessory/black_vest/m3/generic
slot = ACCESSORY_SLOT_M3UTILITY
2 changes: 1 addition & 1 deletion code/modules/clothing/under/under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
var/worn_state = null
var/hood_state //for uniforms with hoods.
drag_unequip = TRUE
valid_accessory_slots = list(ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_ARMOR_C, ACCESSORY_SLOT_HOLSTER)
valid_accessory_slots = list(ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_ARMOR_C, ACCESSORY_SLOT_HOLSTER)
restricted_accessory_slots = list(ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_ARMOR_C, ACCESSORY_SLOT_HOLSTER)
sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/uniform_monkey_0.dmi')
equip_sounds = list('sound/handling/clothing_on.ogg')
Expand Down

0 comments on commit 085361e

Please sign in to comment.