Merge pull request #9747 from Ghommie/Ghommie-cit329

Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
This commit is contained in:
BlackMajor
2019-12-10 11:18:55 +13:00
committed by Archie
parent 5d80346f8f
commit 02cb328921
20 changed files with 4046 additions and 4044 deletions
+6 -6
View File
@@ -16,13 +16,13 @@
else
return
/mob/living/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE)
/mob/living/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE, atom/movable/source)
. = ..()
if(istype(speaker, /mob/living))
var/turf/speakturf = get_turf(speaker)
var/turf/sourceturf = get_turf(src)
if(istype(speakturf) && istype(sourceturf) && !(speakturf in get_hear(5, sourceturf)))
. = "<citspan class='small'>[.]</citspan>" //Don't ask how the fuck this works. It just does.
if(isliving(speaker))
var/turf/sourceturf = get_turf(source)
var/turf/T = get_turf(src)
if(sourceturf && T && !(sourceturf in get_hear(5, T)))
. = "<span class='small'>[.]</span>"
/mob/verb/eastshift()
set hidden = TRUE