Merge branch 'master' into TiredOfTheInconsistency

This commit is contained in:
Cyberboss
2017-03-28 09:23:27 -04:00
committed by GitHub
31 changed files with 252 additions and 240 deletions
@@ -61,7 +61,7 @@
return ..()
/obj/structure/chair/attack_tk(mob/user)
if(has_buckled_mobs())
if(!anchored || has_buckled_mobs())
..()
else
rotate()
+1 -1
View File
@@ -10,7 +10,7 @@
anchored = 0
obj_integrity = 100
max_integrity = 100
var/oreAmount = 7
var/oreAmount = 5
var/material_drop_type = /obj/item/stack/sheet/metal
CanAtmosPass = ATMOS_PASS_DENSITY