Added psyche jumpsuit for Asanadas

Expanded scrambled radio stuff.
This commit is contained in:
SkyMarshal
2012-01-03 00:06:25 -07:00
parent 120607828e
commit 9a651a5a84
3 changed files with 14 additions and 6 deletions
+2 -1
View File
@@ -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)
+7
View File
@@ -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
+5 -5
View File
@@ -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))