Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements

code/modules/awaymissions/corpse.dm

@@ -51,11 +51,11 @@
 	if(instant || (roundstart && (ticker && ticker.current_state > GAME_STATE_SETTING_UP)))
 		create()
 	else
-		poi_list |= src
+		GLOB.poi_list |= src
 		LAZYADD(GLOB.mob_spawners[name], src)
 
 /obj/effect/mob_spawn/Destroy()
-	poi_list -= src
+	GLOB.poi_list -= src
 	var/list/spawners = GLOB.mob_spawners[name]
 	LAZYREMOVE(spawners, src)
 	if(!LAZYLEN(spawners))
@@ -70,6 +70,9 @@
 
 /obj/effect/mob_spawn/proc/create(ckey, flavour = TRUE, name)
 	var/mob/living/M = new mob_type(get_turf(src)) //living mobs only
+	var/mob/living/carbon/human/H = M
+	if(H && !H.dna)
+		H.Initialize(null)
 	if(!random)
 		M.real_name = mob_name ? mob_name : M.name
 		if(!mob_gender)
@@ -338,7 +341,7 @@
 	outfit = /datum/outfit/job/clown
 
 /obj/effect/mob_spawn/human/clown/Initialize()
-	mob_name = pick(clown_names)
+	mob_name = pick(GLOB.clown_names)
 	..()
 
 /obj/effect/mob_spawn/human/corpse/clownmili
@@ -346,7 +349,7 @@
 	outfit = /datum/outfit/clownsoldier
 
 /obj/effect/mob_spawn/human/corpse/clownmili/Initialize()
-	mob_name = "Officer [pick(clown_names)]"
+	mob_name = "Officer [pick(GLOB.clown_names)]"
 	..()
 
 /obj/effect/mob_spawn/human/corpse/clownoff
@@ -354,7 +357,7 @@
 	outfit = /datum/outfit/clownofficer
 
 /obj/effect/mob_spawn/human/corpse/clownoff/Initialize()
-	mob_name = "Honk Specialist [pick(clown_names)]"
+	mob_name = "Honk Specialist [pick(GLOB.clown_names)]"
 	..()
 
 
@@ -385,7 +388,7 @@
 	outfit = /datum/outfit/job/mime
 
 /obj/effect/mob_spawn/human/mime/Initialize()
-	mob_name = pick(mime_names)
+	mob_name = pick(GLOB.mime_names)
 	..()
 
 /obj/effect/mob_spawn/human/scientist

code/modules/awaymissions/mission_code/UO71-terrorspiders.dm

@@ -248,7 +248,7 @@
 			spawn(1)
 				beenused = 1
 				var/unlocked_something = 0
-				for(var/obj/machinery/door/poddoor/P in airlocks)
+				for(var/obj/machinery/door/poddoor/P in GLOB.airlocks)
 					if(P.density && P.id_tag == door_to_open && P.z == z)
 						P.open()
 						unlocked_something = 1

code/modules/awaymissions/mission_code/beach.dm

@@ -3,7 +3,7 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "extinguish"
 	opacity = 0
-	mouse_opacity = 0
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	density = 0
 	anchored = 1
 	invisibility = 101

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -152,7 +152,7 @@ var/sc_safecode5 = "[rand(0,9)]"
 	new /obj/item/clothing/head/helmet/space/cult(src)
 	new /obj/item/clothing/suit/space/cult(src)
 	//new /obj/item/teleportation_scroll(src)
-	new /obj/item/ore/diamond(src)
+	new /obj/item/stack/ore/diamond(src)
 
 /*
  * Modified Nar-Sie

code/modules/awaymissions/mission_code/wildwest.dm

@@ -177,8 +177,8 @@
 
 	spawn(rand(800,1200))
 		if(C.stat == DEAD)
-			dead_mob_list -= C
-			living_mob_list += C
+			GLOB.dead_mob_list -= C
+			GLOB.living_mob_list += C
 		C.stat = CONSCIOUS
 		C.timeofdeath = 0
 		C.setToxLoss(0)
@@ -237,7 +237,7 @@
 			to_chat(user, "<span class='warning'>The communicator buzzes, and you hear the voice again: 'Really? I think not. Get them!'</span>")
 		if(option_threat)
 			to_chat(user, "<span class='warning'>The communicator buzzes, and you hear the voice again: 'Oh really now?' You hear a clicking sound. 'Team, get back here. We have trouble'. Then the line goes dead.</span>")
-			for(var/obj/effect/landmark/L in landmarks_list)
+			for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 				if(L.name == "wildwest_syndipod")
 					var/obj/spacepod/syndi/P = new /obj/spacepod/syndi(get_turf(L))
 					P.name = "Syndi Recon Pod"
@@ -250,7 +250,7 @@
 	used = TRUE
 
 /obj/item/wildwest_communicator/proc/stand_down()
-	for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in living_mob_list)
+	for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in GLOB.living_mob_list)
 		W.on_alert = FALSE
 
 /mob/living/simple_animal/hostile/syndicate/ranged/wildwest
@@ -262,8 +262,9 @@
 	return list()
 
 /mob/living/simple_animal/hostile/syndicate/ranged/wildwest/death(gibbed)
-	if(!on_alert)
+	// putting this up here so we don't say anything after deathgasp
+	if(can_die() && !on_alert)
 		say("How could you betray the Syndicate?")
-		for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in living_mob_list)
+		for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in GLOB.living_mob_list)
 			W.on_alert = TRUE
-	..(gibbed)
+	return ..(gibbed)

code/modules/awaymissions/zlevel.dm

@@ -59,7 +59,7 @@ var/global/list/potentialRandomZlevels = generateMapList(filename = "config/away
 			space_manager.remove_dirt(zlev)
 			log_world("  Away mission loaded: [map]")
 
-		for(var/obj/effect/landmark/L in landmarks_list)
+		for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 			if(L.name != "awaystart")
 				continue
 			awaydestinations.Add(L)
@@ -92,7 +92,7 @@ var/global/list/potentialRandomZlevels = generateMapList(filename = "config/away
 
 			//map_transition_config.Add(AWAY_MISSION_LIST)
 
-			for(var/obj/effect/landmark/L in landmarks_list)
+			for(var/obj/effect/landmark/L in GLOB.landmarks_list)
 				if(L.name != "awaystart")
 					continue
 				awaydestinations.Add(L)

code/modules/awaymissions/zvis.dm

@@ -159,12 +159,12 @@
 
 /obj/effect/view_portal/New()
 	..()
-	portals += src
+	GLOB.portals += src
 
 /obj/effect/view_portal/Initialize()
 	..()
 	if(id)
-		for(var/obj/effect/view_portal/O in portals)
+		for(var/obj/effect/view_portal/O in GLOB.portals)
 			if(id == O.id && O != src && can_link(O))
 				other = O
 				O.other = src
@@ -174,7 +174,7 @@
 					return
 
 /obj/effect/view_portal/Destroy()
-	portals -= src
+	GLOB.portals -= src
 	return ..()
 
 /obj/effect/view_portal/proc/can_link(obj/effect/view_portal/P)