Assorted bugfixes ahead of the merc event

code/modules/clothing/chameleon.dm

@@ -8,16 +8,19 @@
 
 	desc = copy.desc
 	name = copy.name
+	icon = copy.icon
 	icon_state = copy.icon_state
 	item_state = copy.item_state
 	body_parts_covered = copy.body_parts_covered
 	flags_inv = copy.flags_inv
 
-	item_icons = copy.item_icons.Copy()
-	if(copy.item_state_slots) //Runtime prevention for backpacks
+	if (copy.item_icons)
+		item_icons = copy.item_icons.Copy()
+	if (copy.item_state_slots) //Runtime prevention for backpacks
 		item_state_slots = copy.item_state_slots.Copy()
-	sprite_sheets = copy.sprite_sheets.Copy()
-	//copying sprite_sheets_obj should be unnecessary as chameleon items are not refittable.
+	if (copy.sprite_sheets)
+		sprite_sheets = copy.sprite_sheets.Copy()
+		//copying sprite_sheets_obj should be unnecessary as chameleon items are not refittable.
 
 	return copy //for inheritance
 
@@ -409,14 +412,15 @@
 //**Chameleon Gun**
 //*****************
 /obj/item/gun/energy/chameleon
-	name = "desert eagle"
+	name = "phase pistol"
 	desc = "A hologram projector in the shape of a gun. There is a dial on the side to change the gun's disguise."
-	icon_state = "deagle"
+	icon_state = "phase"
+	item_state = "taser"
+	modifystate = "phase"
 	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 4)
 	matter = list()
 
-	fire_sound = 'sound/weapons/Gunshot1.ogg'
 	projectile_type = /obj/item/projectile/chameleon
 	charge_meter = 0
 	charge_cost = 48 //uses next to no power, since it's just holograms
@@ -424,15 +428,23 @@
 
 	var/obj/item/projectile/copy_projectile
 	var/static/list/gun_choices
+	/// Without these being here, duplicate options appear in the list that result in null icons
+	var/static/list/gun_blacklist = list(
+		/obj/item/gun/energy/laser/xenoarch,
+		/obj/item/gun/energy/laser/practice/xenoarch,
+		/obj/item/gun/energy/xray/xenoarch,
+		/obj/item/gun/energy/captain/xenoarch
+	)
 
 /obj/item/gun/energy/chameleon/Initialize()
 	. = ..()
 
 	if(!gun_choices)
 		gun_choices = list()
-		for(var/gun_type in typesof(/obj/item/gun/) - src.type)
+		for(var/gun_type in typesof(/obj/item/gun/) - (gun_blacklist + type))
 			var/obj/item/gun/G = gun_type
 			src.gun_choices[initial(G.name)] = gun_type
+		gun_choices = sortList(gun_choices)
 	return
 
 /obj/item/gun/energy/chameleon/consume_next_projectile()
@@ -443,32 +455,34 @@
 		P.icon_state = initial(copy_projectile.icon_state)
 		P.pass_flags = initial(copy_projectile.pass_flags)
 		P.fire_sound = initial(copy_projectile.fire_sound)
+		P.hitsound = initial(copy_projectile.hitsound)
+		P.hitsound_wall = initial(copy_projectile.hitsound_wall)
 		P.hitscan = initial(copy_projectile.hitscan)
 		P.speed = initial(copy_projectile.speed)
+		P.range = initial(copy_projectile.range)
 		P.muzzle_type = initial(copy_projectile.muzzle_type)
 		P.tracer_type = initial(copy_projectile.tracer_type)
 		P.impact_type = initial(copy_projectile.impact_type)
 	return P
 
 /obj/item/gun/energy/chameleon/emp_act(severity)
-	name = "desert eagle"
-	desc = "It's a desert eagle."
-	icon_state = "deagle"
+	disguise(type)
 	update_icon()
-	if (ismob(src.loc))
-		var/mob/M = src.loc
-		M.update_inv_r_hand()
-		M.update_inv_l_hand()
 
 /obj/item/gun/energy/chameleon/disguise(var/newtype)
 	var/obj/item/gun/copy = ..()
 
 	flags_inv = copy.flags_inv
-	if(copy.fire_sound)
-		fire_sound = copy.fire_sound
+	fire_sound = copy.fire_sound ? copy.fire_sound : null
+	if (istype(copy, /obj/item/gun/energy))
+		var/obj/item/gun/energy/E = copy
+		modifystate = E.modifystate ? E.modifystate : E.icon_state
 	else
-		fire_sound = null
+		modifystate = copy.icon_state
+	item_state_slots = copy.item_state_slots
+	wielded_item_state = copy.wielded_item_state
 	fire_sound_text = copy.fire_sound_text
+	fire_delay = copy.fire_delay
 
 	var/obj/item/gun/G = copy
 	if(istype(G))
@@ -487,9 +501,4 @@
 		return
 
 	disguise(gun_choices[picked])
-
-	//so our overlays update.
-	if (ismob(src.loc))
-		var/mob/M = src.loc
-		M.update_inv_r_hand()
-		M.update_inv_l_hand()
+	update_icon()

code/modules/projectiles/gun.dm

@@ -129,8 +129,8 @@
 				item_state_slots[slot_l_hand_str] = wielded_item_state
 				item_state_slots[slot_r_hand_str] = wielded_item_state
 			else
-				item_state_slots[slot_l_hand_str] = initial(item_state)
-				item_state_slots[slot_r_hand_str] = initial(item_state)
+				item_state_slots[slot_l_hand_str] = item_state
+				item_state_slots[slot_r_hand_str] = item_state
 	..()
 
 

code/modules/projectiles/projectile/special.dm

@@ -230,14 +230,15 @@
 	..()
 
 /obj/item/projectile/chameleon
-	name = "bullet"
-	icon_state = "bullet"
+	name = "phase wave"
+	icon_state = "phase"
+	fire_sound = 'sound/weapons/Gunshot_phase.ogg'
 	damage = 1 // stop trying to murderbone with a fake gun dumbass!!!
 	embed_chance = 0 // nope
 	nodamage = 1
+	range = 6
 	damage_type = HALLOSS
-	muzzle_type = /obj/effect/projectile/muzzle/bullet
-	hud_state = "monkey"
+	hud_state = "laser_heat"
 
 /obj/item/projectile/bola
 	name = "bola"