mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 18:44:48 +01:00
Merge pull request #14283 from SabreML/Fire-Lighting
Makes cigarettes catch fire if their holder is also on fire
This commit is contained in:
@@ -120,6 +120,12 @@
|
||||
else
|
||||
icon = initial(icon)
|
||||
|
||||
/**
|
||||
* Used for any clothing interactions when the user is on fire. (e.g. Cigarettes getting lit.)
|
||||
*/
|
||||
/obj/item/clothing/proc/catch_fire() //Called in handle_fire()
|
||||
return
|
||||
|
||||
//Ears: currently only used for headsets and earmuffs
|
||||
/obj/item/clothing/ears
|
||||
name = "ears"
|
||||
|
||||
@@ -186,6 +186,8 @@
|
||||
return 1
|
||||
if(fire_stacks > 0)
|
||||
adjust_fire_stacks(-0.1) //the fire is slowly consumed
|
||||
for(var/obj/item/clothing/C in contents)
|
||||
C.catch_fire()
|
||||
else
|
||||
ExtinguishMob()
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user