[MIRROR] fixes chameleon laser guns blowing up welding tanks for real this time (#1069)

* fixes chameleon laser guns blowing up welding tanks for real this time * Delete energy.dm.rej * Update energy.dm
2017-05-21 20:30:12 -05:00
parent c7de3024b1
commit 312ae2218e
2 changed files with 3 additions and 0 deletions
@@ -9,6 +9,7 @@
 	firing_effect_type = /obj/effect/overlay/temp/dir_setting/firing_effect/energy

 /obj/item/ammo_casing/energy/chameleon
+	projectile_type = /obj/item/projectile/energy/chameleon
 	e_cost = 0
 	var/list/projectile_vars = list()

@@ -5,6 +5,8 @@
 	damage_type = BURN
 	flag = "energy"

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

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