cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes rat health (#10331)

Browse Source 
Co-authored-by: Spades <SpadesNeil@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-07 16:18:14 -07:00
committed by GitHub
parent 3519f55e79
commit 4f31aa20c2
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_helpers/global_lists_vr.dm
View File

@@ -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,

2
code/modules/gamemaster/event2/events/everyone/infestation.dm
View File

@@ -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

5
code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
View File

@@ -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."

2
code/modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm
View File

@@ -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,

2
modular_chomp/code/game/objects/mob_spawner.dm
View File

@@ -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()