Merge pull request #9712 from mwerezak/all-things-to-everyone

Chameleon items

code/modules/projectiles/ammunition/boxes.dm

@@ -192,33 +192,3 @@
 	max_ammo = 20
 	multiple_sprites = 1
 
-/obj/item/ammo_magazine/chameleon
-	name = "magazine (.45)"
-	icon_state = "45"
-	mag_type = MAGAZINE
-	caliber = ".45"
-	ammo_type = /obj/item/ammo_casing/chameleon
-	max_ammo = 7
-	multiple_sprites = 1
-	matter = list()
-
-/obj/item/ammo_magazine/chameleon/empty
-	initial_ammo = 0
-
-/*
-//unused garbage
-
-/obj/item/ammo_magazine/a418
-	name = "ammo box (.418)"
-	icon_state = "418"
-	ammo_type = "/obj/item/ammo_casing/a418"
-	max_ammo = 7
-	multiple_sprites = 1
-
-/obj/item/ammo_magazine/a666
-	name = "ammo box (.666)"
-	icon_state = "666"
-	ammo_type = "/obj/item/ammo_casing/a666"
-	max_ammo = 4
-	multiple_sprites = 1
-*/

code/modules/projectiles/ammunition/bullets.dm

@@ -158,21 +158,3 @@
 	icon_state = "rocketshell"
 	projectile_type = /obj/item/missile
 	caliber = "rocket"
-
-/obj/item/ammo_casing/chameleon
-	name = "chameleon bullets"
-	desc = "A set of bullets for the Chameleon Gun."
-	projectile_type = /obj/item/projectile/bullet/chameleon
-	caliber = ".45"
-
-/*
-/obj/item/ammo_casing/a418
-	desc = "A .418 bullet casing."
-	caliber = "357"
-	projectile_type = /obj/item/projectile/bullet/suffocationbullet
-
-/obj/item/ammo_casing/a666
-	desc = "A .666 bullet casing."
-	caliber = "357"
-	projectile_type = /obj/item/projectile/bullet/cyanideround
-*/

code/modules/projectiles/guns/energy.dm

@@ -36,7 +36,6 @@
 		fire_sound = isnull(current_mode.fire_sound)? initial(fire_sound) : current_mode.fire_sound
 
 		update_icon()
-		update_held_icon()
 
 /obj/item/weapon/gun/energy/emp_act(severity)
 	..()
@@ -115,4 +114,4 @@
 			icon_state = "[modifystate][ratio]"
 		else
 			icon_state = "[initial(icon_state)][ratio]"
-
+	update_held_icon()

code/modules/projectiles/projectile/bullets.dm

@@ -182,10 +182,6 @@
 	damage = 1
 	embed = 0
 
-/obj/item/projectile/bullet/chameleon
-	damage = 1 // stop trying to murderbone with a fake gun dumbass!!!
-	embed = 0 // nope
-
 /* Practice */
 
 /obj/item/projectile/bullet/pistol/practice

code/modules/projectiles/projectile/special.dm

@@ -150,3 +150,12 @@
 	spawn
 		qdel(src)
 	return
+
+/obj/item/projectile/chameleon
+	name = "bullet"
+	icon_state = "bullet"
+	damage = 1 // stop trying to murderbone with a fake gun dumbass!!!
+	embed = 0 // nope
+	nodamage = 1
+	damage_type = HALLOSS
+	muzzle_type = /obj/effect/projectile/bullet/muzzle