From 89d8abada24dbdf1430a43a37f017ec3a9396d3b Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Fri, 29 Nov 2013 08:20:36 -0500 Subject: [PATCH] Cleaner way of getting round-start observers animals --- code/modules/mob/mob.dm | 7 +------ code/modules/mob/new_player/new_player.dm | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 9dcd90d13c3..867f2acb7f5 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -929,12 +929,7 @@ mob/verb/yank_out_object() set name = "Respawn as Mindless" set category = "OOC" - usr in respawnable_list - if(istype(usr, /mob/dead/observer) || usr in respawnable_list) - if(istype(usr, /mob/dead/observer)) - var/mob/dead/observer/O = usr - if(!O.started_as_observer) return - + if(usr in respawnable_list) var/list/creatures = list("Mouse") for(var/mob/living/simple_animal/S in living_mob_list) if(safe_animal(S.type)) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index c27899d296d..de86597e26a 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -134,7 +134,7 @@ observer.real_name = client.prefs.real_name observer.name = observer.real_name observer.key = key - + respawnable_list += observer del(src) return 1