[MIRROR] Fix server hop (#740)

* Fix server hop

* Delete new_player.dm.rej
This commit is contained in:
CitadelStationBot
2017-05-08 18:47:21 -05:00
committed by kevinz000
parent 4895d84fb9
commit c782e15d64
3 changed files with 13 additions and 8 deletions
+8 -1
View File
@@ -3,9 +3,16 @@
INITIALIZE_IMMEDIATE(/mob/dead)
/mob/dead/Initialize()
. = ..()
if(initialized)
stack_trace("Warning: [src]([type]) initialized multiple times!")
tag = "mob_[next_mob_id++]"
GLOB.mob_list += src
prepare_huds()
if(config.cross_allowed)
verbs += /mob/dead/proc/server_hop
return INITIALIZE_HINT_NORMAL
/mob/dead/dust() //ghosts can't be vaporised.
return
@@ -16,12 +16,6 @@
var/mob/living/new_character //for instant transfer once the round is set up
/mob/dead/new_player/Initialize()
if(initialized)
stack_trace("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
tag = "mob_[next_mob_id++]"
GLOB.mob_list += src
if(client && SSticker.state == GAME_STATE_STARTUP)
var/obj/screen/splash/S = new(client, TRUE, TRUE)
S.Fade(TRUE)
@@ -30,7 +24,10 @@
loc = pick(GLOB.newplayer_start)
else
loc = locate(1,1,1)
return INITIALIZE_HINT_NORMAL
. = ..()
/mob/dead/new_player/prepare_huds()
return
/mob/dead/new_player/proc/new_player_panel()
@@ -118,6 +118,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
animate(src, pixel_y = 2, time = 10, loop = -1)
grant_all_languages()
GLOB.dead_mob_list += src
..()
/mob/dead/observer/narsie_act()