Revert "Merge branch 'master' into fairylights"

This reverts commit 2947727659, reversing
changes made to 91063fe882.

modular_citadel/code/modules/arousal/organs/anus.dm

@@ -36,12 +36,6 @@
 			size_name = "hefty"
 		if(5)
 			size_name = "godly"
-		if(6)
-			size_name = "gigantic"
-		if(7)
-			size_name = "unfathomably large"
-		if(8)
-			size_name = "absolute dumptruck"
 		else
 			size_name = "nonexistant"
 

modular_citadel/code/modules/arousal/organs/genitals.dm

@@ -78,21 +78,22 @@
 		if("Always visible")
 			through_clothes = TRUE
 			hidden = FALSE
-			mode = GENITALS_VISIBLE
+			mode = "visible"
 			if(!(src in owner.exposed_genitals))
 				owner.exposed_genitals += src
 		if("Hidden by clothes")
 			through_clothes = FALSE
 			hidden = FALSE
-			mode = GENITALS_CLOTHES
+			mode = "clothes"
 			if(src in owner.exposed_genitals)
 				owner.exposed_genitals -= src
 		if("Always hidden")
 			through_clothes = FALSE
 			hidden = TRUE
-			mode = GENITALS_HIDDEN
+			mode = "hidden"
 			if(src in owner.exposed_genitals)
 				owner.exposed_genitals -= src
+
 	if(ishuman(owner)) //recast to use update genitals proc
 		var/mob/living/carbon/human/H = owner
 		H.update_genitals()

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

@@ -111,9 +111,4 @@
 /datum/gear/cowboyboots/black
 	name = "Cowboy Boots, Black"
 	category = SLOT_SHOES
-	path = /obj/item/clothing/shoes/cowboyboots/black
-
-/datum/gear/threepwoodboots
-	name = "theepwood's boots"
-	category = SLOT_SHOES
-	path = /obj/item/clothing/shoes/threepwoodboots
+	path = /obj/item/clothing/shoes/cowboyboots/black 

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

@@ -259,8 +259,3 @@
 	name = "Bathrobe"
 	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/bathrobe
-
-/datum/gear/uniform/threepwoodjacket
-	name = "threepwood's jacket"
-	category = SLOT_WEAR_SUIT
-	path = /obj/item/clothing/suit/threepwoodjacket

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

@@ -541,10 +541,4 @@
 	name = "vault jumpsuit"
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/vaultsuit
-	cost = 1
-
-/datum/gear/threepwood
-	name = "threepwood's outfit"
-	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/threepwood
 	cost = 1

modular_citadel/code/modules/client/preferences_savefile.dm

@@ -2,9 +2,9 @@
 	//ipcs
 	S["feature_ipc_screen"] >> features["ipc_screen"]
 	S["feature_ipc_antenna"] >> features["ipc_antenna"]
+
 	features["ipc_screen"] 	= sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list)
 	features["ipc_antenna"] 	= sanitize_inlist(features["ipc_antenna"], GLOB.ipc_antennas_list)
-
 	//Citadel
 	features["flavor_text"]		= sanitize_text(features["flavor_text"], initial(features["flavor_text"]))
 	features["ooc_text"]		= sanitize_text(features["ooc_text"], initial(features["ooc_text"]))
@@ -35,7 +35,6 @@
 			LAZYADD(chosen_gear, path)
 			gear_points -= initial(path.cost)
 
-
 /datum/preferences/proc/cit_character_pref_save(savefile/S)
 	//ipcs
 	WRITE_FILE(S["feature_ipc_screen"], features["ipc_screen"])

modular_citadel/code/modules/integrated_electronics/subtypes/manipulation.dm

@@ -25,12 +25,12 @@
 	if(ismob(M) && M.canbearoused && arousal_gain != 0)
 		var/orgasm = FALSE
 		if(arousal_gain > 0)
-			if(M.can_orgasm())
+			if(M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
 				var/mob/living/carbon/human/H = M
 				var/orgasm_message = pick("A sharp pulse of electricity pushes you to orgasm!", "You feel a jolt of electricity force you into orgasm!")
 				H.visible_message("<span class='warning'>\The [assembly] electrodes shock [H]!</span>", "<span class='warning'>[orgasm_message]</span>")
 				playsound(src, "sound/effects/light_flicker.ogg", 30, 1)
-				H.mob_climax_instant()
+				H.mob_climax(forced_climax=TRUE)
 				orgasm = TRUE
 			else
 				M.adjustArousalLoss(arousal_gain)

modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm

@@ -2121,7 +2121,7 @@ datum/sprite_accessory/ears/human/gret
 
 /datum/sprite_accessory/antenna
 	icon = 'modular_citadel/icons/mob/ipc_antennas.dmi'
-	color_src = MUTCOLORS3
+	color_src = MUTCOLORS2
 	recommended_species = list("ipc")
 
 /datum/sprite_accessory/antenna/none

modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm

@@ -261,7 +261,7 @@
 	mutant_heart = /obj/item/organ/heart/ipc
 	mutantlungs = /obj/item/organ/lungs/ipc
 	mutantliver = /obj/item/organ/liver/ipc
-	mutantstomach = /obj/item/organ/stomach/synthliz
+	mutantstomach = /obj/item/organ/stomach/ipc
 	mutanteyes = /obj/item/organ/eyes/ipc
 
 	exotic_bloodtype = "SY"

modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm

@@ -6,8 +6,7 @@
 	icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
 	blacklisted = 0
 	sexes = 0
-	species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING,NOMOUTH)
-	inherent_traits = list(TRAIT_NOTHIRST)
+	species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING)
 	inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
 	mutant_bodyparts = list("ipc_screen", "ipc_antenna")
 	default_features = list("ipc_screen" = "Blank", "ipc_antenna" = "None")
