From bf7cd7709606d4a02540d8aabd7f642163a4791d Mon Sep 17 00:00:00 2001 From: keronshb Date: Wed, 13 Oct 2021 23:25:01 -0400 Subject: [PATCH] Fixes a few things --- code/modules/mob/dead/new_player/new_player.dm | 3 +-- code/modules/mob/inventory.dm | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index c53f45a336..af8c3eda2c 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -762,9 +762,8 @@ client.prefs.scars_list["[cur_scar_index]"] = valid_scars client.prefs.save_character() - var/is_antag if(mind in GLOB.pre_setup_antags) - is_antag = TRUE + var/is_antag = TRUE client.prefs.copy_to(H, initial_spawn = TRUE) H.dna.update_dna_identity() diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 3eaefebc56..67a95006ab 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -414,10 +414,6 @@ drop_all_held_items() /obj/item/proc/equip_to_best_slot(mob/M) - if(src != M.get_active_held_item()) - to_chat(M, "You are not holding anything to equip!") - return FALSE - if(M.equip_to_appropriate_slot(src, TRUE)) M.update_inv_hands() return TRUE