Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00
parent 5591afc9ce b2d7ee0e51
commit 24a7aa5a9f
550 changed files with 13328 additions and 156749 deletions
@@ -1,18 +0,0 @@
-diff a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm	(rejected hunks)
-@@ -473,14 +473,14 @@
- 	W.registered_name = H.real_name
- 	W.update_label(W.registered_name, W.assignment)
- 
-	// The shielded hardsuit is already NODROP
-+	// The shielded hardsuit is already NODROP_1
- 	no_drops += H.get_item_by_slot(slot_gloves)
- 	no_drops += H.get_item_by_slot(slot_shoes)
- 	no_drops += H.get_item_by_slot(slot_w_uniform)
- 	no_drops += H.get_item_by_slot(slot_ears)
- 	for(var/i in no_drops)
- 		var/obj/item/I = i
-		I.flags |= NODROP
-+		I.flags_1 |= NODROP_1
- 
- /datum/outfit/ctf/instagib
- 	r_hand = /obj/item/gun/energy/laser/instakill
@@ -46,10 +46,13 @@
 		create()
 	else
 		GLOB.poi_list |= src
+		LAZYADD(GLOB.mob_spawners[name], src)

 /obj/effect/mob_spawn/Destroy()
-	GLOB.poi_list.Remove(src)
-	. = ..()
+	GLOB.poi_list -= src
+	var/list/spawners = GLOB.mob_spawners[name]
+	LAZYREMOVE(spawners, src)
+	return ..()

 /obj/effect/mob_spawn/proc/special(mob/M)
 	return