Merge branch 'master' into upstream-merge-31397

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -136,40 +136,18 @@ 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()
 
-/obj/singularity/narsie/sc_Narsie/consume(atom/A)
-	if(is_type_in_list(A, uneatable))
-		return 0
-	if(isliving(A))
-		var/mob/living/L = A
-		L.gib()
-	else if(istype(A, /obj/))
-		var/obj/O = A
-		O.ex_act(EXPLODE_DEVASTATE)
-		if(O) qdel(O)
-	else if(isturf(A))
-		var/turf/T = A
-		if(T.intact)
-			for(var/obj/O in T.contents)
-				if(O.level != 1)
-					continue
-				if(O.invisibility == INVISIBILITY_MAXIMUM)
-					src.consume(O)
-		T.ChangeTurf(/turf/open/space)
+/obj/singularity/narsie/mini/ex_act()
 	return
-
-/obj/singularity/narsie/sc_Narsie/ex_act()
-	return

code/modules/mapping/map_template.dm

@@ -53,6 +53,7 @@
 	smooth_zlevel(world.maxz)
 	repopulate_sorted_areas()
 
+	SSlighting.initialize_lighting_objects(block(locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]),locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])))
 	//initialize things that are normally initialized after map load
 	initTemplateBounds(bounds)
 	log_game("Z-level [name] loaded at at [x],[y],[world.maxz]")

code/modules/mob/dead/new_player/new_player.dm

@@ -375,6 +375,11 @@
 		if(GLOB.highlander)
 			to_chat(humanc, "<span class='userdanger'><i>THERE CAN BE ONLY ONE!!!</i></span>")
 			humanc.make_scottish()
+		if(prob(2) && !issilicon(humanc) && !jobban_isbanned(humanc.mind, "Syndicate") && GLOB.miscreants_allowed)
+			SSticker.generate_miscreant_objectives(humanc.mind)
+		else
+			if(CONFIG_GET(flag/allow_crew_objectives))
+				SSticker.generate_individual_objectives(humanc.mind)
 
 	GLOB.joined_player_list += character.ckey
 	GLOB.latejoiners += character

code/modules/mob/living/carbon/human/examine.dm

@@ -281,7 +281,7 @@
 			if(getBrainLoss() >= 60)
 				msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
 			if(InCritical())
-				msg += "[t_He] is barely concious.\n"
+				msg += "[t_He] is barely conscious.\n"
 		if(getorgan(/obj/item/organ/brain))
 			if(istype(src, /mob/living/carbon/human/interactive))
 				var/mob/living/carbon/human/interactive/auto = src