From a454ae5db2ea78a5a93c3d3cac28d0ea41924486 Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Thu, 1 Aug 2024 00:21:59 -0400 Subject: [PATCH] cigarettes cigars lighters fit in helmet cosmetic --- code/game/objects/items/storage/fancy.dm | 2 ++ code/game/objects/items/tools/flame_tools.dm | 1 + code/modules/clothing/head/helmet.dm | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 5d7aecbc03db..77861aba4af8 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -126,6 +126,7 @@ w_class = SIZE_TINY throwforce = 2 flags_equip_slot = SLOT_WAIST + flags_obj = OBJ_IS_HELMET_GARB max_w_class = SIZE_TINY storage_slots = 20 can_hold = list( @@ -269,6 +270,7 @@ throwforce = 2 w_class = SIZE_SMALL flags_equip_slot = SLOT_WAIST + flags_obj = OBJ_IS_HELMET_GARB storage_slots = 7 can_hold = list(/obj/item/clothing/mask/cigarette/cigar) icon_type = "cigar" diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm index d5cd708f29b3..404a308ea290 100644 --- a/code/game/objects/items/tools/flame_tools.dm +++ b/code/game/objects/items/tools/flame_tools.dm @@ -693,6 +693,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM throwforce = 4 flags_atom = FPRINT|CONDUCT flags_equip_slot = SLOT_WAIST + flags_obj = OBJ_IS_HELMET_GARB attack_verb = list("burnt", "singed") /obj/item/tool/lighter/zippo diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 463a4b16f7ec..845ce2a6eb6e 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -379,8 +379,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( ) var/obj/item/storage/internal/headgear/pockets - var/storage_slots = 2 // keep in mind, one slot is reserved for garb items - var/storage_slots_reserved_for_garb = 2 + var/storage_slots = 2 // Small items like injectors, bandages, etc + var/storage_slots_reserved_for_garb = 2 // Cosmetic items & now cigarettes and lighters for RP var/storage_max_w_class = SIZE_TINY // can hold tiny items only, EXCEPT for glasses & metal flask. var/storage_max_storage_space = 4