diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index c6a5843b32..bb61f2218d 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -346,7 +346,11 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
icon_state = "runed_sense2"
desc = "You can no longer sense your target's presence."
return
- desc = "You are currently tracking [blood_target] in [get_area_name(blood_target)]."
+ if(isliving(blood_target))
+ var/mob/living/real_target = blood_target
+ desc = "You are currently tracking [real_target.real_name] in [get_area_name(blood_target)]."
+ else
+ desc = "You are currently tracking [blood_target] in [get_area_name(blood_target)]."
var/target_angle = Get_Angle(Q, P)
var/target_dist = get_dist(P, Q)
cut_overlays()
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 71aea41e51..f50b7c0ccf 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -313,8 +313,8 @@
desc = "A long, thin construct built to herald Nar-Sie's rise. It'll be all over soon."
icon_state = "chosen"
icon_living = "chosen"
- maxHealth = 60
- health = 60
+ maxHealth = 40
+ health = 40
sight = SEE_MOBS
melee_damage_lower = 15
melee_damage_upper = 20
@@ -436,7 +436,8 @@
else
if(LAZYLEN(GLOB.cult_narsie.souls_needed))
the_construct.master = pick(GLOB.cult_narsie.souls_needed)
- to_chat(the_construct, "You are now tracking your prey, [the_construct.master] - harvest them!")
+ var/mob/living/real_target = the_construct.master //We can typecast this way because Narsie only allows /mob/living into the souls list
+ to_chat(the_construct, "You are now tracking your prey, [real_target.real_name] - harvest them!")
else
to_chat(the_construct, "Nar'Sie has completed her harvest!")
return
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 2293fb2fb2..f6b785b3e1 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -63,21 +63,21 @@
var/mob/living/L = cult_mind.current
L.narsie_act()
for(var/mob/living/player in GLOB.player_list)
- if(player.stat != DEAD && is_station_level(player.loc.z) && !iscultist(player))
+ if(player.stat != DEAD && player.loc && is_station_level(player.loc.z) && !iscultist(player) && !isanimal(player))
souls_needed[player] = TRUE
- soul_goal = round(1 + LAZYLEN(souls_needed) * 0.6)
+ soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75)
INVOKE_ASYNC(src, .proc/begin_the_end)
/obj/singularity/narsie/large/cult/proc/begin_the_end()
sleep(50)
priority_announce("An acausal dimensional event has been detected in your sector. Event has been flagged EXTINCTION-CLASS. Directing all available assets toward simulating solutions. SOLUTION ETA: 60 SECONDS.","Central Command Higher Dimensional Affairs", 'sound/misc/airraid.ogg')
- sleep(550)
- priority_announce("Simulations on acausal dimensional event complete. Deploying solution package now. Deployment ETA: TWO MINUTES. ","Central Command Higher Dimensional Affairs")
+ sleep(500)
+ priority_announce("Simulations on acausal dimensional event complete. Deploying solution package now. Deployment ETA: ONE MINUTE. ","Central Command Higher Dimensional Affairs")
sleep(50)
set_security_level("delta")
SSshuttle.registerHostileEnvironment(src)
SSshuttle.lockdown = TRUE
- sleep(850)
+ sleep(600)
if(resolved == FALSE)
resolved = TRUE
sound_to_playing_players('sound/machines/alarm.ogg')