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
@@ -112,3 +112,6 @@
 		if(0 to 25)
 			if(!broken)
 				return  "<span class='warning'>It's falling apart!</span>"
+
+/obj/structure/rust_heretic_act()
+	take_damage(500, BRUTE, "melee", 1)