From 27f75d7b383cc3d62784dc6c305f0e09ee52f7c1 Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 27 Aug 2015 03:25:32 +0200 Subject: [PATCH 1/2] Fix ghosts triggering glass --- code/game/objects/items/weapons/shards.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index d73281a46ed..dab7a54de78 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -55,8 +55,8 @@ ..() /obj/item/weapon/shard/Crossed(AM as mob|obj) - if(ismob(AM)) - var/mob/M = AM + if(isliving(AM)) + var/mob/living/M = AM M << "\red You step on \the [src]!" playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) From 1589f54537901481d7555eb8866b61d6b8bca724 Mon Sep 17 00:00:00 2001 From: Markolie Date: Thu, 27 Aug 2015 03:31:02 +0200 Subject: [PATCH 2/2] Fix cargo scrolling issue --- code/game/supplyshuttle.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 8ce551d58be..7486ae70bf1 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -552,7 +552,6 @@ var/list/mechtoys = list( ui = new(user, src, ui_key, "supply_console.tmpl", name, COMP_SCREEN_WIDTH, COMP_SCREEN_HEIGHT) ui.set_initial_data(data) ui.open() - ui.set_auto_update(1) /obj/machinery/computer/supplycomp/proc/is_authorized(user) if(allowed(user))