From f2351e4bd08c366440a1e36c3d2ee4d0646bd313 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Wed, 27 Apr 2022 07:06:56 +1000
Subject: [PATCH] Adds Zaddat Autohiss trait

---
 code/modules/mob/living/autohiss.dm           |  4 +--
 .../species/station/traits_vr/neutral.dm      | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/living/autohiss.dm b/code/modules/mob/living/autohiss.dm
index a51616a56f0..bc5a48deb38 100644
--- a/code/modules/mob/living/autohiss.dm
+++ b/code/modules/mob/living/autohiss.dm
@@ -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)
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index b0d9b664404..e8b5b4d9b33 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -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"