From 1aee7282ff8c0d3ed38242504076b3ad9b0ca1d5 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 15 Apr 2015 16:30:13 +0930 Subject: [PATCH 1/3] Quickfix for pariahs breaking cuffs. --- code/modules/mob/living/carbon/human/species/outsider/vox.dm | 5 +++++ 1 file changed, 5 insertions(+) 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 aad904ae2a..f5d26e57cf 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 From 54044859bf69210a30650a014a1105679535bd11 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Wed, 15 Apr 2015 14:23:15 +0100 Subject: [PATCH 2/3] Fix cryopod moving robots to nullspace instead of deleting --- code/game/machinery/cryopod.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 2ef829fc12..9e7e82c0c3 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) From 159dccbfabe2fb6e9698b90861711826d11b5231 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Fri, 17 Apr 2015 03:18:53 +0100 Subject: [PATCH 3/3] Fixes floor painter solid-dark icon Fixes #8873 --- code/game/objects/items/devices/floor_painter.dm | 4 ++++ 1 file changed, 4 insertions(+) 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