diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index fcece506c3..b58b4a3517 100644 --- a/code/game/machinery/cryopod.dm +++ b/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("\The [initial(name)] hums and hisses as it moves [occupant.real_name] into storage.", 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) diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm index 27b4054fa5..84c03675b5 100644 --- a/code/game/objects/items/devices/floor_painter.dm +++ b/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 diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index 62ba2e49e8..a37e4c41b1 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/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 ..() \ No newline at end of file