Fixes outdated away code.

This commit is contained in:
AnturK
2017-10-06 14:10:08 +02:00
committed by CitadelStationBot
parent 446c075fa1
commit 848968834a
@@ -136,20 +136,20 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
/*
* Modified Nar-Sie
*/
/obj/singularity/narsie/sc_Narsie
/obj/singularity/narsie/mini
desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
move_self = 0 //Contianed narsie does not move!
grav_pull = 0 //Contained narsie does not pull stuff in!
var/uneatable = list(/turf/open/space, /obj/effect/overlay, /mob/living/simple_animal/hostile/construct)
//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
/obj/singularity/narsie/mini/admin_investigate_setup()
return
/obj/singularity/narsie/sc_Narsie/process()
/obj/singularity/narsie/mini/process()
eat()
if(prob(25))
mezzer()
<<<<<<< HEAD
/obj/singularity/narsie/sc_Narsie/consume(atom/A)
if(is_type_in_list(A, uneatable))
return 0
@@ -172,4 +172,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
return
/obj/singularity/narsie/sc_Narsie/ex_act()
=======
/obj/singularity/narsie/mini/ex_act()
>>>>>>> ae7720b... Fixes outdated away code. (#31314)
return