Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45

code/modules/awaymissions/capture_the_flag.dm

@@ -497,14 +497,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 TRAIT_NODROP
 	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.item_flags |= NODROP
+		ADD_TRAIT(I, TRAIT_NODROP, CAPTURE_THE_FLAG_TRAIT)
 
 /datum/outfit/ctf/instagib
 	r_hand = /obj/item/gun/energy/laser/instakill

code/modules/awaymissions/corpse.dm

@@ -71,13 +71,14 @@
 
 /obj/effect/mob_spawn/Destroy()
 	GLOB.poi_list -= src
-	LAZYREMOVE(GLOB.mob_spawners[job_description ? job_description : name], src)
-	if(!LAZYLEN(GLOB.mob_spawners[job_description ? job_description : name]))
-		GLOB.mob_spawners -= job_description ? job_description : name
+	var/job_name = job_description ? job_description : name
+	LAZYREMOVE(GLOB.mob_spawners[job_name], src)
+	if(!LAZYLEN(GLOB.mob_spawners[job_name]))
+		GLOB.mob_spawners -= job_name
 	return ..()
 
 /obj/effect/mob_spawn/proc/can_latejoin() //If it can be taken from the lobby.
-	return TRUE
+	return ghost_usable
 
 /obj/effect/mob_spawn/proc/special(mob/M)
 	return