Revert "Merge branch 'master' into fairylights"

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

code/modules/surgery/organs/stomach.dm

@@ -120,27 +120,6 @@
 		return
 	owner.vomit(stun = FALSE)
 
-
-/obj/item/organ/stomach/synthliz
-	name = "synthliz stomach"
+/obj/item/organ/stomach/ipc
+	name = "ipc stomach"
 	icon_state = "stomach-ipc"
-
-// ipc power cell from oracle
-/obj/item/organ/stomach/cell
-	name = "micro-cell"
-	icon_state = "microcell"
-	w_class = WEIGHT_CLASS_NORMAL
-	zone = BODY_ZONE_CHEST
-	slot = ORGAN_SLOT_STOMACH
-	status = ORGAN_ROBOTIC
-	attack_verb = list("assault and battery'd")
-	desc = "A micro-cell, for IPC use only. Do not swallow."
-
-/obj/item/organ/stomach/cell/emp_act(severity)
-	switch(severity)
-		if(1)
-			owner.nutrition = 50
-			to_chat(owner, "<span class='warning'>Alert: Heavy EMP Detected. Rebooting power cell to prevent damage.</span>")
-		if(2)
-			owner.nutrition = 250
-			to_chat(owner, "<span class='warning'>Alert: EMP Detected. Cycling battery.</span>")

code/modules/surgery/organs/vocal_cords.dm

@@ -581,7 +581,7 @@
 		for(var/V in listeners)
 			var/mob/living/carbon/human/H = V
 			if(H.canbearoused && H.has_dna() && HAS_TRAIT(H, TRAIT_NYMPHO)) // probably a redundant check but for good measure
-				H.mob_climax_instant()
+				H.mob_climax(forced_climax=TRUE)
 	*/
 	else if((findtext(message, family_friendly_words)))
 		cooldown = COOLDOWN_MEME
@@ -1123,7 +1123,7 @@
 			if(E.phase > 1)
 				if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && E.lewd) // probably a redundant check but for good measure
 					addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "<span class='love'>Your [E.enthrallGender] pushes you over the limit, overwhelming your body with pleasure.</b></span>"), 5)
-					H.mob_climax_instant()
+					H.mob_climax(forced_climax=TRUE)
 					H.SetStun(20)
 					H.setArousalLoss(H.min_arousal)
 					E.resistanceTally = 0 //makes resistance 0, but resets arousal, resistance buildup is faster unaroused (massively so).