diff --git a/code/game/objects/items/weapons/thurible.dm b/code/game/objects/items/weapons/thurible.dm index fce597c103a..e8e22d76035 100644 --- a/code/game/objects/items/weapons/thurible.dm +++ b/code/game/objects/items/weapons/thurible.dm @@ -22,6 +22,7 @@ "cbd", "space_drugs", "nicotine", "jestosterone", "nothing") /// How many reagents are consumed with each swing? var/swing_reagents_consumed = 2 + new_attack_chain = TRUE /obj/item/thurible/Initialize(mapload) . = ..() @@ -53,21 +54,29 @@ H.update_inv_r_hand() return ..() -/obj/item/thurible/attackby__legacy__attackchain(obj/item/fire_source, mob/user, params) - . = ..() - if(fire_source.get_heat()) - user.visible_message( - SPAN_NOTICE("[user] lights [src] with [fire_source]."), - SPAN_NOTICE("You light [src] with [fire_source]."), - SPAN_WARNING("You hear a low whoosh.") - ) - light(user) +/obj/item/thurible/item_interaction(mob/living/user, obj/item/used, list/modifiers) + if(..()) + return ITEM_INTERACT_COMPLETE + + if(!used.get_heat()) + return NONE + + user.visible_message( + SPAN_NOTICE("[user] lights [src] with [used]."), + SPAN_NOTICE("You light [src] with [used]."), + SPAN_WARNING("You hear a low whoosh.") + ) + light(user) + return ITEM_INTERACT_COMPLETE + +/obj/item/thurible/activate_self(mob/user) + if(..()) + return ITEM_INTERACT_COMPLETE -/obj/item/thurible/attack_self__legacy__attackchain(mob/user) if(lit) to_chat(user, SPAN_WARNING("You extinguish [src].")) put_out(user) - return ..() + return ITEM_INTERACT_COMPLETE /obj/item/thurible/can_enter_storage(obj/item/storage/S, mob/user) if(lit) @@ -111,6 +120,8 @@ to_chat(user, SPAN_WARNING("[src] is out of fuel!")) return + add_fingerprint(user) + // Plasma explodes when exposed to fire. if(reagents.get_reagent_amount("plasma")) var/datum/effect_system/reagents_explosion/E = new() @@ -146,6 +157,7 @@ STOP_PROCESSING(SSobj, src) set_light(0) update_appearance() + add_fingerprint(user) return TRUE /// Spreads reagents in a 3x3 area centered on the thurible