Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223

[MIRROR] Organ Update [Cloning isn't broken edition]
2017-07-15 23:18:53 -05:00
parent d21766956e 3ed842376e
commit 8d31153fdc
24 changed files with 249 additions and 37 deletions
@@ -129,6 +129,8 @@
 #define NO_UNDERWEAR	26
 #define MUTCOLORS2		27
 #define MUTCOLORS3		28
+#define NOLIVER 		29
+#define NOSTOMACH		30
 //citadel code
 #define NOAROUSAL		29//Stops all arousal effects
-#define NOGENITALS		30//Cannot create, use, or otherwise have genitals
+#define NOGENITALS		30//Cannot create, use, or otherwise have genitals
@@ -0,0 +1,9 @@
+diff a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm	(rejected hunks)
+@@ -114,4 +114,6 @@
+ #define EASYLIMBATTACHMENT 23
+ #define TOXINLOVER		24
+ #define DIGITIGRADE		25	//Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi)
+-#define NO_UNDERWEAR		26
+#define NO_UNDERWEAR	26
+#define NOLIVER			27
+#define NOSTOMACH		28