Revert "Merge branch 'master' into fairylights"

This reverts commit 2947727659, reversing changes made to 91063fe882.
2026-07-16 10:12:23 +01:00 · 2022-07-09 04:55:33 -06:00
parent eb22b66720
commit e51460cb5d
123 changed files with 2065 additions and 3633 deletions
@@ -43,14 +43,7 @@
 			S.cd = "/"
 			var/slot
 			S["default_slot"] >> slot
-			var/differing_version_notification = 0
 			if(slot)
 				S.cd = "/character[slot]"
-				var/slot_version = 0
-				S["version"] >> slot_version
-				if(slot_version && slot_version < SAVEFILE_VERSION_MAX)
-					S.cd = "/"
-					S["new_differences_notification"] >> differing_version_notification
-					if(!differing_version_notification || differing_version_notification <= slot_version)
-						S["new_differences_notification"] << slot_version
-						to_chat(src, "<span class='danger'><B>There were recent changes with characters, and your savefiles are outdated. Your characters may not look the same depending on what changed.</B></span>")
+				if(S["version"] < SAVEFILE_VERSION_MAX)
+					to_chat(src, "<span class='redtext'>Your characters are outdated from recent updates. Please make sure if everything is within reasonable levels.</span>")
@@ -487,9 +487,6 @@
 	if(HAS_TRAIT(src, TRAIT_NOHUNGER))
 		return 1

-	if(!has_mouth())
-		return 1
-
 	if(nutrition < 100 && !blood)
 		if(message)
 			visible_message("<span class='warning'>[src] dry heaves!</span>", \
@@ -5,24 +5,30 @@
 	icon_state = "caucasian_m"
 	appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE

-
 /mob/living/carbon/human/Initialize()
 	add_verb(src, /mob/living/proc/mob_sleep)
 	add_verb(src, /mob/living/proc/lay_down)
 	time_initialized = world.time
+
 	//initialize limbs first
 	create_bodyparts()
+
 	//initialize dna. for spawned humans; overwritten by other code
 	create_dna(src)
 	randomize_human(src)
 	dna.initialize_dna()
+
 	if(dna.species)
 		set_species(dna.species.type)
+
 	//initialise organs
 	create_internal_organs() //most of it is done in set_species now, this is only for parent call
 	physiology = new()
+
 	AddComponent(/datum/component/personal_crafting)
+
 	. = ..()
+
 	RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, /mob/living/carbon/human/clean_blood)


@@ -318,24 +318,15 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		var/mob/living/carbon/human/H = C
 		if(NOGENITALS in H.dna.species.species_traits)
 			H.give_genitals(TRUE) //call the clean up proc to delete anything on the mob then return.
+
 // EDIT ENDS

-	if(NOMOUTH in species_traits)
-		for(var/obj/item/bodypart/head/head in C.bodyparts)
-			head.mouth = FALSE
-
-
 /datum/species/proc/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load)
 	if(C.dna.species.exotic_bloodtype)
 		if(!new_species.exotic_bloodtype)
 			C.dna.blood_type = random_blood_type()
 		else
 			C.dna.blood_type = new_species.exotic_bloodtype
-
-	if(NOMOUTH in species_traits)
-		for(var/obj/item/bodypart/head/head in C.bodyparts)
-			head.mouth = TRUE
-
 	if(DIGITIGRADE in species_traits)
 		C.Digitigrade_Leg_Swap(TRUE)
 	for(var/X in inherent_traits)
@@ -511,7 +502,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/list/standing = list()

 	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
-	H.handle_cosmetic_parts()

 	if(HD && !(HAS_TRAIT(H, TRAIT_HUSK)))
 		// lipstick
@@ -604,7 +594,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	//CITADEL EDIT - Do not forget to add this to relevent_layers list just above too!
 	H.remove_overlay(BODY_TAUR_LAYER)
 	//END EDIT
-	H.handle_cosmetic_parts()

 	if(!mutant_bodyparts)
 		return
