Merge pull request #8893 from Baystation12/dev-freeze

Dev freeze into dev

code/game/machinery/cryopod.dm

@@ -315,7 +315,7 @@
 				O.loc = src
 
 	//Delete all items not on the preservation list.
-	var/list/items = src.contents
+	var/list/items = src.contents.Copy()
 	items -= occupant // Don't delete the occupant
 	items -= announce // or the autosay radio.
 
@@ -398,9 +398,9 @@
 	announce.autosay("[occupant.real_name] [on_store_message]", "[on_store_name]")
 	visible_message("<span class='notice'>\The [initial(name)] hums and hisses as it moves [occupant.real_name] into storage.</span>", 3)
 
-	set_occupant(null)
 	// Delete the mob.
 	del(occupant)
+	set_occupant(null)
 
 
 /obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)

code/game/objects/items/devices/floor_painter.dm

@@ -97,6 +97,10 @@
 				mode = "white"
 				mode_nice = "white"
 				return
+			if(design == "dark")
+				mode = "dark"
+				mode_nice = "dark"
+				return
 			if(design == "showroom" || design == "hydro" || design == "freezer")
 				mode = "[design]floor"
 				mode_nice = design

code/modules/mob/living/carbon/human/species/outsider/vox.dm

@@ -53,3 +53,8 @@
 /datum/species/vox/get_random_name(var/gender)
 	var/datum/language/species_language = all_languages[default_language]
 	return species_language.get_random_name(gender)
+
+/datum/species/vox/can_shred(var/mob/living/carbon/human/H, var/ignore_intent)
+	if(!H.mind || !H.mind.special_role) // Pariah check.
+		return 0
+	return ..()