Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks

End game tweaks

code/game/gamemodes/cult/cultify/turf.dm

@@ -23,6 +23,9 @@
 /turf/simulated/wall/cult/cultify()
 	return
 
+/turf/unsimulated/wall/cult/cultify()
+	return
+
 /turf/unsimulated/beach/cultify()
 	return
 

code/game/gamemodes/cult/hell_universe.dm

@@ -33,51 +33,46 @@ In short:
 
 
 /datum/universal_state/hell/OnTurfChange(var/turf/T)
-	var/turf/space/spess = T
-	if(istype(spess))
-		spess.overlays += "hell01"
+	var/turf/space/S = T
+	if(istype(S))
+		S.color = "#FF0000"
+	else
+		S.color = initial(S.color)
 
 // Apply changes when entering state
 /datum/universal_state/hell/OnEnter()
 	set background = 1
 	garbage_collector.garbage_collect = 0
+
 	escape_list = get_area_turfs(locate(/area/hallway/secondary/exit))
 
 	//Separated into separate procs for profiling
 	AreaSet()
-	OverlaySet()
 	MiscSet()
 	APCSet()
 	KillMobs()
-	AmbientSet()
+	OverlayAndAmbientSet()
 
 	runedec += 9000	//basically removing the rune cap
 
-/datum/universal_state/hell/proc/AreaSet()
-	for(var/area/A in world)
-		if(A.name=="Space")
-			continue
 
-		// Reset all alarms.
-		A.fire     = null
-		A.atmos    = 1
-		A.atmosalm = 0
-		A.poweralm = 1
-		A.party    = null
+/datum/universal_state/hell/proc/AreaSet()
+	for(var/area/A in all_areas)
+		if(!istype(A,/area) || istype(A, /area/space))
+			continue
 
 		A.updateicon()
 
-/datum/universal_state/hell/proc/OverlaySet()
-	var/image/I = image("icon" = 'icons/turf/space.dmi', "icon_state" = "hell01", "layer" = 10)
-	for(var/turf/space/spess in world)
-		spess.overlays += I
+/datum/universal_state/hell/OverlayAndAmbientSet()
+	spawn(0)
+		for(var/atom/movable/lighting_overlay/L in world)
+			L.update_lumcount(1, 0, 0)
 
-/datum/universal_state/hell/proc/AmbientSet()
-	for(var/atom/movable/lighting_overlay/L in world)
-		L.update_lumcount(1, 0, 0)
+		for(var/turf/space/T in turfs)
+			OnTurfChange(T)
 
 /datum/universal_state/hell/proc/MiscSet()
-	for(var/turf/simulated/floor/T in world)
+	for(var/turf/simulated/floor/T in turfs)
 		if(!T.holy && prob(1))
 			new /obj/effect/gateway/active/cult(T)
 
@@ -87,7 +82,7 @@ In short:
 
 /datum/universal_state/hell/proc/APCSet()
 	for (var/obj/machinery/power/apc/APC in machines)
-		if (!(APC.stat & BROKEN) && !istype(APC.area,/area/turret_protected/ai))
+		if (!(APC.stat & BROKEN) && !APC.is_critical)
 			APC.chargemode = 0
 			if(APC.cell)
 				APC.cell.charge = 0

code/game/gamemodes/cult/narsie.dm

