Merge pull request #1864 from Markolie/fuckingglass

Fix ghosts triggering glass
This commit is contained in:
TheDZD
2015-08-26 21:41:06 -04:00
2 changed files with 2 additions and 3 deletions
+2 -2
View File
@@ -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 <B>You step on \the [src]!</B>"
playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
if(ishuman(M))
-1
View File
@@ -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))