Chameleon overhaul

code/game/objects/effects/spawners/lootdrop.dm

@@ -140,8 +140,8 @@
 				/obj/item/suppressor = 4,
 				/obj/item/clothing/under/chameleon = 2,
 				/obj/item/stamp/chameleon = 2,
-				/obj/item/clothing/shoes/syndigaloshes = 5,
-				/obj/item/clothing/mask/gas/voice = 2,
+				/obj/item/clothing/shoes/chameleon/noslip = 5,
+				/obj/item/clothing/mask/chameleon = 2,
 				/obj/item/dnascrambler = 1,
 				/obj/item/storage/backpack/satchel_flat = 2,
 				/obj/item/storage/toolbox/syndicate = 2,

code/game/objects/effects/spawners/random_spawners.dm

@@ -214,7 +214,7 @@
 		/obj/item/storage/pill_bottle/zoom = 1,
 		/obj/item/storage/pill_bottle/random_drug_bottle = 2,
 		/obj/item/storage/backpack/duffel/syndie/surgery = 1,
-		/obj/item/clothing/shoes/syndigaloshes = 1,
+		/obj/item/clothing/shoes/chameleon/noslip = 1,
 		/obj/item/storage/belt/military = 1,
 		/obj/item/clothing/under/chameleon = 1,
 		/obj/item/storage/backpack/satchel_flat = 1,

code/game/objects/items.dm

@@ -600,3 +600,9 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 /obj/item/MouseExited()
 	deltimer(tip_timer) //delete any in-progress timer if the mouse is moved off the item before it finishes
 	closeToolTip(usr)
+
+/obj/item/proc/update_slot_icon()
+	if(!ismob(loc))
+		return
+	var/mob/owner = loc
+	owner.regenerate_icons()

code/game/objects/items/devices/megaphone.dm

@@ -35,7 +35,7 @@
 			return
 		if(H.mind)
 			span = H.mind.speech_span
-		if((COMIC in H.mutations) || H.get_int_organ(/obj/item/organ/internal/cyberimp/brain/clown_voice) || istype(H.get_item_by_slot(slot_wear_mask), /obj/item/clothing/mask/gas/voice/clown))
+		if((COMIC in H.mutations) || H.get_int_organ(/obj/item/organ/internal/cyberimp/brain/clown_voice))
 			span = "sans"
 	if(spamcheck)
 		to_chat(user, "<span class='warning'>\The [src] needs to recharge!</span>")

code/game/objects/items/devices/radio/radio.dm

@@ -397,7 +397,6 @@ var/global/list/default_medbay_channels = list(
 		var/mob/living/carbon/human/H = M
 		displayname = H.voice
 		if(H.voice != real_name)	
-			jobname = "Unknown"
 			voicemask = TRUE
 
 	if(syndiekey && syndiekey.change_voice && connection.frequency == SYND_FREQ)

code/game/objects/items/devices/voice.dm

@@ -0,0 +1,44 @@
+/obj/item/voice_changer
+	name = "voice changer"
+	desc = "A voice scrambling module."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "voice_changer_off"
+
+	actions_types = list(/datum/action/item_action/voice_changer/toggle, /datum/action/item_action/voice_changer/voice)
+
+	var/obj/item/parent
+
+	var/voice
+	var/active
+
+/obj/item/voice_changer/New()
+	. = ..()
+
+	if(isitem(loc))
+		parent = loc
+		parent.actions |= actions
+
+/obj/item/voice_changer/Destroy()
+	if(isitem(parent))
+		parent.actions -= actions
+
+	return ..()
+
+/obj/item/voice_changer/attack_self(mob/user)
+	active = !active
+	icon_state = "voice_changer_[active ? "on" : "off"]"
+	to_chat(user, "<span class='notice'>You toggle [src] [active ? "on" : "off"].</span>")
+
+	for(var/X in actions)
+		var/datum/action/A = X
+		A.UpdateButtonIcon()
+
+/obj/item/voice_changer/proc/set_voice(mob/user)
+	var/chosen_voice = input(user, "What voice would you like to mimic? Leave this empty to use the voice on your ID card.", "Set Voice Changer", voice) as text
+	if(!chosen_voice)
+		voice = null
+		to_chat(user, "<span class='notice'>You are now mimicking the voice on your ID card.</span>")
+		return
+
+	voice = sanitize(copytext(chosen_voice, 1, MAX_MESSAGE_LEN))
+	to_chat(user, "<span class='notice'>You are now mimicking <b>[voice]</b>.</span>")

code/game/objects/items/weapons/dna_injector.dm

@@ -668,4 +668,27 @@
 
 /obj/item/dnainjector/m2h/Initialize()
 	block = MONKEYBLOCK
+	..()
+
+
+/obj/item/dnainjector/comic
+	name = "DNA-Injector (Comic)"
+	desc = "Honk!"
+	datatype = DNA2_BUF_SE
+	value = 0xFFF
+	forcedmutation = TRUE
+
+/obj/item/dnainjector/comic/Initialize()
+	block = COMIC
+	..()
+
+/obj/item/dnainjector/anticomic
+	name = "DNA-Injector (Ant-Comic)"
+	desc = "Honk...?"
+	datatype = DNA2_BUF_SE
+	value = 0x001
+	forcedmutation = TRUE
+
+/obj/item/dnainjector/anticomic/Initialize()
+	block = COMIC
 	..()

code/game/objects/items/weapons/storage/backpack.dm

@@ -112,7 +112,7 @@
 	..()
 	new /obj/item/clothing/under/rank/clown(src)
 	new /obj/item/clothing/shoes/magboots/clown(src)
-	new /obj/item/clothing/mask/gas/voice/clown(src)
+	new /obj/item/clothing/mask/chameleon(src)
 	new /obj/item/radio/headset/headset_service(src)
 	new /obj/item/pda/clown(src)
 	new /obj/item/storage/box/survival(src)
@@ -124,6 +124,7 @@
 	new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
 	new /obj/item/instrument/bikehorn(src)
 	new /obj/item/bikehorn(src)
+	new /obj/item/dnainjector/comic(src)
 
 /obj/item/storage/backpack/mime
 	name = "Parcel Parceaux"