Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459

[MIRROR] Clown Ops
2018-03-17 23:58:15 +00:00
parent 087255b1f1 8e5d87b780
commit 082d36fa6b
30 changed files with 700 additions and 78 deletions
@@ -11,7 +11,7 @@
 	var/equip_ready = 1 //whether the equipment is ready for use. (or deactivated/activated for static stuff)
 	var/energy_drain = 0
 	var/obj/mecha/chassis = null
-	var/range = MELEE //bitflags
+	var/range = MELEE //bitFflags
 	var/salvageable = 1
 	var/selectable = 1	// Set to 0 for passive equipment such as mining scanner or armor plates
 	var/pacifist_safe = TRUE //Controls if equipment can be used to attack by a pacifist.