From c9b19f5f24d0f075696bbb4135047112d76a3c84 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Fri, 31 Jan 2014 22:26:10 -0500
Subject: [PATCH] Fix skeleton flags

---
 code/modules/organs/organ_external.dm | 18 +++++++++---------
 code/setup.dm                         | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 20f08cf664c..addce0b1fd9 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -499,7 +499,7 @@ This function completely restores a damaged organ to perfect condition.
 			if(HEAD)
 				if(owner.species.flags & IS_SYNTHETIC)
 					organ= new /obj/item/weapon/organ/head/posi(owner.loc, owner)
-				else if(owner.mutations & SKELETON)
+				else if(SKELETON in owner.mutations)
 					organ= new /obj/item/weapon/skeleton/head(owner.loc)
 				else
 					organ= new /obj/item/weapon/organ/head(owner.loc, owner)
@@ -511,55 +511,55 @@ This function completely restores a damaged organ to perfect condition.
 			if(ARM_RIGHT)
 				if(status & ORGAN_ROBOT)
 					organ = new /obj/item/robot_parts/r_arm(owner.loc)
-				else if(owner.mutations & SKELETON)
+				else if(SKELETON in owner.mutations)
 					organ = new /obj/item/weapon/skeleton/r_arm(owner.loc)
 				else
 					organ= new /obj/item/weapon/organ/r_arm(owner.loc, owner)
 			if(ARM_LEFT)
 				if(status & ORGAN_ROBOT)
 					organ= new /obj/item/robot_parts/l_arm(owner.loc)
-				else if(owner.mutations & SKELETON)
+				else if(SKELETON in owner.mutations)
 					organ = new /obj/item/weapon/skeleton/l_arm(owner.loc)
 				else
 					organ= new /obj/item/weapon/organ/l_arm(owner.loc, owner)
 			if(LEG_RIGHT)
 				if(status & ORGAN_ROBOT)
 					organ = new /obj/item/robot_parts/r_leg(owner.loc)
-				else if(owner.mutations & SKELETON)
+				else if(SKELETON in owner.mutations)
 					organ = new /obj/item/weapon/skeleton/r_leg(owner.loc)
 				else
 					organ= new /obj/item/weapon/organ/r_leg(owner.loc, owner)
 			if(LEG_LEFT)
 				if(status & ORGAN_ROBOT)
 					organ = new /obj/item/robot_parts/l_leg(owner.loc)
-				else if(owner.mutations & SKELETON)
+				else if(SKELETON in owner.mutations)
 					organ = new /obj/item/weapon/skeleton/l_leg(owner.loc)
 				else
 					organ= new /obj/item/weapon/organ/l_leg(owner.loc, owner)
 			if(HAND_RIGHT)
 				if(!(status & ORGAN_ROBOT))
-					if(owner.mutations & SKELETON)
+					if(SKELETON in owner.mutations)
 						organ = new /obj/item/weapon/skeleton/r_hand(owner.loc)
 					else
 						organ= new /obj/item/weapon/organ/r_hand(owner.loc, owner)
 				owner.u_equip(owner.gloves)
 			if(HAND_LEFT)
 				if(!(status & ORGAN_ROBOT))
-					if(owner.mutations & SKELETON)
+					if(SKELETON in owner.mutations)
 						organ = new /obj/item/weapon/skeleton/l_hand(owner.loc)
 					else
 						organ= new /obj/item/weapon/organ/l_hand(owner.loc, owner)
 				owner.u_equip(owner.gloves)
 			if(FOOT_RIGHT)
 				if(!(status & ORGAN_ROBOT))
-					if(owner.mutations & SKELETON)
+					if(SKELETON in owner.mutations)
 						organ = new /obj/item/weapon/skeleton/r_foot(owner.loc)
 					else
 						organ= new /obj/item/weapon/organ/r_foot/(owner.loc, owner)
 				owner.u_equip(owner.shoes)
 			if(FOOT_LEFT)
 				if(!(status & ORGAN_ROBOT))
-					if(owner.mutations & SKELETON)
+					if(SKELETON in owner.mutations)
 						organ = new /obj/item/weapon/skeleton/l_foot(owner.loc)
 					else
 						organ = new /obj/item/weapon/organ/l_foot(owner.loc, owner)
diff --git a/code/setup.dm b/code/setup.dm
index 52490849fdc..01d25246772 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -345,6 +345,20 @@ var/MAX_EXPLOSION_RANGE = 14
 //#define SHOCKWAVE		19 	// (Not implemented) attack a nearby tile and cause a massive shockwave, knocking most people on their asses (25%)
 //#define ELECTRICITY	20 	// (Not implemented) ability to shoot electric attacks (15%)
 
+//bitflags for mutations
+	// Extra powers:
+#define SHADOW			(1<<10)	// shadow teleportation (create in/out portals anywhere) (25%)
+#define SCREAM			(1<<11)	// supersonic screaming (25%)
+#define EXPLOSIVE		(1<<12)	// exploding on-demand (15%)
+#define REGENERATION	(1<<13)	// superhuman regeneration (30%)
+#define REPROCESSOR		(1<<14)	// eat anything (50%)
+#define SHAPESHIFTING	(1<<15)	// take on the appearance of anything (40%)
+#define PHASING			(1<<16)	// ability to phase through walls (40%)
+#define SHIELD			(1<<17)	// shielding from all projectile attacks (30%)
+#define SHOCKWAVE		(1<<18)	// attack a nearby tile and cause a massive shockwave, knocking most people on their asses (25%)
+#define ELECTRICITY		(1<<19)	// ability to shoot electric attacks (15%)
+
+
 	//2spooky
 #define SKELETON 29
 #define PLANT 30