Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into JMP-n-STUFF

code/modules/client/preferences_savefile.dm

@@ -290,6 +290,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["socks"]				>> socks
 	S["backbag"]			>> backbag
 	S["uplink_loc"]			>> uplink_spawn_loc
+	S["feature_exhibitionist"]			>> features["exhibitionist"]
 	S["feature_mcolor"]					>> features["mcolor"]
 	S["feature_mcolor2"]				>> features["mcolor2"]
 	S["feature_mcolor3"]				>> features["mcolor3"]
@@ -432,10 +433,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	features["has_breasts"]			= sanitize_integer(features["has_breasts"], 0, 1, 0)
 	features["breasts_size"]		= sanitize_inlist(features["breasts_size"], breasts_size_list, "C")
 	features["breasts_color"]		= sanitize_hexcolor(features["breasts_color"], 3, 0)
-	features["breasts_fluid"] 		= sanitize_inlist(features["breasts_fluid"], cum_id_list, "semen")
+	features["breasts_fluid"] 		= sanitize_inlist(features["breasts_fluid"], milk_id_list, "milk")
 	//vagina features
 	features["has_vag"]				= sanitize_integer(features["has_vag"], 0, 1, 0)
-	features["vag_color"]			= sanitize_hexcolor(features["breasts_color"], 3, 0)
+	features["vag_color"]			= sanitize_hexcolor(features["vag_color"], 3, 0)
 
 	joblessrole	= sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
 	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
@@ -480,6 +481,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["uplink_loc"]			<< uplink_spawn_loc
 	S["flavor_text"]			<< flavor_text
 	S["species"]			<< pref_species.id
+	S["feature_exhibitionist"]			<< features["exhibitionist"]
 	S["feature_mcolor"]					<< features["mcolor"]
 	S["feature_mcolor2"]				<< features["mcolor2"]
 	S["feature_mcolor3"]				<< features["mcolor3"]

code/modules/events/grid_check.dm

@@ -1,8 +1,8 @@
 /datum/round_event_control/grid_check
 	name = "Grid Check"
 	typepath = /datum/round_event/grid_check
-	weight = 10
-	max_occurrences = 3
+	weight = 7
+	max_occurrences = 1
 
 /datum/round_event/grid_check
 	announceWhen	= 1

code/modules/events/radiation_storm.dm

@@ -2,6 +2,7 @@
 	name = "Radiation Storm"
 	typepath = /datum/round_event/radiation_storm
 	max_occurrences = 1
+	weight = 7
 
 /datum/round_event/radiation_storm
 

code/modules/events/vent_clog.dm

@@ -10,7 +10,8 @@
 	var/interval 	= 2
 	var/list/vents  = list()
 	var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","mushroomhallucinogen","lube",
-								 "plantbgone","banana","charcoal","space_drugs","morphine","holywater","ethanol","hot_coco","sacid")
+								 "plantbgone","banana","charcoal","space_drugs","morphine","holywater","ethanol","hot_coco","sacid",
+								 "aphro","aphro+","anaphro","anaphro+","semen")
 
 /datum/round_event/vent_clog/announce()
 	priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert")

code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

@@ -525,6 +525,22 @@
 				icon_state = "glass_yellow"
 				name = "Eggnog"
 				desc = "For enjoying the most wonderful time of the year."
+			if("aphro")
+				icon_state = "glass_aphro"
+				name = "glass of aphrodisiac"
+				desc = "For your love interest."
+			if("aphro+")
+				icon_state = "glass_aphro+"
+				name = "glass of strong aphrodisiac"
+				desc = "For your less interested love interest."
+			if("semen")
+				icon_state = "glass_semen"
+				name = "glass of semen"
+				desc = "Salty."
+			if("femcum")
+				icon_state = "glass_femcum"
+				name = "glass of female ejaculate"
+				desc = "A glass of female ejaculate."
 			else
 				icon_state ="glass_brown"
 				var/image/I = image(icon, "glassoverlay")
@@ -635,6 +651,18 @@
 				icon_state = "shotglassgreen"
 				name = "shot of absinthe"
 				desc = "I am stuck in the cycles of my guilt..."
+			if ("semen")
+				icon_state = "shotglasswhite"
+				name = "cum shot"
+				desc = "All those college years boil down to this."
+			if("aphro")
+				icon_state = "shotglassaphro"
+				name = "shot of love"
+				desc = "Guaranteed to put you in the mood."
+			if("aphro+")
+				icon_state = "shotglassaphro"
+				name = "strong shot of love"
+				desc = "Guaranteed to put you in the mood. Not recommended to take more than one unless you're dedicated."
 			else
 				icon_state = "shotglassbrown"
 				name = "shot of... what?"