From ab59c4cc782e24564c702904570975df2b95f505 Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Wed, 25 May 2016 12:00:04 -0400 Subject: [PATCH 1/3] Fixes glass tables not producing debris --- code/game/objects/structures/tables_racks.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index a38f9465763..dbd0edf709e 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -297,10 +297,12 @@ /obj/structure/table/glass/proc/table_shatter(mob/M) visible_message("[src] breaks!", "You hear breaking glass.") - playsound(src.loc, "shatter", 50, 1) - for(var/i in debris) - var/atom/movable/AM = i - AM.loc = get_turf(src) + var/turf/T = get_turf(src) + playsound(T, "shatter", 50, 1) + for(var/I in debris) + var/atom/movable/AM = I + AM.forceMove()T + debris -= I if(istype(AM, /obj/item/weapon/shard)) AM.throw_impact(M) M.Weaken(5) From 8f138abaf4576a5f6faf58cb4f74f3291ae319f9 Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Wed, 25 May 2016 12:01:55 -0400 Subject: [PATCH 2/3] INSIDE the parenthesis! augh! --- code/game/objects/structures/tables_racks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index dbd0edf709e..aad8bd813ea 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -301,7 +301,7 @@ playsound(T, "shatter", 50, 1) for(var/I in debris) var/atom/movable/AM = I - AM.forceMove()T + AM.forceMove(T) debris -= I if(istype(AM, /obj/item/weapon/shard)) AM.throw_impact(M) From eeb7d43730e4a6f25b6ed48e69a846e4a8093fad Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Wed, 25 May 2016 12:05:23 -0400 Subject: [PATCH 3/3] It's a style thing --- code/game/objects/structures/tables_racks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index aad8bd813ea..2bd12c02740 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -302,7 +302,7 @@ for(var/I in debris) var/atom/movable/AM = I AM.forceMove(T) - debris -= I + debris -= AM if(istype(AM, /obj/item/weapon/shard)) AM.throw_impact(M) M.Weaken(5)