Merge branch 'master' into upstream-merge-32188

code/game/objects/effects/landmarks.dm

@@ -178,21 +178,18 @@
 	GLOB.nukeop_leader_start += loc
 	return INITIALIZE_HINT_QDEL
 
+// Must be immediate because players will
+// join before SSatom initializes everything.
+INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
+
 /obj/effect/landmark/start/new_player
 	name = "New Player"
 
-// Must be on New() rather than Initialize, because players will
-// join before SSatom initializes everything.
-/obj/effect/landmark/start/new_player/New(loc)
+/obj/effect/landmark/start/new_player/Initialize()
 	..()
 	GLOB.newplayer_start += loc
-
-/obj/effect/landmark/start/new_player/Initialize(mapload)
-	..()
 	return INITIALIZE_HINT_QDEL
 
-
-
 /obj/effect/landmark/latejoin
 	name = "JoinLate"
 

code/game/objects/effects/manifest.dm

@@ -1,17 +1,17 @@
-/obj/effect/manifest
-	name = "manifest"
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x"
-
-/obj/effect/manifest/New()
-	src.invisibility = INVISIBILITY_ABSTRACT
-
-/obj/effect/manifest/proc/manifest()
-	var/dat = "<B>Crew Manifest</B>:<BR>"
-	for(var/mob/living/carbon/human/M in GLOB.mob_list)
-		dat += text("    <B>[]</B> -  []<BR>", M.name, M.get_assignment())
-	var/obj/item/paper/P = new /obj/item/paper( src.loc )
-	P.info = dat
-	P.name = "paper- 'Crew Manifest'"
-	//SN src = null
-	qdel(src)
+/obj/effect/manifest
+	name = "manifest"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x"
+
+/obj/effect/manifest/New()
+	src.invisibility = INVISIBILITY_ABSTRACT
+
+/obj/effect/manifest/proc/manifest()
+	var/dat = "<B>Crew Manifest</B>:<BR>"
+	for(var/mob/living/carbon/human/M in GLOB.carbon_list)
+		dat += text("    <B>[]</B> -  []<BR>", M.name, M.get_assignment())
+	var/obj/item/paper/P = new /obj/item/paper( src.loc )
+	P.info = dat
+	P.name = "paper- 'Crew Manifest'"
+	//SN src = null
+	qdel(src)

code/game/objects/items/devices/PDA/cart.dm

@@ -505,7 +505,7 @@ Code:
 				menu += "<h4>Located Cleanbots:</h4>"
 
 				ldat = null
-				for (var/mob/living/simple_animal/bot/cleanbot/B in GLOB.living_mob_list)
+				for (var/mob/living/simple_animal/bot/cleanbot/B in GLOB.alive_mob_list)
 					var/turf/bl = get_turf(B)
 
 					if(bl)
@@ -715,7 +715,7 @@ Code:
 		var/turf/current_turf = get_turf(src)
 		var/zlevel = current_turf.z
 		var/botcount = 0
-		for(Bot in GLOB.living_mob_list) //Git da botz
+		for(Bot in GLOB.alive_mob_list) //Git da botz
 			if(!Bot.on || Bot.z != zlevel || Bot.remote_disabled || !(bot_access_flags & Bot.bot_type)) //Only non-emagged bots on the same Z-level are detected!
 				continue //Also, the PDA must have access to the bot type.
 			menu += "<A href='byond://?src=[REF(src)];op=control;bot=[REF(Bot)]'><b>[Bot.name]</b> ([Bot.get_mode()])<BR>"

code/game/objects/items/pinpointer.dm

@@ -103,7 +103,7 @@
 	var/list/name_counts = list()
 	var/list/names = list()
 
-	for(var/mob/living/carbon/human/H in GLOB.mob_list)
+	for(var/mob/living/carbon/human/H in GLOB.carbon_list)
 		if(!trackable(H))
 			continue
 
@@ -147,4 +147,3 @@
 		return PROCESS_KILL
 	scan_for_target()
 	update_icon()
-

code/game/objects/objs.dm

@@ -201,6 +201,7 @@
 /obj/vv_get_dropdown()
 	. = ..()
 	.["Delete all of type"] = "?_src_=vars;[HrefToken()];delall=[REF(src)]"
+	.["Osay"] = "?_src_=vars;[HrefToken()];osay[REF(src)]"
 
 /obj/examine(mob/user)
 	..()