Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-05-09 03:08:54 -05:00
parent 5a67114d33 49a012ea87
commit 5ad532f723
50 changed files with 371 additions and 176 deletions
@@ -95,6 +95,7 @@
 #define NOAROUSAL		37 //Stops all arousal effects
 #define NOGENITALS		38 //Cannot create, use, or otherwise have genitals
 #define MATRIXED		39	//if icon is color matrix'd
+#define SKINTONE		40	//uses skin tones

 //Citadel istypes
 #define isborer(A) (istype(A, /mob/living/simple_animal/borer))