Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344

2017-05-22 11:52:18 -05:00
parent 7e2cebe1db 1d8f9b31ee
commit d1db0044d1
24 changed files with 59158 additions and 59128 deletions
@@ -5,6 +5,8 @@
 	damage_type = BURN
 	flag = "energy"

+/obj/item/projectile/energy/chameleon
+	nodamage = TRUE

 /obj/item/projectile/energy/electrode
 	name = "electrode"