@@ -689,17 +678,21 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	if("mam_tail" in mutant_bodyparts)
 		if(H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR) || (!H.dna.features["taur"] == "None"))
 			bodyparts_to_add -= "mam_tail"
+
 	if("mam_waggingtail" in mutant_bodyparts)
 		if(H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR) || (!H.dna.features["taur"] == "None"))
 			bodyparts_to_add -= "mam_waggingtail"
 		else if ("mam_tail" in mutant_bodyparts)
 			bodyparts_to_add -= "mam_waggingtail"
+
 	if("mam_ears" in mutant_bodyparts)
 		if(!H.dna.features["mam_ears"] || H.dna.features["mam_ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC)
 			bodyparts_to_add -= "mam_ears"
+
 	if("mam_snouts" in mutant_bodyparts) //Take a closer look at that snout!
 		if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC)
 			bodyparts_to_add -= "mam_snouts"
+
 	if("taur" in mutant_bodyparts)
 		if(!H.dna.features["taur"] || H.dna.features["taur"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)))
 			bodyparts_to_add -= "taur"
@@ -1654,8 +1647,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		)
 		if (target.canbearoused)
 			target.adjustArousalLoss(5)
-		if (HAS_TRAIT(target, TRAIT_MASO))
-			target.mob_climax_instant()
+		if (target.getArousalLoss() >= 100 && ishuman(target) && HAS_TRAIT(target, TRAIT_MASO) && target.has_dna())
+			target.mob_climax(forced_climax=TRUE)
 		if (!HAS_TRAIT(target, TRAIT_NYMPHO))
 			stop_wagging_tail(target)

@@ -2012,7 +2005,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					H.update_damage_overlays()
 					if(HAS_TRAIT(H, TRAIT_MASO))
 						H.adjustArousalLoss(damage * brutemod * H.physiology.brute_mod)
-						H.mob_climax_instant()
+						if (H.getArousalLoss() >= 100 && ishuman(H) && H.has_dna())
+							H.mob_climax(forced_climax=TRUE)

 			else//no bodypart, we deal damage with a more general method.
 				H.adjustBruteLoss(damage * hit_percent * brutemod * H.physiology.brute_mod)
@@ -690,8 +690,6 @@ generate/load female uniform sprites matching all previously decided variables
 				. += "-[BP.digitigrade_type]"
 		if(BP.dmg_overlay_type)
 			. += "-[BP.dmg_overlay_type]"
-		if(BP.cosmetic_icon)
-			. += "-cosm[BP.cosmetic_icon]"
 		if(BP.body_markings)
 			. += "-[BP.body_markings]"
 		else
@@ -77,7 +77,8 @@
 			var/mob/living/carbon/human/B = src
 			if(HAS_TRAIT(B, TRAIT_CHOKE_SLUT))
 				B.adjustArousalLoss(7)
-				B.mob_climax_instant()
+				if (B.getArousalLoss() >= 100 && ishuman(B) && B.has_dna())
+					B.mob_climax(forced_climax=TRUE)
 			else
 				SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
 		else
@@ -200,10 +200,6 @@
 	INVOKE_ASYNC(RM, .proc/do_transform_animation)
 	SEND_SIGNAL(R, COMSIG_CYBORG_MODULE_CHANGE)	//hyperstation edit
 	qdel(src)
-	//Skyrat change start
-	R.radio.extra_channels = RM.added_channels
-	R.radio.recalculateChannels()
-	//Skyrat change stop
 	return RM

 /obj/item/robot_module/proc/be_transformed_to(obj/item/robot_module/old_module)
@@ -57,9 +57,7 @@
 				var/datum/callback/CB = foo
 				CB.Invoke()

-		if(client.prefs)
-			mind?.hide_ckey = client.prefs.hide_ckey
-			client.fps = client.prefs.clientfps
+	mind?.hide_ckey = client?.prefs?.hide_ckey
 	log_message("Client [key_name(src)] has taken ownership of mob [src]([src.type])", LOG_OWNERSHIP)
 	SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client)
 	client.init_verbs()