diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 31943d88576..547cb02b8b2 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -473,6 +473,7 @@ var/global/list/uneatable = list( /obj/machinery/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO + gender = NEUTER name = "Nar-sie's Avatar" desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees." icon = 'icons/obj/magic_terror.dmi' @@ -493,17 +494,29 @@ var/global/list/uneatable = list( pixel_x = -236 pixel_y = -256 current_size = 12 - move_self = 1 //Do we move on our own? grav_pull = 10 - consume_range = 12 //How many tiles out do we eat + consume_range = 12 + /obj/machinery/singularity/narsie/large/New() ..() world << "NAR-SIE HAS RISEN" + spawn_animation() if(emergency_shuttle && emergency_shuttle.can_call()) emergency_shuttle.call_evac() emergency_shuttle.launch_time = 0 // Cannot recall + +/obj/machinery/singularity/narsie/proc/spawn_animation() + icon = 'icons/obj/narsie_spawn_anim.dmi' + src.dir = SOUTH + move_self = 0 + flick("narsie_spawn_anim", src) + sleep(11) //0.5 longer than the animation. + move_self = 1 + icon = initial(icon) + + /obj/machinery/singularity/narsie/process() eat() if(!target || prob(5)) @@ -567,7 +580,7 @@ var/global/list/uneatable = list( /obj/machinery/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO return -/obj/machinery/singularity/narsie/proc/pickcultist() //Narsie rewards his cultists with being devoured first, then picks a ghost to follow. --NEO +/obj/machinery/singularity/narsie/proc/pickcultist() //Narsie rewards it's cultists with being devoured first, then picks a ghost to follow. --NEO var/list/cultists = list() for(var/datum/mind/cult_nh_mind in ticker.mode.cult) if(!cult_nh_mind.current) @@ -611,7 +624,7 @@ var/global/list/uneatable = list( if(ishuman(target)) target << "\red NAR-SIE HUNGERS FOR YOUR SOUL" else - target << "\red NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL" + target << "\red NAR-SIE HAS CHOSEN YOU TO LEAD THEM TO THEIR NEXT MEAL" //Wizard narsie diff --git a/icons/obj/narsie_spawn_anim.dmi b/icons/obj/narsie_spawn_anim.dmi new file mode 100644 index 00000000000..8e10cf9dd26 Binary files /dev/null and b/icons/obj/narsie_spawn_anim.dmi differ