Merge pull request #21359 from phil235/WindowExplosionBlockFix

reinforced window and telehulk bugfixes
This commit is contained in:
Joan Lung
2016-11-05 19:33:15 -04:00
committed by GitHub
5 changed files with 6 additions and 17 deletions
@@ -71,9 +71,6 @@
else
..()
/obj/structure/table/attack_tk() // no telehulk sorry
return
/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0)
if(height==0)
return 1
@@ -453,9 +450,6 @@
take_damage(rand(4,8), BRUTE, "melee", 1)
/obj/structure/rack/attack_tk() // no telehulk sorry
return
/obj/structure/rack/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
if(BRUTE)