From 4f31aa20c2ec849c70a6b624d4455a7b8caea2c4 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Fri, 7 Mar 2025 16:18:14 -0700 Subject: [PATCH] [MIRROR] Fixes rat health (#10331) Co-authored-by: Spades Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/_helpers/global_lists_vr.dm | 2 +- .../modules/gamemaster/event2/events/everyone/infestation.dm | 2 +- .../mob/living/simple_mob/subtypes/animal/passive/mouse.dm | 5 +++-- .../modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm | 2 +- modular_chomp/code/game/objects/mob_spawner.dm | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 7ccf05086c..5c165b39eb 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -915,7 +915,7 @@ var/global/list/event_wildlife_roaming = list( /mob/living/simple_mob/animal/passive/mouse/brown = 2, /mob/living/simple_mob/animal/passive/mouse/gray = 2, /mob/living/simple_mob/animal/passive/mouse/white = 2, - /mob/living/simple_mob/animal/passive/mouse/rat = 3), + /mob/living/simple_mob/animal/passive/mouse/rat/strong = 3), // CHOMPEdit list(/mob/living/simple_mob/animal/passive/bird/black_bird = 1, /mob/living/simple_mob/animal/passive/bird/azure_tit = 1, /mob/living/simple_mob/animal/passive/bird/european_robin = 1, diff --git a/code/modules/gamemaster/event2/events/everyone/infestation.dm b/code/modules/gamemaster/event2/events/everyone/infestation.dm index a8da58c11b..ad6ba56a29 100644 --- a/code/modules/gamemaster/event2/events/everyone/infestation.dm +++ b/code/modules/gamemaster/event2/events/everyone/infestation.dm @@ -37,7 +37,7 @@ /mob/living/simple_mob/animal/passive/mouse/brown, /mob/living/simple_mob/animal/passive/mouse/black, /mob/living/simple_mob/animal/passive/mouse/white, - /mob/living/simple_mob/animal/passive/mouse/rat + /mob/living/simple_mob/animal/passive/mouse/rat/strong // CHOMPEdit ) /datum/event2/event/infestation/lizards diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index 1cf67e14f5..4968bc3ff6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -170,11 +170,12 @@ icon_state = "mouse_rat" icon_rest = "mouse_rat_sleep" holder_type = /obj/item/holder/mouse/rat + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive + +/mob/living/simple_mob/animal/passive/mouse/rat/strong // In case you still want to be a jerk to your players for some reason. maxHealth = 20 health = 20 - ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive - /mob/living/simple_mob/animal/passive/mouse/operative name = "mouse operative" desc = "A cute mouse fitted with a custom blood red suit. Sneaky." diff --git a/code/modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm b/code/modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm index bfb22f979c..11328d49d5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm +++ b/code/modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm @@ -246,7 +246,7 @@ /obj/item/projectile/beam/mouselaser/ddraig/spawn_mob(var/mob/living/target) var/list/tf_list = list(/mob/living/simple_mob/animal/passive/mouse, - /mob/living/simple_mob/animal/passive/mouse/rat, + /mob/living/simple_mob/animal/passive/mouse/rat/strong, // CHOMPEdit /mob/living/simple_mob/vore/alienanimals/dustjumper, /mob/living/simple_mob/vore/woof, /mob/living/simple_mob/animal/passive/dog/corgi, diff --git a/modular_chomp/code/game/objects/mob_spawner.dm b/modular_chomp/code/game/objects/mob_spawner.dm index ff7364d3ff..7a5cdcacd4 100644 --- a/modular_chomp/code/game/objects/mob_spawner.dm +++ b/modular_chomp/code/game/objects/mob_spawner.dm @@ -35,7 +35,7 @@ spawn_types = list( /mob/living/simple_mob/animal/passive/mouse = 100, /mob/living/simple_mob/animal/passive/cockroach = 25, - /mob/living/simple_mob/animal/passive/mouse/rat = 10, // Because I'm a horrible person. <3 + /mob/living/simple_mob/animal/passive/mouse/rat/strong = 10, // Because I'm a horrible person. <3 /obj/effect/spider/spiderling/non_growing = 5) /obj/structure/mob_spawner/mouse_nest/mousehole/New()