From 8fd4346dc30e4b29b7acac8bc3aa1fcdee4f85aa Mon Sep 17 00:00:00 2001
From: Rob Nelson <nexisentertainment@gmail.com>
Date: Wed, 30 Jul 2014 21:09:04 -0700
Subject: [PATCH] Plasmen bogfix

Conflicts:
	code/ZAS/Plasma.dm
---
 code/ZAS/Plasma.dm                           | 54 +++++++++++---------
 code/modules/clothing/spacesuits/alien.dm    |  2 +
 code/modules/mob/living/carbon/human/life.dm |  5 +-
 3 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/code/ZAS/Plasma.dm b/code/ZAS/Plasma.dm
index 716ea216403..d50b247d0b1 100644
--- a/code/ZAS/Plasma.dm
+++ b/code/ZAS/Plasma.dm
@@ -84,35 +84,43 @@ obj/var/contaminated = 0
 	if(stat >= 2)
 		return
 
-	//Burn skin if exposed.
-	if(vsc.plc.SKIN_BURNS)
-		if(!pl_head_protected() || !pl_suit_protected())
-			burn_skin(0.75)
-			if(prob(20)) src << "\red Your skin burns!"
-			updatehealth()
+	if(species.breath_type != "plasma")
+		//Burn skin if exposed.
+		if(vsc.plc.SKIN_BURNS)
+			if(!pl_head_protected() || !pl_suit_protected())
+				burn_skin(0.75)
+				if(prob(20)) src << "\red Your skin burns!"
+				updatehealth()
 
-	//Burn eyes if exposed.
-	if(vsc.plc.EYE_BURNS)
-		if(!head)
-			if(!wear_mask)
-				burn_eyes()
-			else
-				if(!(wear_mask.flags & MASKCOVERSEYES))
-					burn_eyes()
-		else
-			if(!(head.flags & HEADCOVERSEYES))
+		//Burn eyes if exposed.
+		if(vsc.plc.EYE_BURNS)
+			if(!head)
 				if(!wear_mask)
 					burn_eyes()
 				else
 					if(!(wear_mask.flags & MASKCOVERSEYES))
 						burn_eyes()
+			else
+				if(!(head.flags & HEADCOVERSEYES))
+					if(!wear_mask)
+						burn_eyes()
+					else
+						if(!(wear_mask.flags & MASKCOVERSEYES))
+							burn_eyes()
+				else
+					if(!(head.flags & HEADCOVERSEYES))
+						if(!wear_mask)
+							burn_eyes()
+						else
+							if(!(wear_mask.flags & MASKCOVERSEYES))
+								burn_eyes()
 
-	//Genetic Corruption
-	if(vsc.plc.GENETIC_CORRUPTION)
-		if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION)
-			randmutb(src)
-			src << "\red High levels of toxins cause you to spontaneously mutate."
-			domutcheck(src,null)
+		//Genetic Corruption
+		if(vsc.plc.GENETIC_CORRUPTION)
+			if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION)
+				randmutb(src)
+				src << "\red High levels of toxins cause you to spontaneously mutate."
+				domutcheck(src,null)
 
 
 /mob/living/carbon/human/proc/burn_eyes()
@@ -121,7 +129,7 @@ obj/var/contaminated = 0
 	var/datum/organ/internal/eyes/E = internal_organs["eyes"]
 	E.damage += 2.5
 	eye_blurry = min(eye_blurry+1.5,50)
-	if (prob(max(0,E.damage - 15) + 1) &&!eye_blind)
+	if (prob(max(0,E.damage - 15) + 1) && !eye_blind)
 		src << "\red You are blinded!"
 		eye_blind += 20
 
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index 11dd9aac760..9fccd02ab4c 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -282,11 +282,13 @@
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
 	species_restricted = list("Plasmaman")
+	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | PLASMAGUARD
 
 	icon_state = "plasmaman_suit"
 	item_state = "plasmaman_suit"
 
 /obj/item/clothing/head/helmet/space/plasmaman
+	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE | PLASMAGUARD
 	species_restricted = list("Plasmaman")
 
 	icon_state = "plasmaman_helmet0"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 4d975f7593c..dce7550a866 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -443,9 +443,8 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		if(species.name=="Plasmaman")
 
 			// Check if we're wearing our biosuit and mask.
-			var/cover_flags = get_covered_bodyparts()
-			if ((cover_flags & FULL_BODY) != FULL_BODY) // We check to see if ALL flags are set.
-				testing("Plasmaman [src] leakin'.  coverflags=[cover_flags]")
+			if (!istype(wear_suit,/obj/item/clothing/suit/space/plasmaman) || !istype(head,/obj/item/clothing/head/helmet/space/plasmaman))
+				//testing("Plasmaman [src] leakin'.  coverflags=[cover_flags]")
 				// OH FUCK HE LEAKIN'.
 				environment.adjust(tx = environment.total_moles()*BREATH_PERCENTAGE) // About one breath's worth. (I know we aren't breathing it out, but this should be about the right amount)