Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync

This commit is contained in:
deathride58
2018-07-05 00:17:44 -04:00
18 changed files with 99 additions and 25 deletions
+1 -2
View File
@@ -187,8 +187,7 @@
debris += new /obj/item/shard
/obj/structure/table/glass/Destroy()
for(var/i in debris)
qdel(i)
QDEL_LIST(debris)
. = ..()
/obj/structure/table/glass/Crossed(atom/movable/AM)