Merge branch 'master' into upstream-merge-26760

code/modules/power/singularity/emitter.dm

@@ -97,11 +97,10 @@
 	sparks.set_up(5, TRUE, src)
 
 /obj/machinery/power/emitter/Destroy()
-	if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
-		var/turf/T = get_turf(src)
-		message_admins("Emitter deleted at [ADMIN_COORDJMP(T)]",0,1)
-		log_game("Emitter deleted at [COORD(T)]")
-		investigate_log("<font color='red'>deleted</font> at [get_area(src)] [COORD(T)]","singulo")
+	if(SSticker && SSticker.IsRoundInProgress())
+		message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+		log_game("Emitter deleted at ([x],[y],[z])")
+		investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")
 	QDEL_NULL(sparks)
 	return ..()
 

code/modules/power/singularity/generator.dm

@@ -32,7 +32,7 @@
 	if(energy > 0)
 		if(energy >= 200)
 			var/turf/T = get_turf(src)
-			feedback_add_details("engine_started","[src.type]")
+			SSblackbox.add_details("engine_started","[src.type]")
 			var/obj/singularity/S = new creation_type(T, 50)
 			transfer_fingerprints_to(S)
 			qdel(src)

code/modules/power/singularity/narsie.dm

@@ -14,6 +14,7 @@
 	light_power = 0.7
 	light_range = 15
 	light_color = rgb(255, 0, 0)
+	gender = FEMALE
 	var/clashing = FALSE //If Nar-Sie is fighting Ratvar
 
 /obj/singularity/narsie/large
@@ -26,8 +27,8 @@
 	grav_pull = 10
 	consume_range = 12 //How many tiles out do we eat
 
-/obj/singularity/narsie/large/New()
-	..()
+/obj/singularity/narsie/large/Initialize()
+	. = ..()
 	send_to_playing_players("<span class='narsie'>NAR-SIE HAS RISEN</span>")
 	send_to_playing_players(pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg'))
 

code/modules/power/singularity/singularity.dm

@@ -29,12 +29,12 @@
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	dangerous_possession = TRUE
 
-/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
+/obj/singularity/Initialize(mapload, starting_energy = 50)
 	//CARN: admin-alert for chuckle-fuckery.
 	admin_investigate_setup()
 
 	src.energy = starting_energy
-	..()
+	. = ..()
 	START_PROCESSING(SSobj, src)
 	GLOB.poi_list |= src
 	GLOB.singularities |= src