diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 536995a0014..a46d5b81895 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -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