From 49e94049b5f4ef4f1ae6d6358c5719f1f0828098 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 11 Jan 2018 12:20:05 -0500 Subject: [PATCH] Fixes poker tables not being deleted after Narsie touches them --- code/game/objects/structures/tables_racks.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 95c23808024..ec9c5b1209b 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -248,8 +248,9 @@ /obj/structure/table/wood/poker, /obj/structure/table/wood/bar) -/obj/structure/table/wood/narsie_act() - return +/obj/structure/table/wood/narsie_act(total_override = TRUE) + if(!total_override) + ..() /obj/structure/table/wood/poker //No specialties, Just a mapping object. name = "gambling table" @@ -259,7 +260,7 @@ buildstack = /obj/item/stack/tile/carpet /obj/structure/table/wood/poker/narsie_act() - new /obj/structure/table/wood(src.loc) + ..(FALSE) /obj/structure/table/wood/fancy name = "fancy table"