From 9a651a5a84a97e581b46d9a4e83af5a8be8e1cb3 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Tue, 3 Jan 2012 00:06:25 -0700
Subject: [PATCH] Added psyche jumpsuit for Asanadas Expanded scrambled radio
 stuff.

---
 code/WorkInProgress/Mini/customitems.dm |  3 ++-
 code/defines/obj/clothing/jumpsuit.dm   |  7 +++++++
 code/game/objects/radio/radio.dm        | 10 +++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/code/WorkInProgress/Mini/customitems.dm b/code/WorkInProgress/Mini/customitems.dm
index 8a3777e074..8a507608b2 100644
--- a/code/WorkInProgress/Mini/customitems.dm
+++ b/code/WorkInProgress/Mini/customitems.dm
@@ -7,7 +7,8 @@ var/list/CustomItemList = list(
 		//    ckey        real_name   item path
 	//	list("miniature","Dave Booze",/obj/item/toy/crayonbox)	//screw this i dont want crayons, it's an example okay
 	list("skymarshal", "Phillip Oswald", /obj/item/weapon/coin/silver),	//Phillip likes to chew on cigars.  Just unlit cigars, don't ask me why.  Must be a clone thing.  (Cigarette machines dispense cigars if they have a coin in them)  --SkyMarshal
-	list("spaceman96", "Trenna Seber", /obj/item/weapon/pen/multi)	//For Spesss.
+	list("spaceman96", "Trenna Seber", /obj/item/weapon/pen/multi),	//For Spesss.
+	list("asanadas", "Book Berner", /obj/item/clothing/under/chameleon/psyche)
 	)
 
 /proc/EquipCustomItems(mob/living/carbon/human/M)
diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm
index 3ccca7d524..f420d23bd0 100644
--- a/code/defines/obj/clothing/jumpsuit.dm
+++ b/code/defines/obj/clothing/jumpsuit.dm
@@ -30,6 +30,13 @@
 	origin_tech = "syndicate=3"
 	var/list/clothing_choices = list()
 
+/obj/item/clothing/under/chameleon/psyche
+	item_state = "bl_suit"
+	name = "psychedelic"
+	desc = "Groovy!"
+	icon_state = "psyche"
+	color = "psyche"
+
 /obj/item/clothing/under/chameleon/all
 
 /obj/item/clothing/under/color/black
diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm
index 5d8e921678..ee3574af44 100644
--- a/code/game/objects/radio/radio.dm
+++ b/code/game/objects/radio/radio.dm
@@ -230,11 +230,13 @@
 	var/list/heard_normal = list() // normal message
 	var/list/heard_voice = list() // voice message
 	var/list/heard_garbled = list() // garbled message
+	var/turf/cl = get_turf(M)
 
 	for (var/mob/R in receive)
+		var/turf/gl = get_turf(R)
 		if (R.client && R.client.STFU_radio) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios.
 			continue
-		if (R.say_understands(M))
+		if (R.say_understands(M) && ((gl.z == cl.z) || !istype(src, /obj/item/device/radio/headset)))
 			if ((!ishuman(M) || istype(M.wear_mask, /obj/item/clothing/mask/gas/voice)) && !scramble)
 				heard_masked += R
 			else if (!scramble)
@@ -242,7 +244,7 @@
 			else
 				heard_garbled += R
 		else
-			if (M.voice_message)
+			if (M.voice_message && (gl.z == cl.z))
 				heard_voice += R
 			else
 				heard_garbled += R
@@ -356,9 +358,7 @@
 
 		if (length(heard_garbled))
 			quotedmsg = M.say_quote(stars(message))
-			var/rendered = "[part_a][M.voice_name][part_b][quotedmsg][part_c]"
-			if(scramble)
-				rendered = "[part_a]Unknown[part_b][quotedmsg][part_c]"
+			var/rendered = "[part_a]Unknown[part_b][quotedmsg][part_c]"
 
 			for (var/mob/R in heard_garbled)
 				if(istype(R, /mob/living/silicon/ai))