mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +01:00
[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 🆑 fix: Cauteries now have 'heat', like lighters, welders, etc. qol: You can smoke with a space helmet as long as you have internals on. /🆑 * Cauteries have heat, you can smoke with a space helmet --------- Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com>
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user