cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Collapse the if as PJB suggested

Browse Source 
It is not possible to change the if(isplamsaman()) because mob doesn't have a species.
This commit is contained in:
ShiftyRail
2017-10-14 23:10:38 +02:00
parent 52ec0a4451
commit 5a4fb02fc6
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/modules/clothing/clothing.dm
View File

@@ -219,19 +219,21 @@
armor[A] -= rand(armor[A]/3, armor[A])
/obj/item/clothing/attack(var/mob/living/M, var/mob/living/user, def_zone, var/originator = null)
if(iscarbon(user))
if(user.a_intent == I_HELP && (istype(src, /obj/item/clothing/under) || (istype(src, /obj/item/clothing/suit) && !istype(src, /obj/item/clothing/suit/space))))
if(ishuman(M) && M.on_fire)
var/mob/living/carbon/human/target = M
if(isplasmaman(target)) // Cannot put out plasmamen, else they could just go around with a jumpsuit and not need a space suit.
visible_message("<span class='warning'>\The [user] attempts to put out the fire on \the [target], but plasmafires are too hot. It is no use.</span>")
else
visible_message("<span class='warning'>\The [user] attempts to put out the fire on \the [target] with \the [src].</span>")
if(prob(extinguishingProb))
M.ExtinguishMob()
visible_message("<span class='notice'>\The [user] puts out the fire on \the [target].</span>")
return
..()
if (!(iscarbon(user) \
&& user.a_intent == I_HELP \
&& (istype(src, /obj/item/clothing/under) || (istype(src, /obj/item/clothing/suit) && !istype(src, /obj/item/clothing/suit/space))) \
&& ishuman(M) && M.on_fire))
..()
else
var/mob/living/carbon/human/target = M
if(isplasmaman(target)) // Cannot put out plasmamen, else they could just go around with a jumpsuit and not need a space suit.
visible_message("<span class='warning'>\The [user] attempts to put out the fire on \the [target], but plasmafires are too hot. It is no use.</span>")
else
visible_message("<span class='warning'>\The [user] attempts to put out the fire on \the [target] with \the [src].</span>")
if(prob(extinguishingProb))
M.ExtinguishMob()
visible_message("<span class='notice'>\The [user] puts out the fire on \the [target].</span>")
return
//Ears: headsets, earmuffs and tiny objects
/obj/item/clothing/ears