From 312ae2218ee4c6f6d0553f11fb99495386c0d6db Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Sun, 21 May 2017 20:30:12 -0500
Subject: [PATCH] [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
---
 code/modules/projectiles/ammunition/energy.dm | 1 +
 code/modules/projectiles/projectile/energy.dm | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index bf695cffed..ba4770ebba 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -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()
 
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 974ea935f2..cfa7727186 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -5,6 +5,8 @@
 	damage_type = BURN
 	flag = "energy"
 
+/obj/item/projectile/energy/chameleon
+	nodamage = TRUE
 
 /obj/item/projectile/energy/electrode
 	name = "electrode"