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

Jump to bottom

cigarettes cigars lighters fit in helmet cosmetic #6841

Merged
merged 5 commits into from
Aug 3, 2024
Merged

cigarettes cigars lighters fit in helmet cosmetic #6841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a454ae5
cigarettes cigars lighters fit in helmet cosmetic
hislittlecuzingames Aug 1, 2024
d19e859
removed cigar case fitting in helmets
hislittlecuzingames Aug 2, 2024
ce5fe47
Added matchboxes and better code convention
hislittlecuzingames Aug 2, 2024
c2dc3bf
added cigar support
hislittlecuzingames Aug 2, 2024
8059c66
added cigar and weed support
hislittlecuzingames Aug 2, 2024
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
1 change: 1 addition & 0 deletions code/game/objects/items/storage/boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@
item_state = "zippo"
w_class = SIZE_TINY
flags_equip_slot = SLOT_WAIST
flags_obj = parent_type::flags_obj|OBJ_IS_HELMET_GARB
can_hold = list(/obj/item/tool/match)

/obj/item/storage/box/matches/fill_preset_inventory()
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/storage/fancy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
w_class = SIZE_TINY
throwforce = 2
flags_equip_slot = SLOT_WAIST
flags_obj = parent_type::flags_obj|OBJ_IS_HELMET_GARB
max_w_class = SIZE_TINY
storage_slots = 20
can_hold = list(
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/tools/flame_tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
w_class = SIZE_TINY
flags_armor_protection = 0
flags_equip_slot = SLOT_EAR | SLOT_FACE
flags_obj = parent_type::flags_obj|OBJ_IS_HELMET_GARB
flags_atom = CAN_BE_SYRINGED
attack_verb = list("burnt", "singed")
blood_overlay_type = ""
Expand Down Expand Up @@ -693,6 +694,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
throwforce = 4
flags_atom = FPRINT|CONDUCT
flags_equip_slot = SLOT_WAIST
flags_obj = parent_type::flags_obj|OBJ_IS_HELMET_GARB
attack_verb = list("burnt", "singed")

/obj/item/tool/lighter/zippo
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading