Merge remote-tracking branch 'citadel/master' into combat_rework

2020-05-29 19:13:22 -07:00
parent 92a537da63 5ab8d41d9a
commit 65bb3bbb91
52 changed files with 787 additions and 609 deletions
@@ -9,6 +9,8 @@
 	maxHealth = 100
 	health = 100

+	combat_flags = COMBAT_FLAGS_DEFAULT
+
 	var/custom_name = ""
 	var/braintype = "Cyborg"
 	var/obj/item/robot_suit/robot_suit = null //Used for deconstruction to remember what the borg was constructed out of..