Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting

# Conflicts:
#	code/__DEFINES/misc.dm

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 = COMICBLOCK
+	..()
+
+/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 = COMICBLOCK
 	..()

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"

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

@@ -5,7 +5,7 @@
 			if("bloodyspai")	// 28TC
 				new /obj/item/twohanded/garrote(src)
 				new /obj/item/pinpointer/advpinpointer(src)
-				new /obj/item/clothing/mask/gas/voice(src)
+				new /obj/item/clothing/mask/chameleon(src)
 				new /obj/item/clothing/under/chameleon(src)
 				new /obj/item/card/id/syndicate(src)
 				new /obj/item/flashlight/emp(src)
@@ -19,7 +19,7 @@
 				new /obj/item/chameleon(src)
 				new /obj/item/clothing/gloves/color/black/thief(src)
 				new /obj/item/card/id/syndicate(src)
-				new /obj/item/clothing/shoes/syndigaloshes(src)
+				new /obj/item/clothing/shoes/chameleon/noslip(src)
 				new /obj/item/storage/box/syndie_kit/safecracking(src)
 				return
 
@@ -83,14 +83,14 @@
 				new /obj/item/dnainjector/telemut/darkbundle(src)
 				new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
 				new /obj/item/card/id/syndicate(src)
-				new /obj/item/clothing/shoes/syndigaloshes(src)
-				new /obj/item/clothing/mask/gas/voice(src)
+				new /obj/item/clothing/shoes/chameleon/noslip(src)
+				new /obj/item/clothing/mask/chameleon(src)
 				return
 
 			if("gadgets")	// 30TC
 				new /obj/item/clothing/gloves/color/yellow/power(src)
 				new /obj/item/pen/sleepy(src)
-				new /obj/item/clothing/shoes/syndigaloshes(src)
+				new /obj/item/clothing/shoes/chameleon/noslip(src)
 				new /obj/item/clothing/glasses/thermal/syndi(src)
 				new /obj/item/flashlight/emp(src)
 				new /obj/item/stamp/chameleon(src)
@@ -340,4 +340,21 @@ To apply, hold the injector a short distance away from the outer thigh before ap
 	new /obj/item/clothing/gloves/color/latex/nitrile(src)
 	new /obj/item/clothing/mask/balaclava(src)
 	new /obj/item/clothing/accessory/stethoscope(src)
-	new /obj/item/book/manual/engineering_hacking(src)
+	new /obj/item/book/manual/engineering_hacking(src)
+
+/obj/item/storage/box/syndie_kit/chameleon
+	name = "chameleon kit"
+
+/obj/item/storage/box/syndie_kit/chameleon/New()
+	..()
+	new /obj/item/clothing/under/chameleon(src)
+	new /obj/item/clothing/suit/chameleon(src)
+	new /obj/item/clothing/gloves/chameleon(src)
+	new /obj/item/clothing/shoes/chameleon(src)
+	new /obj/item/clothing/glasses/chameleon(src)
+	new /obj/item/clothing/head/chameleon(src)
+	new /obj/item/clothing/mask/chameleon(src)
+	new /obj/item/storage/backpack/chameleon(src)
+	new /obj/item/radio/headset/chameleon(src)
+	new /obj/item/stamp/chameleon(src)
+	new /obj/item/pda/chameleon(src)