From b1852a8c1f78e2824b4c27d9512b28b8576f7521 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 6 Dec 2017 13:25:39 -0500 Subject: [PATCH] Update login.dm --- code/modules/mob/login.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index ddedf1a1ee..1442ce332c 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -33,16 +33,14 @@ sync_mind() -<<<<<<< HEAD client.sethotkeys() //set mob specific hotkeys -======= + //Reload alternate appearances for(var/v in GLOB.active_alternate_appearances) if(!v) continue var/datum/atom_hud/alternate_appearance/AA = v AA.onNewMob(src) ->>>>>>> 550d711... Brain Traumas (#31727) update_client_colour() if(client)