From 71ae83df92596b46f96c3477a5e94e4d4ea55c63 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Mon, 11 Sep 2023 03:43:09 +0200
Subject: [PATCH] [MIRROR] Update clothing appearance following species change
 [MDB IGNORE] (#23619)

* Update clothing appearance following species change (#78185)

## About The Pull Request

Fixes #78179
Monkey clothes didn't fit following black charged slime transformation
(I hate xenobiology)
Moved the proc call which updated the clothing appearance from turning
into or returning from being a monkey into generic `on_species_gain` on
the basis that this would effect any species with weird clothing offsets
(such as transforming into a golem from the same source) and we don't
want a bunch of specific checks against it.

Also I just tidied up that proc a little bit.

## Changelog

:cl:
fix: Your clothes and such should correctly reposition themselves if a
black charged slime extract turns you into a monkey.
/:cl:

* Update clothing appearance following species change

---------

Co-authored-by: Jacquerel <hnevard@gmail.com>
---
 .../changeling/powers/lesserform.dm           |  1 -
 .../mob/living/carbon/human/_species.dm       |  1 +
 code/modules/mob/transform_procs.dm           |  2 --
 .../xenobiology/crossbreeding/charged.dm      | 20 ++++++++++---------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/modules/antagonists/changeling/powers/lesserform.dm b/code/modules/antagonists/changeling/powers/lesserform.dm
index 854234af965..87bd7c7c8b6 100644
--- a/code/modules/antagonists/changeling/powers/lesserform.dm
+++ b/code/modules/antagonists/changeling/powers/lesserform.dm
@@ -40,7 +40,6 @@
 	user.humanize(species = chosen_species, instant = transform_instantly)
 
 	changeling.transform(user, chosen_form)
-	user.regenerate_icons()
 	return TRUE
 
 /// Returns the form to transform back into, automatically selects your only profile if you only have one
diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
index eb4bb54ea80..9e333c62e88 100644
--- a/code/modules/mob/living/carbon/human/_species.dm
+++ b/code/modules/mob/living/carbon/human/_species.dm
@@ -511,6 +511,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
 		C.grant_language(language, SPOKEN_LANGUAGE, LANGUAGE_SPECIES)
 	for(var/language in gaining_holder.blocked_languages)
 		C.add_blocked_language(language, LANGUAGE_SPECIES)
+	C.regenerate_icons()
 
 	SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
 
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index cefd88c72ef..09ce3b3c65c 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -36,7 +36,6 @@
 	set_name()
 	SEND_SIGNAL(src, COMSIG_HUMAN_MONKEYIZE)
 	uncuff()
-	regenerate_icons()
 	return src
 
 //////////////////////////           Humanize               //////////////////////////////
@@ -71,7 +70,6 @@
 	invisibility = 0
 	set_species(species)
 	SEND_SIGNAL(src, COMSIG_MONKEY_HUMANIZE)
-	regenerate_icons()
 	return src
 
 /mob/proc/AIize(client/preference_source, move = TRUE)
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index cb7070c83a4..8941057453b 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -235,21 +235,23 @@ Charged extracts:
 	effect_desc = "Randomizes the user's species."
 
 /obj/item/slimecross/charged/black/do_effect(mob/user)
-	var/mob/living/carbon/human/H = user
-	if(!istype(H))
-		to_chat(user, span_warning("You have to be able to have a species to get your species changed."))
+	var/mob/living/carbon/human/experiment_subject = user
+	if(!istype(experiment_subject))
+		balloon_alert(experiment_subject, "incompatible biology!")
 		return
 	var/list/allowed_species = list()
 	for(var/stype in subtypesof(/datum/species))
-		var/datum/species/X = stype
-		if(initial(X.changesource_flags) & SLIME_EXTRACT)
+		var/datum/species/try_species = stype
+		if(initial(try_species.changesource_flags) & SLIME_EXTRACT)
 			allowed_species += stype
 
 	var/datum/species/changed = pick(allowed_species)
-	if(changed)
-		H.set_species(changed, icon_update = 1)
-		to_chat(H, span_danger("You feel very different!"))
-	..()
+	if(isnull(changed))
+		visible_message(span_notice("[src] fizzes uselessly."))
+		return
+	experiment_subject.set_species(changed, icon_update = TRUE)
+	to_chat(experiment_subject, span_danger("You feel very different!"))
+	return ..()
 
 /obj/item/slimecross/charged/lightpink
 	colour = SLIME_TYPE_LIGHT_PINK