From 8a346f7a59d4f4f6f97ce2a3b0b14b3ce2fff1ba Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Sun, 22 Apr 2012 02:54:18 +0100 Subject: [PATCH] Merge fixes. --- code/modules/mob/new_player/new_player.dm | 2 -- code/modules/power/singularity/singularity.dm | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index cbbb5505e8d..f4ddf4d83bb 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -214,8 +214,6 @@ observer.real_name = observer.name observer.original_name = observer.name //Original name is only used in ghost chat! It is not to be edited by anything! - preferences.copy_to_observer(observer) - del(src) return 1 diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index c657ec114c0..01f9160cec1 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -527,3 +527,19 @@ var/global/list/uneatable = list( target << "\red NAR-SIE HUNGERS FOR YOUR SOUL" else target << "\red NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL" + + + +/obj/machinery/singularity/narsie/wizard + grav_pull = 0 + eat() + set background = 1 + if(defer_powernet_rebuild != 2) + defer_powernet_rebuild = 1 + for(var/atom/movable/X in orange(consume_range,src)) + consume(X) + for(var/turf/X in orange(consume_range,src)) + consume(X) + if(defer_powernet_rebuild != 2) + defer_powernet_rebuild = 0 + return \ No newline at end of file