Revert #4504 & #4496

code/modules/client/preference_setup/loadout/loadout_general.dm

@@ -104,21 +104,3 @@
 /datum/gear/towel/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
-
-/datum/gear/guns
-	display_name = "gun selection"
-	path = /obj/item/weapon/gun/bang/revolver
-
-/datum/gear/guns/New()
-	..()
-	var/dakka = list()
-	dakka[".357 revolver"] = /obj/item/weapon/gun/bang/revolver
-	dakka[".45 pistol"] = /obj/item/weapon/gun/bang/colt
-	dakka["automatic .45 pistol"] = /obj/item/weapon/gun/bang/x9
-	dakka["10mm pistol"] = /obj/item/weapon/gun/bang/tanto
-	dakka["silenced pistol"] = /obj/item/weapon/gun/bang/silenced
-	dakka[".50 magnum pistol"] = /obj/item/weapon/gun/bang/deagle
-	dakka["golden.50 magnum pistol"] = /obj/item/weapon/gun/bang/deagle/gold
-	dakka["9mm pistol"] = /obj/item/weapon/gun/bang/pistol
-	dakka["zip gun"] = /obj/item/weapon/gun/bang/pirate
-	gear_tweaks += new/datum/gear_tweak/path(dakka)

code/modules/mob/abstract/new_player/sprite_accessories.dm

@@ -391,7 +391,7 @@
 	braid
 		name = "Floorlength Braid"
 		icon_state = "hair_braid"
-		species_allowed = list("Human", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Skrell", "Vox")
+		gender = FEMALE
 
 	mbraid
 		name = "Medium Braid"

code/modules/mob/language/station.dm

@@ -70,7 +70,7 @@
 	name = LANGUAGE_SIGN_TAJARA
 	desc = "A sign language developed by Adhomai hunters"
 	speech_verb = "signs"
-	signlang_verb = list("licks their paw", "lewdly gestures", "gives big kitty eyes")
+	signlang_verb = list("signs", "flicks their ears", "gestures")
 	colour = "i"
 	key = "i"
 	flags = NO_STUTTER | SIGNLANG | WHITELISTED
@@ -78,25 +78,31 @@
 /datum/language/siik_tajr
 	name = LANGUAGE_SIIK_TAJR
 	desc = "A language native to the tajaran, it employes both verbal and non-verbal elements."
-	speech_verb = "purrs"
-	ask_verb = "begs"
-	exclaim_verb = "hisses"
+	speech_verb = "mrowls"
+	ask_verb = "mrowls"
+	exclaim_verb = "yowls"
 	signlang_verb = list("signs", "flicks their ears", "gestures")
 	colour = "tajaran_signlang"
 	key = "w"
 	flags = WHITELISTED | NONVERBAL
-	syllables = list("meow")
+	syllables = list("mrr","rr","tajr","kir","raj","kii","mir","kra","ahk","nal","vah","khaz","jri","ran","darr",
+	"mi","jri","dynh","manq","rhe","zar","rrhaz","kal","chur","eech","thaa","dra","jurl","mah","sanu","dra","ii'r",
+	"ka","aasi","far","wa","baq","ara","qara","zir","sam","mak","hrar","nja","rir","khan","jun","dar","rik","kah",
+	"hal","ket","jurl","mah","tul","cresh","azu","ragh","mro","mra","mrro","mrra")
 
 /datum/language/yassa
 	name = LANGUAGE_YA_SSA
 	desc = "The traditional language of the tajaran nobility."
-	speech_verb = "purrs"
-	ask_verb = "begs"
-	exclaim_verb = "hisses"
+	speech_verb = "mrowls"
+	ask_verb = "mrowls"
+	exclaim_verb = "yowls"
 	colour = "yassa"
 	key = "r"
 	flags = WHITELISTED
-	syllables = list("meow")
+	syllables = list("hrr","rhr","tarj","khir","rajh","kir","mier","kre","ahek","nlhal","veh","khaz","dri","rhan","darrer",
+	"mi","jhri","dynher","manqi","rhas","shar","drhaz","kalh","shur","echi","tha","draer","jurl","maher","sanii","dra","ii'r",
+	"kan","aesi","fare","we","bash","arha","quara","zhir","sem","make","hrer","nja","rir","can","jhun","dar","rik","kah",
+	"hal","kete","juril","mah","tul","cresh","azu","ragh","miro","mara","mrero","mrara")
 
 /datum/language/skrell
 	name = LANGUAGE_SKRELLIAN

code/modules/mob/living/carbon/carbon.dm

@@ -256,7 +256,7 @@
 			if(show_ssd && !client && !teleop)
 				M.visible_message("<span class='notice'>[M] shakes [src] trying to wake [t_him] up!</span>", \
 				"<span class='notice'>You shake [src], but they do not respond... Maybe they have S.S.D?</span>")
-			else if((!istajara(src) && lying) || src.sleeping)
+			else if(lying || src.sleeping)
 				src.sleeping = max(0,src.sleeping-5)
 				if(src.sleeping == 0)
 					src.resting = 0

code/modules/mob/living/carbon/human/species/species.dm

@@ -317,19 +317,8 @@
 		if(FEMALE)
 			t_him = "her"
 
-	if(istajara(target) && target.health >= 90)
-		if(!target.lying)
-			H.visible_message("<span class='notice'>[target] drops to the floor and purrs from [H]'s vigorous petting!</span>")
-			target.custom_emote(2,"purrs!")
-		else
-			H.visible_message("<span class='notice'>[H] belly rubs [target]!</span>")
-			target.custom_emote(2,"purrs and kneads at the air!")
-		playsound(target.loc, 'sound/voice/cat_purr.ogg', 100, 1, 0)
-		target.Stun(3)
-
-	else
-		H.visible_message("<span class='notice'>[H] hugs [target] to make [t_him] feel better!</span>", \
-						"<span class='notice'>You hug [target] to make [t_him] feel better!</span>")
+	H.visible_message("<span class='notice'>[H] hugs [target] to make [t_him] feel better!</span>", \
+					"<span class='notice'>You hug [target] to make [t_him] feel better!</span>")
 
 /datum/species/proc/remove_inherent_verbs(var/mob/living/carbon/human/H)
 	if(inherent_verbs)

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -168,7 +168,7 @@
 
 	primitive_form = "Farwa"
 
-	spawn_flags = CAN_JOIN
+	spawn_flags = CAN_JOIN | IS_WHITELISTED
 	appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
 
 	flesh_color = "#AFA59E"

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -199,22 +199,7 @@
 				cube.Expand()
 
 /datum/reagent/water/touch_mob(var/mob/M, var/amount)
-
 	if(istype(M) && isliving(M))
-
-		var/mob/living/carbon/H = M
-		if(istype(H) && istajara(H))
-			H.adjustHalLoss(5)
-			H.custom_emote(2,"hisses!")
-			playsound(H.loc, 'sound/voice/cat_scream.ogg', 100, 1, 0)
-			shake_camera(H,1)
-			H.visible_message("<span class='warning'>[H] jumps at the water's touch!</span>")
-			H.make_dizzy(120)
-			if(isturf(H.loc) && !istype(M.loc, /turf/space) && H.canmove && !H.restrained())
-				step(H, pick(cardinal))
-				step(H, pick(cardinal))
-				step(H, pick(cardinal))
-
 		var/mob/living/L = M
 		var/needed = L.fire_stacks * 10
 		if(amount > needed)