Merge remote-tracking branch 'origin/master' into rustsql

modular_citadel/code/datums/status_effects/chems.dm

@@ -500,13 +500,19 @@
 			else if (lowertext(customTriggers[trigger]) == "shock")
 				if (lewd && ishuman(C))
 					var/mob/living/carbon/human/H = C
-					H.adjust_arousal(5)
+					H.adjust_arousal(5, "MKUltra", aphro = TRUE)
 				C.jitteriness += 100
 				C.stuttering += 25
 				C.DefaultCombatKnockdown(60)
 				C.Stun(60)
 				to_chat(owner, "<span class='warning'><i>Your muscles seize up, then start spasming wildy!</i></span>")
 
+			else if (lewd && lowertext(customTriggers[trigger]) == "cum")//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+				if(ishuman(C))
+					var/mob/living/carbon/human/H = C
+					H.mob_climax(forced_climax=TRUE, cause = "MKUltra")
+				C.SetStun(10)//We got your stun effects in somewhere, Kev.
+
 			//kneel (knockdown)
 			else if (lowertext(customTriggers[trigger]) == "kneel")//as close to kneeling as you can get, I suppose.
 				to_chat(owner, "<span class='notice'><i>You drop to the ground unsurreptitiously.</i></span>")
@@ -588,6 +594,15 @@
 		deltaResist *= 1.25
 	if (owner.reagents.has_reagent(/datum/reagent/medicine/neurine))
 		deltaResist *= 1.5
+	if (!(owner.client?.prefs.cit_toggles & NO_APHRO) && lewd)
+		if (owner.reagents.has_reagent(/datum/reagent/drug/anaphrodisiac))
+			deltaResist *= 1.5
+		if (owner.reagents.has_reagent(/datum/reagent/drug/anaphrodisiacplus))
+			deltaResist *= 2
+		if (owner.reagents.has_reagent(/datum/reagent/drug/aphrodisiac))
+			deltaResist *= 0.75
+		if (owner.reagents.has_reagent(/datum/reagent/drug/aphrodisiacplus))
+			deltaResist *= 0.5
 	//Antag resistance
 	//cultists are already brainwashed by their god
 	if(iscultist(owner))

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -543,3 +543,9 @@
 	path = /obj/item/clothing/neck/petcollar/choker
 	ckeywhitelist = list("trigillass")
 
+/datum/gear/donator/strangemask
+	name = "Strange Metal Mask"
+	slot = SLOT_IN_BACKPACK
+	path = /obj/item/clothing/mask/breath/mmask
+	ckeywhitelist = list("sneka")
+

modular_citadel/code/modules/client/loadout/suit.dm

@@ -171,7 +171,7 @@
 	path = /obj/item/clothing/suit/jacket/urbanjacket/polychromic
 	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
-	loadout_initial_colors = list("#26321D", "#CBBDAF", "#292929")
+	loadout_initial_colors = list("#3B4B2E", "#CBBDAF", "#444444")
 
 /datum/gear/suit/ianshirt
 	name = "Ian Shirt"

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -593,4 +593,11 @@
 	icon_state = "choker"
 	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
 	item_state = "choker"
-	tagname = null
+
+/obj/item/clothing/mask/breath/mmask
+	name = "Strange Metal Mask"
+	desc = "An odd metal mask."
+	icon = 'icons/obj/custom.dmi'
+	item_state = "mmask"
+	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
+	icon_state = "mmask"

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -317,7 +317,7 @@
 	user.nextsoundemote = world.time + 7
 	var/sound
 	if(user.gender == MALE)
-		sound = pick('modular_citadel/sound/voice/human_male_pain_1.ogg', 'modular_citadel/sound/voice/human_male_pain_2.ogg', 'modular_citadel/sound/voice/human_male_pain_3.ogg', 'modular_citadel/sound/voice/human_male_pain_rare.ogg')
+		sound = pick('modular_citadel/sound/voice/human_male_pain_1.ogg', 'modular_citadel/sound/voice/human_male_pain_2.ogg', 'modular_citadel/sound/voice/human_male_pain_3.ogg', 'modular_citadel/sound/voice/human_male_pain_rare.ogg', 'modular_citadel/sound/voice/human_male_scream_1.ogg', 'modular_citadel/sound/voice/human_male_scream_2.ogg', 'modular_citadel/sound/voice/human_male_scream_3.ogg', 'modular_citadel/sound/voice/human_male_scream_4.ogg')
 	else
-		sound = pick('modular_citadel/sound/voice/human_female_pain_1.ogg', 'modular_citadel/sound/voice/human_female_pain_2.ogg', 'modular_citadel/sound/voice/human_female_pain_3.ogg')
+		sound = pick('modular_citadel/sound/voice/human_female_pain_1.ogg', 'modular_citadel/sound/voice/human_female_pain_2.ogg', 'modular_citadel/sound/voice/human_female_pain_3.ogg', 'modular_citadel/sound/voice/human_female_scream_2.ogg', 'modular_citadel/sound/voice/human_female_scream_3.ogg', 'modular_citadel/sound/voice/human_female_scream_4.ogg')
 	playsound(user, sound, 50, 0, 0)

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -176,7 +176,7 @@
 	name = "Sucubus milk"
 	id = /datum/reagent/fermi/breast_enlarger
 	results = list(/datum/reagent/fermi/breast_enlarger = 8)
-	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/consumable/milk = 1, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/silicon = 5)
+	required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/silicon = 3, /datum/reagent/drug/aphrodisiac = 3)
 	mix_message = "the reaction gives off a mist of milk."
 	//FermiChem vars:
 	OptimalTempMin 			= 200
@@ -216,7 +216,7 @@
 	name = "Incubus draft"
 	id = /datum/reagent/fermi/penis_enlarger
 	results = list(/datum/reagent/fermi/penis_enlarger = 8)
-	required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/carbon = 5, /datum/reagent/medicine/salglu_solution = 2)
+	required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/carbon = 2, /datum/reagent/drug/aphrodisiac = 2, /datum/reagent/medicine/salglu_solution = 1)
 	mix_message = "the reaction gives off a spicy mist."
 	//FermiChem vars:
 	OptimalTempMin 			= 200
@@ -383,7 +383,7 @@
 	name = "Furranium"
 	id = /datum/reagent/fermi/furranium
 	results = list(/datum/reagent/fermi/furranium = 5)
-	required_reagents = list(/datum/reagent/pax/catnip = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 2)
+	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/moonsugar = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 1)
 	mix_message = "You think you can hear a howl come from the beaker."
 	//FermiChem vars:
 	OptimalTempMin 	= 350
@@ -404,6 +404,10 @@
 //FOR INSTANT REACTIONS - DO NOT MULTIPLY LIMIT BY 10.
 //There's a weird rounding error or something ugh.
 
+/datum/chemical_reaction/fermi/furranium/organic
+	id = "furranium_organic"
+	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/pax/catnip = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 1)
+
 //Nano-b-gone
 /datum/chemical_reaction/fermi/nanite_b_gone//done test
 	name = "Naninte bain"