cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Patting out fires on a target will now take priority over CPR, examining, etc. Can also pat out fires on corpses. (#9288)

Browse Source 
Fixes #9211

Currently CPR, checking wounds, etc. takes priority over putting out fire on a target. So you cannot pat out a fire until you've fixed their lungs or whatever. Also you cannot pat out fires on mobs that return false from is_asystole().

This changes the priority so patting out fires happens before everything else.
This commit is contained in:
mikomyazaki
2020-07-05 20:07:04 +03:00
committed by GitHub
parent 1dc0716770
commit cb81562905
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+17 -17
View File
@@ -177,7 +177,23 @@
swap_hand()
/mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
if (!is_asystole())
if (on_fire)
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if (M.on_fire)
M.visible_message(span("warning", "[M] tries to pat out [src]'s flames, but to no avail!"),
span("warning", "You try to pat out [src]'s flames, but to no avail! Put yourself out first!"))
else
M.visible_message(span("warning", "[M] tries to pat out [src]'s flames!"),
span("warning", "You try to pat out [src]'s flames! Hot!"))
if(do_mob(M, src, 1.5 SECONDS))
if (M.IgniteMob(prob(10)))
M.visible_message(span("danger", "The fire spreads from [src] to [M]!"),
span("danger", "The fire spreads to you as well!"))
else
if (src.ExtinguishMob(1))
M.visible_message(span("warning", "[M] successfully pats out [src]'s flames."),
span("warning", "You successfully pat out [src]'s flames."))
else if (!is_asystole())
if(src == M && istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
src.visible_message(
@@ -226,22 +242,6 @@
if((isskeleton(H)) && (!H.w_uniform) && (!H.wear_suit))
H.play_xylophone()
else if (on_fire)
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if (M.on_fire)
M.visible_message(span("warning", "[M] tries to pat out [src]'s flames, but to no avail!"),
span("warning", "You try to pat out [src]'s flames, but to no avail! Put yourself out first!"))
else
M.visible_message(span("warning", "[M] tries to pat out [src]'s flames!"),
span("warning", "You try to pat out [src]'s flames! Hot!"))
if(do_mob(M, src, 1.5 SECONDS))
if (M.IgniteMob(prob(10)))
M.visible_message(span("danger", "The fire spreads from [src] to [M]!"),
span("danger", "The fire spreads to you as well!"))
else
if (src.ExtinguishMob(1))
M.visible_message(span("warning", "[M] successfully pats out [src]'s flames."),
span("warning", "You successfully pat out [src]'s flames."))
else
var/t_him = "it"
if (src.gender == MALE)