@@ -0,0 +1,370 @@
+var/global/narsie_behaviour = "CultStation13"
+var/global/narsie_cometh = 0
+var/global/list/narsie_list = list()
+/obj/singularity/narsie //Moving narsie to its own file for the sake of being clearer
+	name = "Nar-Sie"
+	desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees."
+	icon = 'icons/obj/narsie.dmi'
+	icon_state = "narsie-small"
+	pixel_x = -236
+	pixel_y = -256
+
+	current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO.
+	contained = 0 // Are we going to move around?
+	dissipate = 0 // Do we lose energy over time?
+	grav_pull = 10 //How many tiles out do we pull?
+	consume_range = 3 //How many tiles out do we eat
+
+
+/obj/singularity/narsie/New()
+	..()
+	narsie_list.Add(src)
+
+/obj/singularity/narsie/Destroy()
+	narsie_list.Remove(src)
+	..()
+
+/obj/singularity/narsie/large
+	name = "Nar-Sie"
+	icon = 'icons/obj/narsie.dmi'
+	icon_state = "narsie"//mobs perceive the geometer of blood through their see_narsie proc
+
+	// Pixel stuff centers Narsie.
+	pixel_x = -236
+	pixel_y = -256
+	light_range = 1
+	light_color = "#3e0000"
+
+	current_size = 12
+	consume_range = 12 // How many tiles out do we eat.
+	var/announce=1
+	var/cause_hell = 1
+
+/obj/singularity/narsie/large/New()
+	..()
+	if(announce)
+		world << "<font size='15' color='red'><b>[uppertext(name)] HAS RISEN</b></font>"
+		world << sound('sound/effects/wind/wind_5_1.ogg')
+
+	narsie_spawn_animation()
+
+	if(!narsie_cometh)//so we don't initiate Hell more than one time.
+		if(cause_hell)
+			SetUniversalState(/datum/universal_state/hell)
+		narsie_cometh = 1
+
+		spawn(10 SECONDS)
+			if(emergency_shuttle)
+				emergency_shuttle.call_evac()
+				emergency_shuttle.launch_time = 0	// Cannot recall
+
+/obj/singularity/narsie/process()
+	eat()
+
+	if (!target || prob(5))
+		pickcultist()
+
+	move()
+
+	if (prob(25))
+		mezzer()
+
+/obj/singularity/narsie/large/eat()
+	set background = BACKGROUND_ENABLED
+
+	for (var/turf/A in orange(consume_range, src))
+		consume(A)
+
+/obj/singularity/narsie/mezzer()
+	for(var/mob/living/carbon/M in oviewers(8, src))
+		if(M.stat == CONSCIOUS)
+			if(M.status_flags & GODMODE)
+				continue
+			if(!iscultist(M))
+				M << "<span class='danger'> You feel your sanity crumble away in an instant as you gaze upon [src.name]...</span>"
+				M.apply_effect(3, STUN)
+
+
+/obj/singularity/narsie/large/Bump(atom/A)
+	if(!cause_hell) return
+	if(isturf(A))
+		narsiewall(A)
+	else if(istype(A, /obj/structure/cult))
+		qdel(A)
+
+/obj/singularity/narsie/large/Bumped(atom/A)
+	if(!cause_hell) return
+	if(isturf(A))
+		narsiewall(A)
+	else if(istype(A, /obj/structure/cult))
+		qdel(A)
+
+/obj/singularity/narsie/move(var/force_move = 0)
+	if(!move_self)
+		return 0
+
+	var/movement_dir = pick(alldirs - last_failed_movement)
+
+	if(force_move)
+		movement_dir = force_move
+
+	if(target && prob(60))
+		movement_dir = get_dir(src,target)
+
+	spawn(0)
+		step(src, movement_dir)
+	spawn(1)
+		step(src, movement_dir)
+	return 1
+
+/obj/singularity/narsie/large/move(var/force_move = 0)
+	if(!move_self)
+		return 0
+
+	var/movement_dir = pick(alldirs - last_failed_movement)
+
+	if(force_move)
+		movement_dir = force_move
+
+	if(target && prob(60))
+		movement_dir = get_dir(src,target)
+	spawn(0)
+		step(src, movement_dir)
+		narsiefloor(get_turf(loc))
+		for(var/mob/M in player_list)
+			if(M.client)
+				M.see_narsie(src,movement_dir)
+	spawn(10)
+		step(src, movement_dir)
+		narsiefloor(get_turf(loc))
+		for(var/mob/M in player_list)
+			if(M.client)
+				M.see_narsie(src,movement_dir)
+	return 1
+
+/obj/singularity/narsie/proc/narsiefloor(var/turf/T)//leaving "footprints"
+	if(!(istype(T, /turf/simulated/wall/cult)||istype(T, /turf/space)))
+		if(T.icon_state != "cult-narsie")
+			T.desc = "something that goes beyond your understanding went this way"
+			T.icon_state = "cult-narsie"
+			T.set_light(1)
+
+/obj/singularity/narsie/proc/narsiewall(var/turf/T)
+	T.desc = "An opening has been made on that wall, but who can say if what you seek truly lies on the other side?"
+	T.icon = 'icons/turf/walls.dmi'
+	T.icon_state = "cult-narsie"
+	T.opacity = 0
+	T.density = 0
+	set_light(1)
+
+/obj/singularity/narsie/large/consume(const/atom/A) //Has its own consume proc because it doesn't need energy and I don't want BoHs to explode it. --NEO
+//NEW BEHAVIOUR
+	if(narsie_behaviour == "CultStation13")
+	//MOB PROCESSING
+		new_narsie(A)
+
+//OLD BEHAVIOUR
+	else if(narsie_behaviour == "Nar-Singulo")
+		old_narsie(A)
+
+/obj/singularity/narsie/proc/new_narsie(const/atom/A)
+	if (istype(A, /mob/) && (get_dist(A, src) <= 7))
+		var/mob/M = A
+
+		if(M.status_flags & GODMODE)
+			return 0
+
+		M.cultify()
+
+//ITEM PROCESSING
+	else if (istype(A, /obj/))
+		var/obj/O = A
+		O.cultify()
+
+//TURF PROCESSING
+	else if (isturf(A))
+		var/dist = get_dist(A, src)
+
+		for (var/atom/movable/AM in A.contents)
+			if (dist <= consume_range)
+				consume(AM)
+				continue
+
+		if (dist <= consume_range && !istype(A, /turf/space))
+			var/turf/T = A
+			if(T.holy)
+				T.holy = 0 //Nar-Sie doesn't give a shit about sacred grounds.
+			T.cultify()
+
+/obj/singularity/narsie/proc/old_narsie(const/atom/A)
+	if(!(A.singuloCanEat()))
+		return 0
+
+	if (istype(A, /mob/living/))
+		var/mob/living/C2 = A
+
+		if(C2.status_flags & GODMODE)
+			return 0
+
+		C2.dust() // Changed from gib(), just for less lag.
+
+	else if (istype(A, /obj/))
+		qdel(A)
+
+		if (A)
+			qdel(A)
+	else if (isturf(A))
+		var/dist = get_dist(A, src)
+
+		for (var/atom/movable/AM2 in A.contents)
+			if (AM2 == src) // This is the snowflake.
+				continue
+
+			if (dist <= consume_range)
+				consume(AM2)
+				continue
+
+		if (dist <= consume_range && !istype(A, /turf/space))
+			var/turf/T2 = A
+			T2.ChangeTurf(/turf/space)
+
+/obj/singularity/narsie/consume(const/atom/A) //This one is for the small ones.
+	if(!(A.singuloCanEat()))
+		return 0
+
+	if (istype(A, /mob/living/))
+		var/mob/living/C2 = A
+
+		if(C2.status_flags & GODMODE)
+			return 0
+
+		C2.dust() // Changed from gib(), just for less lag.
+
+	else if (istype(A, /obj/))
+		qdel(A)
+
+		if (A)
+			qdel(A)
+	else if (isturf(A))
+		var/dist = get_dist(A, src)
+
+		for (var/atom/movable/AM2 in A.contents)
+			if (AM2 == src) // This is the snowflake.
+				continue
+
+			if (dist <= consume_range)
+				consume(AM2)
+				continue
+
+			if (dist > consume_range)
+				if(!(AM2.singuloCanEat()))
+					continue
+
+				if (101 == AM2.invisibility)
+					continue
+
+				spawn (0)
+					AM2.singularity_pull(src, src.current_size)
+
+		if (dist <= consume_range && !istype(A, /turf/space))
+			var/turf/T2 = A
+			T2.ChangeTurf(/turf/space)
+
+/obj/singularity/narsie/ex_act(severity) //No throwing bombs at it either. --NEO
+	return
+
+/obj/singularity/narsie/proc/pickcultist() //Narsie rewards his cultists with being devoured first, then picks a ghost to follow. --NEO
+	var/list/cultists = list()
+	for(var/datum/mind/cult_nh_mind in cult.current_antagonists)
+		if(!cult_nh_mind.current)
+			continue
+		if(cult_nh_mind.current.stat)
+			continue
+		var/turf/pos = get_turf(cult_nh_mind.current)
+		if(pos.z != src.z)
+			continue
+		cultists += cult_nh_mind.current
+	if(cultists.len)
+		acquire(pick(cultists))
+		return
+		//If there was living cultists, it picks one to follow.
+	for(var/mob/living/carbon/human/food in living_mob_list)
+		if(food.stat)
+			continue
+		var/turf/pos = get_turf(food)
+		if(pos.z != src.z)
+			continue
+		cultists += food
+	if(cultists.len)
+		acquire(pick(cultists))
+		return
+		//no living cultists, pick a living human instead.
+	for(var/mob/dead/observer/ghost in player_list)
+		if(!ghost.client)
+			continue
+		var/turf/pos = get_turf(ghost)
+		if(pos.z != src.z)
+			continue
+		cultists += ghost
+	if(cultists.len)
+		acquire(pick(cultists))
+		return
+		//no living humans, follow a ghost instead.
+
+/obj/singularity/narsie/proc/acquire(const/mob/food)
+	var/capname = uppertext(name)
+
+	target << "<span class='notice'><b>[capname] HAS LOST INTEREST IN YOU.</b></span>"
+	target = food
+
+	if (ishuman(target))
+		target << "<span class='danger'>[capname] HUNGERS FOR YOUR SOUL.</span>"
+	else
+		target << "<span class='danger'>[capname] HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL.</span>"
+
+/obj/singularity/narsie/on_capture()
+	chained = 1
+	move_self = 0
+	icon_state ="narsie-small-chains"
+
+/obj/singularity/narsie/on_release()
+	chained = 0
+	move_self = 1
+	icon_state ="narsie-small"
+
+/obj/singularity/narsie/large/on_capture()
+	chained = 1
+	move_self = 0
+	icon_state ="narsie-chains"
+	for(var/mob/M in mob_list)//removing the client image of nar-sie while it is chained
+		if(M.client)
+			M.see_narsie(src)
+
+/obj/singularity/narsie/large/on_release()
+	chained = 0
+	move_self = 1
+	icon_state ="narsie"
+
+/obj/singularity/narsie/cultify()
+	return
+
+/**
+ * Wizard narsie.
+ */
+/obj/singularity/narsie/wizard
+	grav_pull = 0
+
+/obj/singularity/narsie/wizard/eat()
+	set background = BACKGROUND_ENABLED
+
+	for (var/turf/T in trange(consume_range, src))
+		consume(T)
+
+/obj/singularity/narsie/proc/narsie_spawn_animation()
+	icon = 'icons/obj/narsie_spawn_anim.dmi'
+	dir = SOUTH
+	move_self = 0
+	flick("narsie_spawn_anim",src)
+	sleep(11)
+	move_self = 1
+	icon = initial(icon)

