Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport

# Conflicts:
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-07-08 19:36:30 +02:00
147 changed files with 1345 additions and 598 deletions
+1 -2
View File
@@ -41,8 +41,7 @@
return T.attackby(C, user) //hand this off to the turf instead (for building plating, catwalks, etc)
/obj/structure/lattice/deconstruct(disassembled = TRUE)
if(!can_deconstruct)
new /obj/item/stack/rods(get_turf(src), number_of_rods)
new /obj/item/stack/rods(get_turf(src), number_of_rods)
qdel(src)
/obj/structure/lattice/blob_act()