Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

code/citadel/cit_arousal.dm

@@ -25,7 +25,7 @@
 	var/arousal_gain_rate = 1 //Rate at which this species becomes aroused
 	var/arousal_lose_rate = 1 //Multiplier for how easily arousal can be relieved
 	var/list/cum_fluids = list("semen")
-	var/list/milk_fludis = list("milk")
+	var/list/milk_fluids = list("milk")
 	var/list/femcum_fluids = list("femcum")
 
 //Mob procs
@@ -285,4 +285,4 @@
 /mob/living/carbon/proc/force_orgasm(intensity)
 	if(canbearoused && has_dna() && (has_penis() || has_vagina()))
 		return 1
-	return 0
+	return 0