From 29e9de91e5548fafa40717ccf7062c8e33e2ef87 Mon Sep 17 00:00:00 2001 From: Will <7099514+Willburd@users.noreply.github.com> Date: Thu, 18 Dec 2025 21:45:52 -0500 Subject: [PATCH] fix a var name issue, and nosleeve trait showing sleeves (#18907) --- code/modules/admin/verbs/randomverbs.dm | 10 +++++----- .../modules/client/preference_setup/general/11_misc.dm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 4a4e9b174b..8a9e27c27b 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -525,18 +525,18 @@ ADMIN_VERB(respawn_character, (R_ADMIN|R_REJUVINATE), "Spawn Character", "(Re)Sp return // Respect admin spawn record choice. There's really not a nice way to do this without butchering copy_to() code for an admin proc - var/old_mind_scan = picked_client.prefs.resleeve_scan - var/old_body_scan = picked_client.prefs.mind_scan + var/old_mind_scan = picked_client.prefs.mind_scan + var/old_body_scan = picked_client.prefs.resleeve_scan if(!records) // Make em false for the copy_to() - picked_client.prefs.resleeve_scan = FALSE picked_client.prefs.mind_scan = FALSE + picked_client.prefs.resleeve_scan = FALSE //Write the appearance and whatnot out to the character picked_client.prefs.copy_to(new_character) // Restore pref state - picked_client.prefs.resleeve_scan = old_mind_scan - picked_client.prefs.mind_scan = old_body_scan + picked_client.prefs.mind_scan = old_mind_scan + picked_client.prefs.resleeve_scan = old_body_scan //Write the appearance and whatnot out to the character if(new_character.dna) diff --git a/code/modules/client/preference_setup/general/11_misc.dm b/code/modules/client/preference_setup/general/11_misc.dm index 7cd3ab0b2c..f960b49914 100644 --- a/code/modules/client/preference_setup/general/11_misc.dm +++ b/code/modules/client/preference_setup/general/11_misc.dm @@ -99,7 +99,7 @@ if(QDELETED(character) || QDELETED(pref)) return // They might have been deleted during the wait if(!character.virtual_reality_mob && !(/mob/living/carbon/human/proc/perform_exit_vr in character.verbs)) //Janky fix to prevent resleeving VR avatars but beats refactoring transcore - if(want_body_save) + if(want_body_save && !(character.species.flags & NO_SLEEVE)) // Nosleeve flag overrides character pref editor. Otherwise resleevable species still get one even if they took a trait to not be sleevable. var/datum/transhuman/body_record/BR = new() BR.init_from_mob(character, TRUE, pref.resleeve_lock) if(want_mind_save)