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

Blob zombie fixes #5292

Merged
merged 3 commits into from
Feb 4, 2025
Merged

Blob zombie fixes #5292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04ca128
Blob Zombies Appear Correctly (#81485)
IndieanaJones Feb 16, 2024
62639f2
Blob delta now spawns non-ghost controllable spores (#85078)
SmArtKar Jul 19, 2024
d13f7e7
[NO GBP] Post-round blob zombies no longer offer themselves to ghosts…
Rhials Apr 9, 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
2 changes: 1 addition & 1 deletion code/modules/antagonists/blob/overmind.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
if(live_guy.stat != DEAD)
live_guy.investigate_log("has died from blob takeover.", INVESTIGATE_DEATHS)
live_guy.death()
create_spore(guy_turf)
create_spore(guy_turf, spore_type = /mob/living/basic/blob_minion/spore)
else
live_guy.fully_heal()

Expand Down
9 changes: 5 additions & 4 deletions code/modules/mob/living/basic/blob_minions/blob_zombie.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
. = ..()
death()

/mob/living/basic/blob_minion/zombie/update_overlays()
. = ..()
//Sets up our appearance
/mob/living/basic/blob_minion/zombie/proc/set_up_zombie_appearance()
copy_overlays(corpse, TRUE)
var/mutable_appearance/blob_head_overlay = mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "blob_head")
blob_head_overlay.color = LAZYACCESS(atom_colours, FIXED_COLOUR_PRIORITY) || COLOR_WHITE
color = initial(color) // reversing what our component did lol, but we needed the value for the overlay
. += blob_head_overlay
overlays += blob_head_overlay

/// Create an explosion of spores on death
/mob/living/basic/blob_minion/zombie/proc/death_burst()
Expand All @@ -71,6 +71,7 @@
new_corpse.forceMove(src)
corpse = new_corpse
update_appearance(UPDATE_ICON)
set_up_zombie_appearance()
RegisterSignal(corpse, COMSIG_LIVING_REVIVE, PROC_REF(on_corpse_revived))

/// Dynamic changeling reentry
Expand All @@ -84,7 +85,7 @@

/mob/living/basic/blob_minion/zombie/controlled/consume_corpse(mob/living/carbon/human/new_corpse)
. = ..()
if (!isnull(client))
if (!isnull(client) || SSticker.current_state == GAME_STATE_FINISHED)
return
AddComponent(\
/datum/component/ghost_direct_control,\
Expand Down
Loading