cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

preventions and fixes (#15726)

Browse Source
This commit is contained in:
Qwertytoforty
2021-04-05 12:46:43 -04:00
committed by GitHub
parent ea38c69633
commit e2793017bc
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/vocal_cords.dm
+7 -1
View File
@@ -112,6 +112,9 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
if(check_flags & AB_CHECK_CONSCIOUS)
if(owner.stat)
return FALSE
if(istype(owner.loc, /obj/effect/dummy/spell_jaunt))
to_chat(owner, "<span class='warning'>No one can hear you when you are jaunting, no point in talking now!</span>")
return FALSE
return TRUE
/datum/action/item_action/organ_action/colossus/Trigger()
@@ -139,12 +142,15 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
return FALSE
if(owner.stat)
return FALSE
if(istype(owner.loc, /obj/effect/dummy/spell_jaunt))
to_chat(owner, "<span class='warning'>No one can hear you when you are jaunting, no point in talking now!</span>")
return FALSE
return TRUE
/obj/item/organ/internal/vocal_cords/colossus/handle_speech(message)
spans = "colossus yell" //reset spans, just in case someone gets deculted or the cords change owner
if(iscultist(owner))
spans += " narsiesmall"
spans += "narsiesmall"
return "<span class=\"[spans]\">[uppertext(message)]</span>"
/obj/item/organ/internal/vocal_cords/colossus/speak_with(message)