cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Worn ID won't display on station-bounced broadcasts. Fixed #4650

Browse Source
This commit is contained in:
Miauw
2014-09-03 20:30:40 +02:00
parent a0bf1cb7f4
commit 64c95a2fae
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/radio.dm
+7 -9
View File
@@ -245,7 +245,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
//#### Tagging the signal with all appropriate identity values ####//
// ||-- The mob's name identity --||
var/displayname = M.name // grab the display name (name you get when you hover over someone's icon)
var/real_name = M.name // mob's real name
var/mobkey = "none" // player key associated with mob
var/voicemask = 0 // the speaker is wearing a voice mask
@@ -265,7 +264,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
var/datum/data/record/findjob = find_record("name", voice, data_core.general)
if(voice != real_name)
displayname = voice
voicemask = 1
if(findjob)
jobname = findjob.fields["rank"]
@@ -310,7 +308,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
"mob" = M, // store a reference to the mob
"mobtype" = M.type, // the mob's type
"realname" = real_name, // the mob's real name
"name" = voice, // the mob's display name
"name" = voice, // the mob's voice name
"job" = jobname, // the mob's job
"key" = mobkey, // the mob's key
"vmask" = voicemask, // 1 if the mob is using a voice gas mask
@@ -356,17 +354,17 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
/* --- Try to send a normal subspace broadcast first */
signal.data = list(
"mob" = M, // store a reference to the mob
"mob" = M, // store a reference to the mob
"mobtype" = M.type, // the mob's type
"realname" = real_name, // the mob's real name
"name" = displayname, // the mob's display name
"name" = voice, // the mob's voice name
"job" = jobname, // the mob's job
"key" = mobkey, // the mob's key
"vmask" = voicemask, // 1 if the mob is using a voice gas mas
"compression" = 0, // uncompressed radio signal
"message" = message, // the actual sent message
"radio" = src, // stores the radio used for transmission
"compression" = 0, // uncompressed radio signal
"message" = message, // the actual sent message
"radio" = src, // stores the radio used for transmission
"slow" = 0,
"traffic" = 0,
"type" = 0,
@@ -388,7 +386,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
// Oh my god; the comms are down or something because the signal hasn't been broadcasted yet in our level.
// Send a mundane broadcast with limited targets:
Broadcast_Message(M, voicemask,
src, message, displayname, jobname, real_name,
src, message, voice, jobname, real_name,
filter_type, signal.data["compression"], list(position.z), freq)
/obj/item/device/radio/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq)
code/modules/mob/living/carbon/human/say.dm
+1 -1
View File
@@ -52,7 +52,7 @@
if(V.vchange)
return V.voice
else
return name
return real_name
if(mind && mind.changeling && mind.changeling.mimicing)
return mind.changeling.mimicing
if(GetSpecialVoice())