Skip to content

Fixes #8828: Lighters, matches, and cigs now have different attack descriptions depending on if they're lit or not. #11476

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

Open
Puckaboo2 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −8
Open

Fixes #8828: Lighters, matches, and cigs now have different attack descriptions depending on if they're lit or not. #11476

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
26 changes: 18 additions & 8 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 @@ -110,15 +110,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
)
icon_state = "match"
item_state = "match"
attack_verb = list("poked", "jabbed", "pricked", "prodded")
damtype = "brute"
var/burnt = 0
var/smoketime = 10 SECONDS
var/burnt_name = "burnt match"
w_class = SIZE_TINY
light_range = 2
light_power = 1

attack_verb = list("burnt", "singed")

/obj/item/tool/match/afterattack(atom/target, mob/living/carbon/human/user, proximity_flag, click_parameters)
if(istype(user) && istype(target, /obj/item/clothing/shoes/marine) && user.shoes == target && light_match(user))
if(prob(5))
Expand Down Expand Up @@ -153,6 +153,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
set_light_on(toggle_on)

/obj/item/tool/match/proc/light_match(mob/user)
attack_verb = list("burnt", "singed", "scorched", "seared")
if(heat_source || burnt)
return
heat_source = 1000
Expand All @@ -169,6 +170,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
return TRUE

/obj/item/tool/match/proc/burn_out()
attack_verb = list("poked", "jabbed", "pricked", "prodded")
heat_source = 0
burnt = 1
damtype = "brute"
Expand Down Expand Up @@ -211,7 +213,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
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")
attack_verb = list("poked", "jabbed", "pricked", "prodded")
damtype = "brute"
blood_overlay_type = ""
light_color = LIGHT_COLOR_ORANGE
/// Note - these are in masks.dmi not in cigarette.dmi
Expand All @@ -225,7 +228,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/Initialize()
. = ..()
flags_atom |= NOREACT // so it doesn't react until you light it
create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
create_reagents(chem_volume) // making the cigarette a chemical holder with a maximum volume of 15
reagents.add_reagent("nicotine",10)
if(w_class == SIZE_TINY)
AddElement(/datum/element/mouth_drop_item)
Expand Down Expand Up @@ -332,10 +335,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM

/obj/item/clothing/mask/cigarette/proc/light(flavor_text)
SIGNAL_HANDLER

if(!heat_source)
heat_source = 1000
damtype = "fire"
attack_verb = list("burnt", "singed", "scorched", "seared")
if(reagents.handle_volatiles())
qdel(src)
return
Expand Down Expand Up @@ -407,14 +410,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/obj/item/butt = new type_butt(T)
transfer_fingerprints_to(butt)
//if(M)
//M.temp_drop_inv_item(src) //un-equip it so the overlays can updat
//M.temp_drop_inv_item(src) //un-equip it so the overlays can update
qdel(src)
. = butt
else
set_light_on(FALSE)
heat_source = 0
icon_state = icon_off
item_state = icon_off
attack_verb = list("poked", "jabbed", "pricked", "prodded")
damtype = "brute"
if(M)
M.update_inv_wear_mask()

Expand Down Expand Up @@ -744,7 +749,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
flags_atom = FPRINT|CONDUCT
flags_equip_slot = SLOT_WAIST
flags_obj = parent_type::flags_obj|OBJ_IS_HELMET_GARB
attack_verb = list("burnt", "singed")
attack_verb = list("poked", "jabbed", "pricked", "prodded")
damtype = "brute"

/obj/item/tool/lighter/zippo
name = "\improper Zippo lighter"
Expand Down Expand Up @@ -832,6 +838,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
heat_source = 1500
icon_state = icon_on
item_state = icon_on

if(istype(src, /obj/item/tool/lighter/zippo) )
user.visible_message(SPAN_ROSE("Without even breaking stride, [user] flips open and lights [src] in one smooth movement."))
playsound(src.loc,"zippo_open",10, 1, 3)
Expand All @@ -847,7 +854,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else
user.apply_damage(2,BURN,"r_hand")
user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light [src], they however burn their finger in the process."))

attack_verb = list("burnt", "branded", "scorched", "seared")
damtype = "fire"
set_light_range(2)
set_light_on(TRUE)
START_PROCESSING(SSobj, src)
Expand All @@ -862,6 +870,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
heat_source = 0
icon_state = icon_off
item_state = icon_off
attack_verb = list("smacked", "hit", "strike")
damtype = "brute"
if(!silent)
if(istype(src, /obj/item/tool/lighter/zippo) )
bearer.visible_message(SPAN_ROSE("You hear a quiet click, as [bearer] shuts off [src] without even looking at what they're doing."))
Expand Down