code/game/gamemodes/endgame/endgame.dm

@@ -60,6 +60,9 @@
 /datum/universal_state/proc/OnTurfChange(var/turf/NT)
  	return
 
+/datum/universal_state/proc/OverlayAndAmbientSet()
+	return
+
 /proc/SetUniversalState(var/newstate,var/on_exit=1, var/on_enter=1)
 	if(on_exit)
 		universe.OnExit()

code/game/gamemodes/endgame/supermatter_cascade/blob.dm

@@ -8,7 +8,7 @@
 
 	//luminosity = 5
 	//l_color="#0066FF"
-	layer = 11
+	layer = LIGHTING_LAYER+1
 
 	var/spawned=0 // DIR mask
 	var/next_check=0
@@ -50,10 +50,10 @@
 				if(A)
 					if(istype(A,/mob/living))
 						qdel(A)
-						continue
 					else if(istype(A,/mob)) // Observers, AI cameras.
 						continue
-					qdel(A)
+					else
+						qdel(A)
 			T.ChangeTurf(type)
 
 	if((spawned & (NORTH|SOUTH|EAST|WEST)) == (NORTH|SOUTH|EAST|WEST))

code/game/gamemodes/endgame/supermatter_cascade/portal.dm

@@ -8,9 +8,9 @@
 
 	move_self = 0
 	announce=0
