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

Merge pull request #13352 from timothyteakettle/fix-accents-but-pushed-this-time

Browse Source 
lets ipcs talk but i actually push my changes this time
This commit is contained in:
Putnam3145
2020-09-05 08:40:31 -07:00
committed by GitHub
parent 3e7b8eb78c f9bb245acc
commit d6127d71a8
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/accents.dm
+7 -8
View File
@@ -78,23 +78,22 @@
speech_args[SPEECH_MESSAGE] = lowertext(message)
return speech_args
/datum/accent/bone
/datum/accent/span
var/span_flag
/datum/accent/bone/modify_speech(list/speech_args)
speech_args[SPEECH_SPANS] = span_flag
/datum/accent/span/modify_speech(list/speech_args)
speech_args[SPEECH_SPANS] |= span_flag
return speech_args
//bone tongues either have the sans accent or the papyrus accent
/datum/accent/bone/sans
/datum/accent/span/sans
span_flag = SPAN_SANS
/datum/accent/bone/papyrus
/datum/accent/span/papyrus
span_flag = SPAN_PAPYRUS
/datum/accent/robot/modify_speech(list/speech_args)
speech_args[SPEECH_SPANS] = SPAN_ROBOT
return speech_args
/datum/accent/span/robot
span_flag = SPAN_ROBOT
/datum/accent/dullahan/modify_speech(list/speech_args, datum/source, mob/living/carbon/owner)
if(owner)
code/modules/surgery/organs/tongue.dm
+2 -2
View File
@@ -163,7 +163,7 @@
maxHealth = 75 //Take brute damage instead
var/chattering = FALSE
var/phomeme_type = "sans"
var/list/phomeme_types = list(/datum/accent/bone/sans, /datum/accent/bone/papyrus)
var/list/phomeme_types = list(/datum/accent/span/sans, /datum/accent/span/papyrus)
/obj/item/organ/tongue/bone/Initialize()
. = ..()
@@ -197,7 +197,7 @@
icon_state = "tonguerobot"
say_mod = "states"
attack_verb = list("beeped", "booped")
initial_accents = list(/datum/accent/robot)
initial_accents = list(/datum/accent/span/robot)
taste_sensitivity = 25 // not as good as an organic tongue
maxHealth = 100 //RoboTongue!
var/electronics_magic = TRUE