Merge pull request #4792 from Citadel-Station-13/upstream-merge-34316

[MIRROR] Fixes poker tables not being deleted after Narsie touches them
This commit is contained in:
deathride58
2018-01-13 20:20:43 +00:00
committed by GitHub
+4 -3
View File
@@ -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"