cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Saycode Overhaul -- Multilingualism

Browse Source
This commit is contained in:
ShadowLarkens
2020-04-20 01:11:53 -07:00
committed by VirgoBot
parent 583472d42e
commit 139d5cd3c3
70 changed files with 1742 additions and 2641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/xenobio2/mob/xeno procs.dm
View File

@@ -112,7 +112,11 @@ Divergence proc, used in mutation to make unique datums.
/mob/living/simple_mob/xeno/proc/RandomizeTraits()
return
<<<<<<< HEAD
/mob/living/simple_mob/xeno/hear_say(var/message, var/verb = "says", var/datum/language/language, var/alt_name = "",var/italics = 0, var/mob/speaker = null)
=======
/mob/living/simple_animal/xeno/hear_say(var/message, var/verb = "says", var/datum/language/language, var/italics = 0, var/mob/speaker = null)
>>>>>>> 54a8a58... Saycode Overhaul -- Multilingualism (#6956)
if(traitdat.traits[TRAIT_XENO_CANLEARN])
/*
Until this gets sorted out to a functioning point, or waiting on Psi's saycode update.
@@ -128,7 +132,7 @@ Divergence proc, used in mutation to make unique datums.
*/
if(!(message in speak))
speech_buffer.Add(message)
..(message,verb,language,alt_name,italics,speaker)
..(message,verb,language,italics,speaker)
/mob/living/simple_mob/xeno/proc/ProcessSpeechBuffer()
if(speech_buffer.len)