Merge branch '13113'

2020-08-16 18:53:35 -07:00
parent ac7bdb5db5 7c653d0891
commit 8dedcbcf76
100 changed files with 3832 additions and 185 deletions
@@ -547,3 +547,6 @@ Class Procs:
 	. = . % 9
 	AM.pixel_x = -8 + ((.%3)*8)
 	AM.pixel_y = -8 + (round( . / 3)*8)
+
+/obj/machinery/rust_heretic_act()
+	take_damage(500, BRUTE, "melee", 1)