ported fixes

stuff
vlggms · Feb 11, 2025 · 4830d1b · 4830d1b
1 parent 1e17fc6
commit 4830d1b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 11 deletions.
diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/blood_bath.dm b/code/modules/mob/living/simple_animal/abnormality/teth/blood_bath.dm
@@ -6,12 +6,14 @@
 	portrait = "blood_bath"
 	maxHealth = 1000
 	health = 1000
+	rapid_melee = 1
+	melee_queue_distance = 2
 	move_to_delay = 3
 	attack_sound = 'sound/abnormalities/ichthys/slap.ogg'
 	attack_verb_continuous = "mauls"
 	attack_verb_simple = "maul"
-	melee_damage_lower = 6
-	melee_damage_upper = 12
+	melee_damage_lower = 10
+	melee_damage_upper = 18
 	melee_damage_type = WHITE_DAMAGE
 	damage_coeff = list(RED_DAMAGE = 1.6, WHITE_DAMAGE = 1, BLACK_DAMAGE = 1.4, PALE_DAMAGE = 1.5)
 	ranged = TRUE
@@ -108,7 +110,7 @@
 		new /obj/effect/temp_visual/cult/sparks(L)
 	playsound(get_turf(src), 'sound/abnormalities/ichthys/jump.ogg', 100, FALSE, 6)
 	icon_state = "bloodbath_slamprepare"
-	SLEEP_CHECK_DEATH(12)
+	SLEEP_CHECK_DEATH(20)
 	for(var/turf/T in view(3, src))
 		var/obj/effect/temp_visual/small_smoke/halfsecond/FX =  new(T)
 		FX.color = "#b52e19"

diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/book.dm b/code/modules/mob/living/simple_animal/abnormality/teth/book.dm
@@ -111,7 +111,7 @@
 	. = ..()
 	if(!breaching)
 		return
-	if(summon_count > 15)
+	if(summon_count > 10)
 		qdel(src)
 		return
 	if((meltdown_cooldown < world.time) && !(status_flags & GODMODE))

diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/meat_lantern.dm b/code/modules/mob/living/simple_animal/abnormality/teth/meat_lantern.dm
@@ -147,14 +147,14 @@
 
 /mob/living/simple_animal/hostile/abnormality/meat_lantern/BreachEffect(mob/living/carbon/human/user, breach_type)
 	if(breach_type == BREACH_MINING)//as funny as it sounds, this abnormality would be unreachable
-		qdel(src)
-		return
+		sleep(10 SECONDS)
 	. = ..()
 	update_icon()
 	density = FALSE
 	med_hud_set_health() //hides medhud
 	med_hud_set_status()
-	forceMove(pick(GLOB.xeno_spawn))
+	if(breach_type != BREACH_MINING)
+		forceMove(pick(GLOB.xeno_spawn))
 	chop_cooldown = world.time + chop_cooldown_time
 	proximity_monitor = new(src, detect_range)
 	return

diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/fairy_festival.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/fairy_festival.dm
@@ -44,7 +44,7 @@
 	var/seek_cooldown
 	var/seek_cooldown_time = 10 SECONDS
 	var/summon_group_size = 6
-	var/summon_maximum = 14
+	var/summon_maximum = 0
 	var/eat_threshold = 0.8
 	abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY
 
@@ -97,7 +97,7 @@
 	. = ..()
 	if(protected_people.len)
 		FairyHeal()
-	if(summon_count > summon_maximum)
+	if(summon_count >= summon_maximum)
 		return
 	if((summon_cooldown < world.time) && !(status_flags & GODMODE))
 		SummonGuys(summon_type)
@@ -136,12 +136,13 @@
 /mob/living/simple_animal/hostile/abnormality/fairy_festival/BreachEffect(mob/living/carbon/human/user, breach_type)
 	if(breach_type == BREACH_PINK)
 		summon_cooldown_time = 20 SECONDS
+		summon_maximum = 15
 		SummonGuys(summon_type)
 	if(breach_type == BREACH_MINING)
 		can_breach = TRUE
 		summon_type = /mob/living/simple_animal/hostile/fairy_mass
 		summon_group_size = 1
-		summon_maximum = 3
+		summon_maximum = 4
 		SummonGuys(summon_type)
 		icon = 'ModularTegustation/Teguicons/96x48.dmi'
 		icon_state = "fairy_queen"

diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/oceanwaves.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/oceanwaves.dm
@@ -149,6 +149,9 @@
 /mob/living/simple_animal/hostile/abnormality/oceanicwaves/AttackingTarget()
 	return FALSE
 
+/mob/living/simple_animal/hostile/abnormality/oceanicwaves/Move()
+	return FALSE
+
 /obj/projectile/oceanic
 	name = "shaken can of 'Oceanic Waves' soda"
 	desc = "A shaken can of sketchy orange soda."

diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/oracle.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/oracle.dm
@@ -142,7 +142,7 @@
 			if(faction_check_mob(L))
 				continue
 			to_chat(L, span_userdanger("[chosenfake]"))
-		addtimer(CALLBACK(src, PROC_REF(NukeAttack)), 30 SECONDS)
+		addtimer(CALLBACK(src, PROC_REF(NukeAttack)), 90 SECONDS)
 	return ..()
 
 /mob/living/simple_animal/hostile/abnormality/oracle/proc/NukeAttack()

diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/wellcheers.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/wellcheers.dm
@@ -133,6 +133,9 @@
 /mob/living/simple_animal/hostile/abnormality/wellcheers/AttackingTarget()
 	return FALSE
 
+/mob/living/simple_animal/hostile/abnormality/wellcheers/Move()
+	return FALSE
+
 // Soda cans
 /obj/item/reagent_containers/food/drinks/soda_cans/wellcheers_red
 	name = "can of cherry 'Wellcheers' soda"