Implement suggestions from code review

NebulaSS13 · Oct 21, 2023 · 0905c0e · 0905c0e
1 parent 6598b40
commit 0905c0e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 19 deletions.
diff --git a/code/game/objects/items/weapons/candle/candle.dm b/code/game/objects/items/weapons/candle/candle.dm
@@ -48,12 +48,12 @@
 		var/obj/item/flame/candle/other_candle = A
 		other_candle.light()
 
-/obj/item/flame/candle/proc/light(mob/user)
+/obj/item/flame/candle/light(mob/user, no_message)
 	if(!lit)
-		lit = TRUE
-		damtype = BURN
+		..()
 		update_force()
-		user.visible_message(SPAN_NOTICE("\The [user] lights \the [src]."), SPAN_NOTICE("You light \the [src]."))
+		if(!no_message)
+			user.visible_message(SPAN_NOTICE("\The [user] lights \the [src]."), SPAN_NOTICE("You light \the [src]."))
 		set_light(candle_range, candle_power)
 		START_PROCESSING(SSobj, src)
 
@@ -73,7 +73,7 @@
 
 /obj/item/flame/candle/attack_self(mob/user)
 	if(lit)
-		lit = FALSE
+		extinguish(user)
 		update_icon()
 		set_light(0)
 		remove_extension(src, /datum/extension/scent)
@@ -89,6 +89,6 @@
 	max_storage_space = 7
 	slot_flags = SLOT_LOWER_BODY
 	material = /decl/material/solid/cardboard
-	
+
 /obj/item/storage/candle_box/WillContain()
 	return list(/obj/item/flame/candle = 7)
diff --git a/code/game/objects/items/weapons/flame.dm b/code/game/objects/items/weapons/flame.dm
@@ -24,6 +24,14 @@
 			location.hotspot_expose(700, 5) // Potentially set fire to fuel etc.
 		extinguish(no_message = TRUE)
 
+/obj/item/flame/proc/light(mob/user, no_message)
+	if(lit)
+		return
+	lit = TRUE
+	damtype = BURN
+	update_force()
+	update_icon()
+
 /obj/item/flame/get_heat()
 	. = max(..(), lit ? lit_heat : 0)
 
@@ -48,6 +56,14 @@
 	randpixel = 10
 	max_force = 1
 
+/obj/item/flame/match/light(mob/user, no_message)
+	if(burnt)
+		return
+	if(lit)
+		return
+	. = ..()
+	START_PROCESSING(SSobj, src)
+
 /obj/item/flame/match/Process()
 	if(isliving(loc))
 		var/mob/living/M = loc
@@ -70,12 +86,13 @@
 		extinguish()
 	return ..()
 
-/obj/item/flame/match/extinguish(var/mob/user, var/no_message)
+/obj/item/flame/match/extinguish(var/mob/user, var/no_message, var/burn = TRUE)
 	. = ..()
-	name = "burnt match"
-	desc = "A match. This one has seen better days."
-	burnt = TRUE
-	update_icon()
+	if(burn)
+		name = "burnt match"
+		desc = "A match. This one has seen better days."
+		burnt = TRUE
+		update_icon()
 
 /obj/item/flame/match/on_update_icon()
 	. = ..()

diff --git a/code/game/objects/items/weapons/lighter.dm b/code/game/objects/items/weapons/lighter.dm
@@ -29,11 +29,13 @@
 /obj/item/flame/lighter/populate_reagents()
 	reagents.add_reagent(/decl/material/liquid/fuel, max_fuel)
 
-/obj/item/flame/lighter/proc/light(mob/user)
+/obj/item/flame/lighter/light(mob/user)
 	if(submerged())
 		to_chat(user, SPAN_WARNING("You cannot light \the [src] underwater."))
 		return
-	lit = TRUE
+	if(lit)
+		return
+	..()
 	update_icon()
 	light_effects(user)
 	set_light(2, l_color = COLOR_PALE_ORANGE)

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
@@ -438,11 +438,7 @@
 
 /obj/item/storage/box/matches/attackby(obj/item/flame/match/W, mob/user)
 	if(istype(W) && !W.lit && !W.burnt)
-		W.lit = TRUE
-		W.damtype = BURN
-		W.update_force()
-		W.update_icon()
-		START_PROCESSING(SSobj, W)
+		W.light()
 		playsound(src.loc, 'sound/items/match.ogg', 60, 1, -4)
 		user.visible_message(SPAN_NOTICE("[user] strikes [W] on \the [src]."), SPAN_NOTICE("You strike [W] on \the [src]."))
 	W.update_icon()

diff --git a/code/modules/economy/worth_items.dm b/code/modules/economy/worth_items.dm
@@ -23,7 +23,7 @@
 				largest_tech_val = next_tech_val
 		. += largest_tech_val
 
-	if(item_flags & ITEM_FLAG_IS_WEAPON && force)
+	if((item_flags & ITEM_FLAG_IS_WEAPON) && force)
 		var/weapon_value = ((get_max_weapon_value() * 15) * (1 + max(sharp, edge)))
 		if(attack_cooldown <= FAST_WEAPON_COOLDOWN)
 			weapon_value *= 1.5