-	narnar=0
+	cause_hell=0
 
-	layer=12 // ITS SO BRIGHT
+	layer=LIGHTING_LAYER+2 // ITS SO BRIGHT
 
 	consume_range = 6
 
@@ -35,7 +35,17 @@
 		return 0
 
 	if (istype(A, /mob/living/))
+		var/mob/living/L = A
+		if(L.buckled && istype(L.buckled,/obj/structure/bed/))
+			var/turf/O = L.buckled
+			do_teleport(O, pick(endgame_safespawns))
+			L.loc = O.loc
+		else
+			do_teleport(L, pick(endgame_safespawns)) //dead-on precision
+
+	else if (istype(A, /obj/mecha/))
 		do_teleport(A, pick(endgame_safespawns)) //dead-on precision
+
 	else if (isturf(A))
 		var/turf/T = A
 		var/dist = get_dist(T, src)
@@ -51,6 +61,9 @@
 				continue
 
 			if (dist > consume_range)
+				if(!(AM.singuloCanEat()))
+					continue
+
 				if (101 == AM.invisibility)
 					continue
 
@@ -63,19 +76,19 @@
 	var/image/riftimage = null
 
 /mob/proc/see_rift(var/obj/singularity/narsie/large/exit/R)
-	if((R.z == src.z) && (get_dist(R,src) <= (R.consume_range+10)) && !(R in view(src)))
+	var/turf/T_mob = get_turf(src)
+	if((R.z == T_mob.z) && (get_dist(R,T_mob) <= (R.consume_range+10)) && !(R in view(T_mob)))
 		if(!riftimage)
