cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix a var name issue, and nosleeve trait showing sleeves (#18907)

Browse Source
This commit is contained in:
Will
2025-12-18 21:45:52 -05:00
committed by GitHub
parent 0df89d2bec
commit 29e9de91e5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+5 -5
View File
@@ -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)
code/modules/client/preference_setup/general/11_misc.dm
+1 -1
View File
@@ -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)