Fixed the rest of Tajspeak, radios now give a cue when someone talks into it, fixed throwing and tables, fixed bloodiness, fixed autofiring vars.

You can throw over tables again.
Fixed some bloodiness not being added.
Fixed some vars not being reset.
This commit is contained in:
SkyMarshal
2012-03-03 23:45:20 -07:00
parent 6ab370768b
commit 884fd25f78
7 changed files with 45 additions and 11 deletions
+12 -1
View File
@@ -190,7 +190,7 @@
if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
message_mode = "whisper"
if(src.stunned > 0 && (!(traumatic_shock > 61) && prob(50)))
if(src.stunned > 0 || (!(traumatic_shock > 61) && prob(50)))
message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it
@@ -365,6 +365,10 @@
if (M.client && M.client.ghost_ears)
listening|=M
var/list/eavesdroppers = get_mobs_in_view(7, src)
for(var/mob/M in listening)
eavesdroppers.Remove(M)
for (var/obj/O in ((W | contents)-used_radios))
W |= O
@@ -532,3 +536,10 @@
sleep(11)
del(B)
*/
if (length(eavesdroppers))
for (var/mob/M in eavesdroppers)
M << "\blue [src] speaks into their radio..."
M << speech_bubble
spawn(30) del(speech_bubble)
@@ -22,7 +22,7 @@
var/mob/living/carbon/human/H = src
alt_name = " (as [H.get_visible_name()])"
// Mute disability
if (src.sdisabilities & 2)
if (src.disabilities & 64)
return
if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))