shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12164 from Ghommie/Ghommie-cit733

Browse Source 
Porting "Refactors language holder"
This commit is contained in:
kevinz000
2020-05-10 14:16:42 -07:00
committed by GitHub
parent 6b9fc7eccf 2858ddd90b
commit 1cf2311930
62 changed files with 592 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/tongue.dm
+4 -4
View File
@@ -64,8 +64,8 @@
owner.RegisterSignal(owner, COMSIG_MOB_SAY, /mob/living/carbon/.proc/handle_tongueless_speech)
return ..()
/obj/item/organ/tongue/could_speak_in_language(datum/language/dt)
return is_type_in_typecache(dt, languages_possible)
/obj/item/organ/tongue/could_speak_language(language)
return is_type_in_typecache(language, languages_possible)
/obj/item/organ/tongue/lizard
name = "forked tongue"
@@ -141,7 +141,7 @@
/obj/item/organ/tongue/abductor/handle_speech(datum/source, list/speech_args)
//Hacks
var/message = speech_args[SPEECH_MESSAGE]
var/mob/living/carbon/human/user = usr
var/mob/living/carbon/human/user = source
var/rendered = "<span class='abductor'><b>[user.name]:</b> [message]</span>"
user.log_talk(message, LOG_SAY, tag="abductor")
for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
@@ -260,7 +260,7 @@
maxHealth = 100 //RoboTongue!
var/electronics_magic = TRUE
/obj/item/organ/tongue/robot/can_speak_in_language(datum/language/dt)
/obj/item/organ/tongue/robot/could_speak_language(language)
return ..() || electronics_magic
/obj/item/organ/tongue/robot/handle_speech(datum/source, list/speech_args)