diff --git a/code/datums/mind.dm b/code/datums/mind.dm index cb1ee856b1c..2f22e58d37b 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -47,7 +47,6 @@ var/miming = 0 // Mime's vow of silence var/list/antag_datums - var/speech_span // What span any body this mind has talks in. var/datum/changeling/changeling //changeling holder var/linglink var/datum/vampire/vampire //vampire holder @@ -65,8 +64,6 @@ var/isblessed = FALSE // is this person blessed by a chaplain? var/num_blessed = 0 // for prayers - // the world.time since the mob has been brigged, or -1 if not at all - var/brigged_since = -1 var/suicided = FALSE //put this here for easier tracking ingame @@ -1593,25 +1590,6 @@ L = agent_landmarks[team] H.forceMove(L.loc) - -// check whether this mind's mob has been brigged for the given duration -// have to call this periodically for the duration to work properly -/datum/mind/proc/is_brigged(duration) - var/turf/T = current.loc - if(!istype(T)) - brigged_since = -1 - return 0 - - var/is_currently_brigged = current.is_in_brig() - if(!is_currently_brigged) - brigged_since = -1 - return 0 - - if(brigged_since == -1) - brigged_since = world.time - - return (duration <= world.time - brigged_since) - /datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S) spell_list += S S.action.Grant(current) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 941e90a31ef..c6fa7b20c66 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -33,8 +33,6 @@ if(H && H.mind && H.mind.miming) to_chat(user, "Your vow of silence prevents you from speaking.") return - if(H.mind) - span = H.mind.speech_span if((COMIC in H.mutations) || H.get_int_organ(/obj/item/organ/internal/cyberimp/brain/clown_voice)) span = "sans" if(spamcheck) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 65b4585ff6b..01a9990ebd8 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -134,8 +134,6 @@ S.message = "[S.message]" verb = translator.speech_verb return list("verb" = verb) - if(mind) - span = mind.speech_span if((COMIC in mutations) \ || (locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in internal_organs) \ || HAS_TRAIT(src, TRAIT_JESTER))