Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simple animals don't block projectiles after death anymore #6522

Merged
merged 2 commits into from
Jun 22, 2024
Merged

Simple animals don't block projectiles after death anymore #6522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b64bfb
init
ihatethisengine Jun 21, 2024
5ba1758
erm
ihatethisengine Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/mobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,5 +380,6 @@ GLOBAL_LIST_INIT(default_xeno_onmob_icons, list(
#define MOBILITY_LIEDOWN (1<<8)

#define MOBILITY_FLAGS_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND)
#define MOBILITY_FLAGS_LYING_CAPABLE_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_LIEDOWN)
#define MOBILITY_FLAGS_CARBON_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_REST | MOBILITY_LIEDOWN)
#define MOBILITY_FLAGS_REST_CAPABLE_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_REST | MOBILITY_LIEDOWN)
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/friendly/mouse.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
src.icon_dead = "mouse_[body_color]_splat"
src.icon_state = "mouse_[body_color]_splat"
layer = ABOVE_LYING_MOB_LAYER
set_body_position(LYING_DOWN)
if(client)
client.time_died_as_mouse = world.time

Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/simple_animal/simple_animal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
black_market_value = 25
dead_black_market_value = 0

mobility_flags = MOBILITY_FLAGS_LYING_CAPABLE_DEFAULT

/mob/living/simple_animal/Initialize()
. = ..()
SSmob.living_misc_mobs += src
Expand Down Expand Up @@ -210,6 +212,7 @@
SSmob.living_misc_mobs -= src
icon_state = icon_dead
black_market_value = dead_black_market_value
set_body_position(LYING_DOWN)


/mob/living/simple_animal/gib(datum/cause_data/cause = create_cause_data("gibbing", src))
Expand Down
Loading