From 950dc541619ebdde34abbcfe9b70014843954919 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 12 Sep 2020 15:38:47 +0100 Subject: [PATCH 1/6] catch_fire proc --- code/modules/clothing/clothing.dm | 3 +++ code/modules/mob/living/living_defense.dm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b1efd1f0b78..18c4b84b2fd 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -120,6 +120,9 @@ else icon = initial(icon) +/obj/item/clothing/proc/catch_fire() //Called in IgniteMob() + return + //Ears: currently only used for headsets and earmuffs /obj/item/clothing/ears name = "ears" diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 4da8aa97e06..7512eb33ae7 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -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 src.contents) + C.catch_fire(src) else ExtinguishMob() return From af2ea5076429433ac99f755c0c24caf82713d1fd Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 12 Sep 2020 15:38:57 +0100 Subject: [PATCH 2/6] Cigarettes catch fire --- code/game/objects/items/weapons/cigs.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 30ad91beffa..b0bc5d18d17 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -66,6 +66,10 @@ LIGHTERS ARE IN LIGHTERS.DM ..() light() +/obj/item/clothing/mask/cigarette/catch_fire() + if(!lit) + light("Your [name] is lit by the flames!") + /obj/item/clothing/mask/cigarette/welder_act(mob/user, obj/item/I) . = TRUE if(I.tool_use_check(user, 0)) //Don't need to flash eyes because you are a badass From 9ec4ba49ab977faf8e1b833904c26a035f873180 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 12 Sep 2020 16:06:38 +0100 Subject: [PATCH 3/6] Fixes comment --- code/modules/clothing/clothing.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 18c4b84b2fd..6f627bcdc91 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -120,7 +120,7 @@ else icon = initial(icon) -/obj/item/clothing/proc/catch_fire() //Called in IgniteMob() +/obj/item/clothing/proc/catch_fire() //Called in handle_fire() return //Ears: currently only used for headsets and earmuffs From 3aea152a93f5f0148de2f34e58838a1868d6e3e5 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 12 Sep 2020 16:43:39 +0100 Subject: [PATCH 4/6] Fixes Changed 'Your' to 'The', since it's a 'visible_message'. Also removed implied src --- code/game/objects/items/weapons/cigs.dm | 2 +- code/modules/mob/living/living_defense.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index b0bc5d18d17..bd80e43140f 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -68,7 +68,7 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/cigarette/catch_fire() if(!lit) - light("Your [name] is lit by the flames!") + light("The [name] is lit by the flames!") /obj/item/clothing/mask/cigarette/welder_act(mob/user, obj/item/I) . = TRUE diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 7512eb33ae7..9ecda42de04 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -186,8 +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 src.contents) - C.catch_fire(src) + for(var/obj/item/clothing/C in contents) + C.catch_fire() else ExtinguishMob() return From 6a4a0fa922de4ddf0f882aedc687d68b23a92509 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 12 Sep 2020 16:58:10 +0100 Subject: [PATCH 5/6] Documentation Pretty sure I did this right. --- code/modules/clothing/clothing.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 6f627bcdc91..8dafd1f1cbd 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -120,6 +120,7 @@ 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 From 45aad847e3f3bb876070140ca41de7c0c08f924d Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 12 Sep 2020 18:54:17 +0100 Subject: [PATCH 6/6] Documentation the 2nd --- code/modules/clothing/clothing.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 8dafd1f1cbd..7e593436969 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -120,7 +120,9 @@ else icon = initial(icon) -///Used for any clothing interactions when the user is on fire. (e.g. Cigarettes getting lit.) +/** + * 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