Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

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

@@ -39,6 +39,19 @@
 	restraint_check = TRUE
 	emote_type = EMOTE_AUDIBLE
 
+/datum/emote/living/carbon/human/mawp
+	key = "mawp"
+	key_third_person = "mawps"
+	message = "mawps annoyingly."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/carbon/human/mawp/run_emote(mob/living/user, params)
+	. = ..()
+	if(.)
+		if(ishuman(user))
+			if(prob(10))
+				user.adjustEarDamage(-5, -5)
+
 /datum/emote/living/carbon/human/mumble
 	key = "mumble"
 	key_third_person = "mumbles"

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

@@ -18,6 +18,16 @@
 	var/list/obscured = check_obscured_slots()
 	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
 
+	if(ishuman(src)) //user just returned, y'know, the user's own species. dumb.
+		var/mob/living/carbon/human/H = src
+		var/datum/species/pref_species = H.dna.species
+		if(get_visible_name() == "Unknown") // same as flavor text, but hey it works.
+			msg += "You can't make out what species they are.\n"
+		else if(skipface)
+			msg += "You can't make out what species they are.\n"
+		else
+			msg += "[t_He] [t_is] a [H.dna.custom_species ? H.dna.custom_species : pref_species.name]!\n"
+
 	//uniform
 	if(w_uniform && !(SLOT_W_UNIFORM in obscured))
 		//accessory

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

@@ -50,6 +50,8 @@
 
 	var/nameless = FALSE //For drones of both the insectoid and robotic kind. And other types of nameless critters.
 
+	var/custom_species = null
+
 	var/datum/personal_crafting/handcrafting
 	var/datum/physiology/physiology
 

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

@@ -1,9 +1,14 @@
 /mob/living/carbon/human/say_mod(input, message_mode)
 	verb_say = dna.species.say_mod
-	if(slurring)
-		return "slurs"
-	else
-		. = ..()
+	switch(slurring)
+		if(25 to 50)
+			return "jumbles"
+		if(50 to 75)
+			return "slurs"
+		if(75 to INFINITY)
+			return "garbles"
+		else
+			. = ..()
 
 /mob/living/carbon/human/treat_message(message)
 	message = dna.species.handle_speech(message,src)

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

@@ -532,7 +532,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 		stuttering = max(stuttering-1, 0)
 
 	if(slurring)
-		slurring = max(slurring-1,0)
+		slurring = max(slurring-1,0,drunkenness)
 
 	if(cultslurring)
 		cultslurring = max(cultslurring-1, 0)
@@ -550,16 +550,11 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 		drunkenness = max(drunkenness - (drunkenness * 0.04), 0)
 		if(drunkenness >= 6)
 			SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "drunk", /datum/mood_event/drunk)
-			if(prob(25))
-				slurring += 2
 			jitteriness = max(jitteriness - 3, 0)
 			if(has_trait(TRAIT_DRUNK_HEALING))
 				adjustBruteLoss(-0.12, FALSE)
 				adjustFireLoss(-0.06, FALSE)
 
-		if(drunkenness >= 11 && slurring < 5)
-			slurring += 1.2
-
 		if(mind && (mind.assigned_role == "Scientist" || mind.assigned_role == "Research Director"))
 			if(SSresearch.science_tech)
 				if(drunkenness >= 12.9 && drunkenness <= 13.8)

code/modules/mob/living/say.dm

@@ -334,7 +334,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		message = stutter(message)
 
 	if(slurring)
-		message = slur(message)
+		message = slur(message,slurring)
 
 	if(cultslurring)
 		message = cultslur(message)

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -345,13 +345,18 @@
 
 /mob/living/simple_animal/hostile/proc/AttackingTarget()
 	in_melee = TRUE
-	if(isliving(target))
-		var/mob/living/L = target
-		if(L.Adjacent(src) && vore_active && L.devourable) // aggressive check to ensure vore attacks can be made
-			if(prob(voracious_chance))
-				vore_attack(src,L,src)
+	if(vore_active)
+		if(isliving(target))
+			var/mob/living/L = target
+			if(L.Adjacent(src) && L.devourable) // aggressive check to ensure vore attacks can be made
+				if(prob(voracious_chance))
+					vore_attack(src,L,src)
+				else
+					return L.attack_animal(src)
 			else
-				return L.attack_animal(src)
+				return L.attack_animal(src) //literally every single fucking one of these need this I guess.
+		else
+			return target.attack_animal(src)
 	else
 		return target.attack_animal(src)
 

code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm

@@ -187,12 +187,12 @@
 		var/mob/living/carbon/C = L
 		var/obj/item/clothing/S = C.get_item_by_slot(SLOT_WEAR_SUIT)
 		if(S && S.resistance_flags & GOLIATH_RESISTANCE)
-			L.Stun(75)
+			L.Stun(25)
 		else if(S && S.resistance_flags & GOLIATH_WEAKNESS)
-			L.Stun(125)
+			L.Stun(115)
 		else
-			L.Stun(100)
-		L.adjustBruteLoss(rand(10,15))
+			L.Stun(75)
+		L.adjustBruteLoss(rand(15,20)) // Less stun more harm
 		latched = TRUE
 	if(!latched)
 		retract()