@@ -17,9 +16,8 @@
 	mutant_heart = /obj/item/organ/heart/ipc
 	mutantlungs = /obj/item/organ/lungs/ipc
 	mutantliver = /obj/item/organ/liver/ipc
-	mutantstomach = /obj/item/organ/stomach/cell
+	mutantstomach = /obj/item/organ/stomach/ipc
 	mutanteyes = /obj/item/organ/eyes/ipc
-	mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord) // oracle port
 
 	exotic_bloodtype = "HF"
 

modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -10,9 +10,6 @@
 /mob/living/silicon/robot/modules/borgi
 	set_module = /obj/item/robot_module/borgi
 
-/mob/living/silicon/robot/modules/orepup
-	set_module = /obj/item/robot_module/orepup
-
 /mob/living/silicon/robot/proc/get_cit_modules()
 	var/list/modulelist = list()
 	modulelist["MediHound"] = /obj/item/robot_module/medihound
@@ -20,7 +17,6 @@
 		modulelist["Security K-9"] = /obj/item/robot_module/k9
 	modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup
 	modulelist["Borgi"] = /obj/item/robot_module/borgi
-	modulelist["Orepup"] = /obj/item/robot_module/orepup
 	return modulelist
 
 /obj/item/robot_module
@@ -265,13 +261,14 @@
 	cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
 	has_snowflake_deadsprite = TRUE
 
+/*
 /obj/item/robot_module/orepup
 	name = "Ore Pup"
 	basic_modules = list(
 		/obj/item/storage/bag/ore/cyborg,
 		/obj/item/analyzer/nose,
 		/obj/item/storage/bag/borgdelivery,
-		/obj/item/dogborg/sleeper/compactor/ore,
+		/obj/item/dogborg/sleeper/ore,
 		/obj/item/pickaxe/drill/cyborg,
 		/obj/item/shovel,
 		/obj/item/crowbar/cyborg,
@@ -285,33 +282,20 @@
 		/obj/item/clockwork/slab/cyborg/miner,
 		/obj/item/clockwork/weapon/ratvarian_spear,
 		/obj/item/borg/sight/xray/truesight_lens)
-	cyborg_base_icon = "blade"
-	moduleselect_icon = "miner"
-	sleeper_overlay = "bladesleeper"
+	cyborg_base_icon = "orepup"
+	moduleselect_icon = "orepup"
+	sleeper_overlay = "osleeper"
 	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 	has_snowflake_deadsprite = TRUE
 	cyborg_pixel_offset = -16
-
-/obj/item/robot_module/orepup/be_transformed_to(obj/item/robot_module/old_module)
+/obj/item/robot_module/miner/do_transform_animation()
 	var/mob/living/silicon/robot/R = loc
-	var/static/list/orepup_models
-	if(!orepup_models)
-		orepup_models = list(
-		"blade" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "blade"),
-		"vale" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "valemine")
-		)
-		orepup_models = sortList(orepup_models)
-	var/orepup_borg_icon = show_radial_menu(R, R , orepup_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
-	if(!orepup_borg_icon)
-		return
-	switch(orepup_borg_icon)
-		if("blade")
-			cyborg_base_icon = "blade"
-		if("vale")
-			cyborg_base_icon = "valemine"
-			sleeper_overlay = "valeminesleeper"
-			has_snowflake_deadsprite = TRUE
-	return ..()
+	R.cut_overlays()
+	R.setDir(SOUTH)
+	flick("orepup_transform", R)
+	do_transform_delay()
+	R.update_headlamp()
+*/
 
 /obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
@@ -369,7 +353,7 @@
 			cyborg_base_icon = "haydeemedical"
 			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
 			hat_offset = 3
-
+		
 		if("qualified_doctor")
 			cyborg_base_icon = "qualified_doctor"
 			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'

modular_citadel/code/modules/reagents/reagents/cit_reagents.dm

@@ -197,7 +197,7 @@
 
 /datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M)
 	if(M && M.canbearoused && !(M.client?.prefs.cit_toggles & NO_APHRO) && prob(33))
-		if(prob(5) && M.can_orgasm())
+		if(prob(5) && M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
 			if(prob(5)) //Less spam
 				to_chat(M, "<span class='love'>Your libido is going haywire!</span>")
 		if(M.min_arousal < 50)