-			riftimage = image('icons/obj/rift.dmi',src.loc,"rift",12,1)
+			riftimage = image('icons/obj/rift.dmi',T_mob,"rift",LIGHTING_LAYER+2,1)
 			riftimage.mouse_opacity = 0
 
-		var/new_x = 32 * (R.x - src.x) + R.pixel_x
-		var/new_y = 32 * (R.y - src.y) + R.pixel_y
+		var/new_x = 32 * (R.x - T_mob.x) + R.pixel_x
+		var/new_y = 32 * (R.y - T_mob.y) + R.pixel_y
 		riftimage.pixel_x = new_x
 		riftimage.pixel_y = new_y
-		riftimage.loc = src.loc
+		riftimage.loc = T_mob
 
 		src << riftimage
-
 	else
 		if(riftimage)
 			qdel(riftimage)

code/game/gamemodes/endgame/supermatter_cascade/universe.dm

@@ -1,3 +1,5 @@
+var/global/universe_has_ended = 0
+
 
 /datum/universal_state/supermatter_cascade
  	name = "Supermatter Cascade"
@@ -11,9 +13,11 @@
 	return 0
 
 /datum/universal_state/supermatter_cascade/OnTurfChange(var/turf/T)
-	var/turf/space/spess = T
-	if(istype(spess))
-		spess.overlays += "end01"
+	var/turf/space/S = T
+	if(istype(S))
+		S.color = "#0066FF"
+	else
+		S.color = initial(S.color)
 
 /datum/universal_state/supermatter_cascade/DecayTurf(var/turf/T)
 	if(istype(T,/turf/simulated/wall))
@@ -46,13 +50,13 @@
 		emergency_shuttle.recall()
 
 	AreaSet()
-	OverlaySet()
 	MiscSet()
 	APCSet()
-	AmbientSet()
+	OverlayAndAmbientSet()
 
 	// Disable Nar-Sie.
 	cult.allow_narsie = 0
+
 	PlayerSet()
 
 	new /obj/singularity/narsie/large/exit(pick(endgame_exits))
