Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1

This commit is contained in:
AffectedArc07
2021-03-11 18:41:17 +00:00
1118 changed files with 25570 additions and 65816 deletions
+6
View File
@@ -166,3 +166,9 @@
/obj/structure/proc/prevents_buckled_mobs_attacking()
return FALSE
/obj/structure/zap_act(power, zap_flags)
if(zap_flags & ZAP_OBJ_DAMAGE)
take_damage(power / 8000, BURN, "energy")
power -= power / 2000 //walls take a lot out of ya
. = ..()