Merge pull request #8367 from Poojawa/genital-improvements

[READY] Genital fixes and skintone sync [Adds erections[]
2019-05-19 22:47:01 -07:00
parent 6c79587dad 28a1afa626
commit 626ede8464
22 changed files with 79 additions and 47 deletions
@@ -76,6 +76,9 @@
 #define MILK_RATE_MULT		1
 #define MILK_EFFICIENCY		1

+#define AROUSAL_MINIMUM_DEFAULT 	0
+#define AROUSAL_MAXIMUM_DEFAULT 	100
+#define AROUSAL_START_VALUE			1
 //Individual logging define
 #define INDIVIDUAL_LOOC_LOG "LOOC log"

@@ -98,6 +101,8 @@
 #define SKINTONE		40	//uses skin tones

 //Citadel istypes
+#define isgenital(A) (istype(A, /obj/item/organ/genital))
+
 #define isborer(A) (istype(A, /mob/living/simple_animal/borer))
 #define isipcperson(A) (is_species(A, /datum/species/ipc))
 #define ismammal(A) (is_species(A, /datum/species/mammal))