@@ -64,64 +68,49 @@ There's been a galaxy-wide electromagnetic pulse.  All of our systems are heavil
 
 You have five minutes before the universe collapses. Good l\[\[###!!!-
 
-AUTOMATED ALERT: Link to [command_name()] lost."}
+AUTOMATED ALERT: Link to [command_name()] lost.
+
+The access requirements on the Asteroid Shuttles' consoles have now been revoked.
+"}
 		priority_announcement.Announce(txt,"SUPERMATTER CASCADE DETECTED")
+
+		for(var/obj/machinery/computer/shuttle_control/C in machines)
+			if(istype(C, /obj/machinery/computer/shuttle_control/research) || istype(C, /obj/machinery/computer/shuttle_control/mining))
+				C.req_access = list()
+				C.req_one_access = list()
+
 		sleep(5 MINUTES)
-		ticker.declare_completion()
 		ticker.station_explosion_cinematic(0,null) // TODO: Custom cinematic
 
-		world << "<B>Resetting in 30 seconds!</B>"
-
-		feedback_set_details("end_error","Universe ended")
-
-		if(blackbox)
-			blackbox.save_all_data_to_sql()
-
-		sleep(300)
-		log_game("Rebooting due to universal collapse")
-		world.Reboot()
+		universe_has_ended = 1
 		return
 
 /datum/universal_state/supermatter_cascade/proc/AreaSet()
-	for(var/area/A in world)
-		if(A.z in config.admin_levels)
+	for(var/area/A in all_areas)
+		if(!istype(A,/area) || istype(A, /area/space) || istype(A,/area/beach))
 			continue
-		if(istype(A,/area/space))
-			continue
-
-		// Reset all alarms.
-		A.fire     = null
-		A.atmos    = 1
-		A.atmosalm = 0
-		A.poweralm = 1
-
-		// Slap on random alerts
-		if(prob(25))
-			switch(rand(1,4))
-				if(1)
-					A.fire=1
-				if(2)
-					A.atmosalm=1
 
 		A.updateicon()
 
-/datum/universal_state/supermatter_cascade/proc/OverlaySet()
-	for(var/turf/space/spess in world)
-		spess.overlays += "end01"
+/datum/universal_state/supermatter_cascade/OverlayAndAmbientSet()
+	spawn(0)
+		for(var/atom/movable/lighting_overlay/L in world)
+			if(L.z in config.admin_levels)
+				L.update_lumcount(1,1,1)
+			else
+				L.update_lumcount(0.0, 0.4, 1)
 
-/datum/universal_state/supermatter_cascade/proc/AmbientSet()
-	for(var/atom/movable/lighting_overlay/L in world)
-		if(!(L.z in config.admin_levels))
-			L.update_lumcount(0.5, 1, 0)
+		for(var/turf/space/T in turfs)
+			OnTurfChange(T)
 
 /datum/universal_state/supermatter_cascade/proc/MiscSet()
-	for (var/obj/machinery/firealarm/alm in world)
+	for (var/obj/machinery/firealarm/alm in machines)
 		if (!(alm.stat & BROKEN))
 			alm.ex_act(2)
 
 /datum/universal_state/supermatter_cascade/proc/APCSet()
-	for (var/obj/machinery/power/apc/APC in world)
-		if (!(APC.stat & BROKEN))
+	for (var/obj/machinery/power/apc/APC in machines)
+		if (!(APC.stat & BROKEN) && !APC.is_critical)
 			APC.chargemode = 0
 			if(APC.cell)
 				APC.cell.charge = 0

code/game/gamemodes/gameticker.dm

@@ -312,7 +312,7 @@ var/global/datum/controller/gameticker/ticker
 			game_finished = (emergency_shuttle.returned() || mode.station_was_nuked)
 			mode_finished = (!post_game && mode.check_finished())
 		else
-			game_finished = (mode.check_finished() || (emergency_shuttle.returned() && emergency_shuttle.evac == 1))
+			game_finished = (mode.check_finished() || (emergency_shuttle.returned() && emergency_shuttle.evac == 1)) || universe_has_ended
 			mode_finished = game_finished
 
 		if(!mode.explosion_in_progress && game_finished && (mode_finished || post_game))

code/game/turfs/space/space.dm

@@ -16,6 +16,7 @@ var/list/accessible_z_levels = list("1" = 5, "3" = 10, "4" = 15, "5" = 10, "6" =
 	if(!istype(src, /turf/space/transit))
 		icon_state = "[((x + y) ^ ~(x * y) + z) % 25]"
 	update_starlight()
+	..()
 
 /turf/space/proc/update_starlight()
 	if(!config.starlight)

code/game/turfs/turf.dm

@@ -40,8 +40,13 @@
 		spawn( 0 )
 			src.Entered(AM)
 			return
+	turfs |= src
 	return
 
+/turf/Destroy()
+	turfs -= src
+	..()
+
 /turf/ex_act(severity)
 	return 0