From c15fc43be4c112a812d49cf60321cd98f1aeedef Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 8 Sep 2023 02:26:22 +0200 Subject: [PATCH] [MIRROR] Cauteries have heat, you can smoke with a space helmet [MDB IGNORE] (#23576) * Cauteries have heat, you can smoke with a space helmet (#78122) ## About The Pull Request Cauteries now have 'heat', like lighters, welders, etc. You can smoke with a space helmet as long as you have internals on. ## Why It's Good For The Game > Cauteries now have 'heat', like lighters, welders, etc. Seems like an oversight. If an esword can do it so can a implement meant to sear wounds shut. > You can smoke with a space helmet as long as you have internals on. Space smoking is awesome. ## Changelog :cl: fix: Cauteries now have 'heat', like lighters, welders, etc. qol: You can smoke with a space helmet as long as you have internals on. /:cl: * Cauteries have heat, you can smoke with a space helmet --------- Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com> --- code/game/objects/items/cigs_lighters.dm | 17 +++++++++++++++-- code/modules/surgery/tools.dm | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index f9f7377439b..eafe24a392c 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -219,9 +219,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!lighting_text) return ..() + var/mob/living/carbon/carbuser = user + + if(!istype(carbuser)) + carbuser = null + if(!reagents.has_reagent(/datum/reagent/oxygen)) //cigarettes need oxygen var/datum/gas_mixture/air = return_air() - if(!air || !air.has_gas(/datum/gas/oxygen, 1)) //or oxygen on a tile to burn + if(!air || !air.has_gas(/datum/gas/oxygen, 1) || !carbuser?.can_breathe_helmet()) //or oxygen on a tile to burn to_chat(user, span_notice("Your [name] needs a source of oxygen to burn.")) return ..() @@ -360,9 +365,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/process(seconds_per_tick) var/mob/living/user = isliving(loc) ? loc : null user?.ignite_mob() + + var/mob/living/carbon/carbuser + if(user) + carbuser = user + + if(carbuser && !istype(carbuser)) + carbuser = null + if(!reagents.has_reagent(/datum/reagent/oxygen)) //cigarettes need oxygen var/datum/gas_mixture/air = return_air() - if(!air || !air.has_gas(/datum/gas/oxygen, 1)) //or oxygen on a tile to burn + if(!air || !air.has_gas(/datum/gas/oxygen, 1) || !carbuser?.can_breathe_helmet()) //or oxygen on a tile to burn extinguish() return diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 8a45e193385..49fbecc2271 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -66,6 +66,7 @@ attack_verb_simple = list("burn") tool_behaviour = TOOL_CAUTERY toolspeed = 1 + heat = 500 /// How this looks when placed in a surgical tray var/surgical_tray_overlay = "cautery_normal"