[MIRROR] mob/Login only has one override

code/_onclick/hud/skybox.dm

@@ -55,6 +55,16 @@
 	sleep(1)
 	update_skybox(rebuild)
 
+<<<<<<< ours
+=======
+	var/turf/T = get_turf(eye)
+	if(T)
+		if(rebuild)
+			skybox.ClearOverlays()
+			skybox.AddOverlays(SSskybox.get_skybox(T.z))
+			screen |= skybox
+		skybox.screen_loc = "CENTER:[-224 - T.x],CENTER:[-224 - T.y]"
+>>>>>>> theirs
 
 /mob/Move()
 	var/old_z = get_z(src)

code/modules/mob/login.dm

@@ -123,6 +123,7 @@
 		if(client.get_preference_value(/datum/client_preference/goonchat) == GLOB.PREF_YES)
 			client.chatOutput.start()
 
+<<<<<<< ours
 	GLOB.logged_in_event.raise_event(src)
 
 	if(mind)
@@ -137,20 +138,36 @@
 
 	if(ability_master && ability_master.ability_objects)
 		ability_master.update_abilities(TRUE, src)
+=======
+	if(ability_master)
+		ability_master.update_abilities(1, src)
+>>>>>>> theirs
 		ability_master.toggle_open(1)
 
 	//set macro to normal incase it was overriden (like cyborg currently does)
 	// [SIERRA-REMOVE] - SSINPUT
 	// winset(src, null, "mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5")
 	// [/SIERRA-REMOVE]
 
+	if(mind)
+		if(!mind.learned_spells)
+			mind.learned_spells = list()
+		if(ability_master && ability_master.spell_objects)
+			for(var/obj/screen/ability/spell/screen in ability_master.spell_objects)
+				var/spell/S = screen.spell
+				mind.learned_spells |= S
+
+	client.update_skybox(1)
+	GLOB.logged_in_event.raise_event(src)
+
+
 /mob/living/carbon/Login()
-	. = ..()
+	..()
 	if(internals && internal)
 		internals.icon_state = "internal1"
 
 /mob/observer/ghost/Login()
-	. = ..()
+	..()
 	if(darksight)
 		darksight.icon_state = "ghost"
 		darksight.alpha = 0