Merge branch 'master' into custom_roundstart_items

code/citadel/cit_arousal.dm

@@ -99,7 +99,7 @@
 	if(dna.species.update_arousal_hud())
 		return 0
 	if(!canbearoused)
-		hud_used.arousal.icon_state = "arousal0"
+		hud_used.arousal.icon_state = ""
 		return 0
 	else
 		if(hud_used.arousal)

code/citadel/cit_emotes.dm

@@ -0,0 +1,3 @@
+//Disables the custom emote blacklist from TG that normally applies to slimes.
+/datum/emote/living/custom
+	mob_type_blacklist_typecache = list(/mob/living/brain)

code/citadel/cit_reagents.dm

@@ -3,6 +3,8 @@
 	name = "Semen"
 	id = "semen"
 	description = "Sperm from some animal. Useless for anything but insemination, really."
+	taste_description = "something salty"
+	taste_mult = 2 //Not very overpowering flavor
 	data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null)
 	reagent_state = LIQUID
 	color = "#FFFFFF" // rgb: 255, 255, 255
@@ -44,6 +46,8 @@
 	name = "Female Ejaculate"
 	id = "femcum"
 	description = "Vaginal lubricant found in most mammals and other animals of similar nature. Where you found this is your own business."
+	taste_description = "female arousal"
+	taste_mult = 2
 	data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null)
 	reagent_state = LIQUID
 	color = "#AAAAAA77"
@@ -90,6 +94,8 @@
 	name = "Crocin"
 	id = "aphro"
 	description = "Naturally found in the crocus and gardenia flowers, this drug acts as a natural and safe aphrodisiac."
+	taste_description = "strawberry roofies"
+	taste_mult = 2 //Hide the roofies in stronger flavors
 	color = "#FFADFF"//PINK, rgb(255, 173, 255)
 
 /datum/reagent/aphrodisiac/on_mob_life(mob/living/M)
@@ -108,6 +114,7 @@
 	description = "Chemically condensed form of basic crocin. This aphrodisiac is extremely powerful and addictive in most animals.\
 					Addiction withdrawals can cause brain damage and shortness of breath. Overdosage can lead to brain damage and a\
 					 permanent increase in libido (commonly referred to as 'bimbofication')."
+	taste_description = "liquid desire"
 	color = "#FF2BFF"//dark pink
 	addiction_threshold = 20
 	overdose_threshold = 20
@@ -158,6 +165,8 @@
 	id = "anaphro"
 	description = "Naturally found in some species of evergreen trees, camphor is a waxy substance. When injested by most animals, it acts as an anaphrodisiac\
 					, reducing libido and calming them. Non-habit forming and not addictive."
+	taste_description = "dull bitterness"
+	taste_mult = 2
 	color = "#D9D9D9"//rgb(217, 217, 217)
 	reagent_state = SOLID
 
@@ -170,6 +179,7 @@
 	name = "Hexacamphor"
 	id = "anaphro+"
 	description = "Chemically condensed camphor. Causes an extreme reduction in libido and a permanent one if overdosed. Non-addictive."
+	taste_description = "tranquil celibacy"
 	color = "#D9D9D9"//rgb(217, 217, 217)
 	reagent_state = SOLID
 	overdose_threshold = 20