cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 18:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12843 from Heroman3003/zaddat-autohiss

Browse Source 
Adds Zaddat Autohiss trait
This commit is contained in:
Casey
2022-04-26 18:00:39 -04:00
committed by GitHub
parent 6aa6c45620 90f56a7ce2
commit 887dca3183
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/autohiss.dm
View File

@@ -53,7 +53,7 @@
autohiss_basic_map = list(
"r" = list("rr", "rrr", "rrrr")
)
autohiss_exempt = list(LANGUAGE_SIIK,LANGUAGE_AKHANI)
autohiss_exempt = list(LANGUAGE_SIIK,LANGUAGE_AKHANI,LANGUAGE_ALAI)
/datum/species/zaddat
autohiss_basic_map = list(
@@ -66,7 +66,7 @@
"ci" = list("z", "zz"),
"v" = list("vv", "vvv")
)
autohiss_exempt = list(LANGUAGE_ZADDAT)
autohiss_exempt = list(LANGUAGE_ZADDAT,LANGUAGE_VESPINAE)
/datum/species/proc/handle_autohiss(message, datum/language/lang, mode)
if(!autohiss_basic_map)

26
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
View File

@@ -48,9 +48,9 @@
autohiss_extra_map = list(
"x" = list("ks", "kss", "ksss")
),
autohiss_exempt = list("Sinta'unathi"))
autohiss_exempt = list(LANGUAGE_UNATHI))
excludes = list(/datum/trait/neutral/autohiss_tajaran)
excludes = list(/datum/trait/neutral/autohiss_tajaran, /datum/trait/neutral/autohiss_zaddat)
/datum/trait/neutral/autohiss_tajaran
name = "Autohiss (Tajaran)"
@@ -60,8 +60,26 @@
autohiss_basic_map = list(
"r" = list("rr", "rrr", "rrrr")
),
autohiss_exempt = list("Siik"))
excludes = list(/datum/trait/neutral/autohiss_unathi)
autohiss_exempt = list(LANGUAGE_SIIK,LANGUAGE_AKHANI,LANGUAGE_ALAI))
excludes = list(/datum/trait/neutral/autohiss_unathi, /datum/trait/neutral/autohiss_zaddat)
/datum/trait/neutral/autohiss_zaddat
name = "Autohiss (Zaddat)"
desc = "You buzz your S's and F's."
cost = 0
var_changes = list(
autohiss_basic_map = list(
"f" = list("v","vh"),
"ph" = list("v", "vh")
),
autohiss_extra_map = list(
"s" = list("z", "zz", "zzz"),
"ce" = list("z", "zz"),
"ci" = list("z", "zz"),
"v" = list("vv", "vvv")
),
autohiss_exempt = list(LANGUAGE_ZADDAT,LANGUAGE_VESPINAE))
excludes = list(/datum/trait/neutral/autohiss_tajaran, /datum/trait/neutral/autohiss_unathi)
/datum/trait/neutral/bloodsucker
name = "Bloodsucker, Obligate"