conFLICTS

code/modules/mob/living/bloodcrawl.dm

@@ -18,12 +18,12 @@ obj/effect/dummy/slaughter/relaymove(mob/user, direction)
 	spawn(1)
 		src.canmove = 1
 
-/obj/effect/dummy/slaughter/ex_act(blah)
+/obj/effect/dummy/slaughter/ex_act()
 	return
-/obj/effect/dummy/slaughter/bullet_act(blah)
+/obj/effect/dummy/slaughter/bullet_act()
 	return
 
-/obj/effect/dummy/slaughter/singularity_act(blah)
+/obj/effect/dummy/slaughter/singularity_act()
 	return
 
 /obj/effect/dummy/slaughter/Destroy()

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

@@ -684,9 +684,6 @@
 		var/see_temp = H.see_invisible
 		H.see_invisible = invis_sight
 
-		if(H.seer)
-			H.see_invisible = SEE_INVISIBLE_OBSERVER
-
 		if(H.glasses)
 			if(istype(H.glasses, /obj/item/clothing/glasses))
 				var/obj/item/clothing/glasses/G = H.glasses

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

@@ -82,9 +82,12 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
 	return 1
 
 /datum/species/lizard/handle_speech(message)
-	// jesus christ why
+
 	if(copytext(message, 1, 2) != "*")
-		message = replacetext(message, "s", "sss")
+		message = regEx_replaceall(message, "(?<!s)s(?!s)", "sss") //(?<!s) Not s before. (?!s) not s after. That way it only triples a single s instead of double ss.
+		message = regEx_replaceall(message, "(?<!s)ss(?!s)", "ssss")
+		message = regEx_replaceall(message, "(?<!S)S(?!S)", "SSS")
+		message = regEx_replaceall(message, "(?<!S)SS(?!S)", "SSSS")
 
 	return message
 
@@ -163,6 +166,7 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H)
 	name = "???"
 	id = "shadow"
 	darksight = 8
+	invis_sight = SEE_INVISIBLE_MINIMUM
 	sexes = 0
 	ignored_by = list(/mob/living/simple_animal/hostile/faithless)
 	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/shadow

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

@@ -216,3 +216,7 @@
 			else
 				target.see_invisible = SEE_INVISIBLE_LIVING
 				name = "Toggle Nightvision \[OFF]"
+
+
+/mob/living/simple_animal/hostile/statue/sentience_act()
+	faction -= "neutral"

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

@@ -24,7 +24,7 @@
 	see_in_dark = 8
 	languages = ALL
 	response_help   = "passes through"
-	response_disarm = "swings at"
+	response_disarm = "swings through"
 	response_harm   = "punches through"
 	unsuitable_atmos_damage = 0
 	damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) //I don't know how you'd apply those, but revenants no-sell them anyway.

code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm

@@ -89,10 +89,9 @@
 	charge_max = 200
 	range = 5
 	stun = 30
-	reveal = 100
 	cast_amount = 40
 	var/shock_range = 2
-	var/shock_damage = 18
+	var/shock_damage = 20
 	action_icon_state = "overload_lights"
 
 /obj/effect/proc_holder/spell/aoe_turf/revenant/overload/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
@@ -217,7 +216,7 @@
 	desc = "Causes nearby living things to waste away."
 	charge_max = 200
 	range = 3
-	reveal = 60
+	reveal = 50
 	cast_amount = 50
 	unlock_amount = 200
 	action_icon_state = "blight"

code/modules/mob/living/simple_animal/revenant/revenant_blight.dm

@@ -37,7 +37,7 @@
 		stagedamage++
 		affected_mob.adjustToxLoss(stage*3) //should, normally, do about 45 toxin damage.
 		PoolOrNew(/obj/effect/overlay/temp/revenant, affected_mob.loc)
-	if(prob(45))
+	if(!finalstage && prob(45))
 		affected_mob.adjustStaminaLoss(stage*2)
 	..() //So we don't increase a stage before applying the stage damage.
 	switch(stage)

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

@@ -513,3 +513,7 @@
 		nest.spawned_mobs -= src
 	nest = null
 	return ..()
+
+
+/mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
+	return

code/modules/mob/mob_defines.dm

@@ -87,7 +87,6 @@
 	var/obj/item/r_hand = null//Living
 	var/obj/item/weapon/storage/s_active = null//Carbon
 
-	var/seer = 0 //for cult//Carbon, probably Human
 	var/see_override = 0 //0 for no override, sets see_invisible = see_override in mob life process
 
 	var/datum/hud/hud_used = null