Merge pull request #13472 from timothyteakettle/slime-puddle

the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
parent 2f2cf75326 a1ccc31877
commit ad32b8f437
15 changed files with 558 additions and 677 deletions
@@ -219,6 +219,8 @@
 #define TRAIT_MOBILITY_NOPICKUP		"mobility_nopickup"
 /// Disallow item use
 #define TRAIT_MOBILITY_NOUSE		"mobility_nouse"
+///Disallow resting/unresting
+#define TRAIT_MOBILITY_NOREST		"mobility_norest"

 #define TRAIT_SWIMMING			"swimming"			//only applied by /datum/element/swimming, for checking

@@ -311,6 +313,7 @@
 #define CLOWNOP_TRAIT "clown-op"
 #define MEGAFAUNA_TRAIT "megafauna"
 #define DEATHSQUAD_TRAIT "deathsquad"
+#define SLIMEPUDDLE_TRAIT "slimepuddle"
 /// This trait is added by the active directional block system.
 #define ACTIVE_BLOCK_TRAIT				"active_block"
 /// This trait is added by the parry system.