Skip to content

Fix: Forsaken not getting their live human seeing TacMap #12240

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

Merged
realforest2001 merged 5 commits into from
May 19, 2026
Merged

Fix: Forsaken not getting their live human seeing TacMap #12240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a54f7a
ProbablyWorksWithTotallyNoIssuesWhyTestAnything
MistChristmas May 17, 2026
342469b
YeahThatHelps
MistChristmas May 17, 2026
833370a
UuuuuuuuhSureSureIKnowWhatI'mDoing
MistChristmas May 17, 2026
466ced7
Bleh
MistChristmas May 17, 2026
732f32c
SlightlyEmbarrassing
MistChristmas May 17, 2026
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/controllers/subsystem/minimap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ SUBSYSTEM_DEF(minimaps)
. = ..()

/datum/action/minimap/xeno/see_humans
minimap_flags = MINIMAP_FLAG_XENO|MINIMAP_FLAG_USCM|MINIMAP_FLAG_WY|MINIMAP_FLAG_WY|MINIMAP_FLAG_UPP
minimap_flags = MINIMAP_FLAG_CLF|MINIMAP_FLAG_USCM|MINIMAP_FLAG_WY|MINIMAP_FLAG_PMC|MINIMAP_FLAG_UPP

/datum/action/minimap/xeno/action_activate()
var/mob/living/carbon/xenomorph/xeno = owner
Expand Down
22 changes: 16 additions & 6 deletions code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,10 +529,14 @@

if(hive.hivenumber != XENO_HIVE_NORMAL)
remove_verb(src, /mob/living/carbon/xenomorph/verb/view_tacmaps)
minimap_ref = WEAKREF(new minimap_type(hive_number=hive.hivenumber))
var/datum/action/minimap/ref = minimap_ref.resolve()
ref.give_to(src, ref)
RegisterSignal(hive, COMSIG_XENO_REVEAL_TACMAP, PROC_REF(update_minimap_see_humans))

if(hive.hivenumber == XENO_HIVE_FORSAKEN)
update_minimap_see_humans()
else
minimap_ref = WEAKREF(new minimap_type(hive_number=hive.hivenumber))
var/datum/action/minimap/ref = minimap_ref.resolve()
ref.give_to(src, ref)
RegisterSignal(hive, COMSIG_XENO_REVEAL_TACMAP, PROC_REF(update_minimap_see_humans))

creation_time = world.time

Expand All @@ -542,11 +546,14 @@
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_XENO_SPAWN, src)

/mob/living/carbon/xenomorph/proc/update_minimap_see_humans()
var/datum/action/minimap/ref = minimap_ref.resolve()
ref.remove_from(src)
var/datum/action/minimap/ref
if(minimap_ref)
ref = minimap_ref.resolve()
ref.remove_from(src)

minimap_ref = WEAKREF(new /datum/action/minimap/xeno/see_humans)
ref = minimap_ref.resolve()
ref.minimap_flags |= get_minimap_flag_for_faction(hive.hivenumber)
ref.give_to(src, ref)

/mob/living/carbon/xenomorph/proc/handle_screech_act(mob/self, mob/living/carbon/xenomorph/queen/queen)
Expand Down Expand Up @@ -890,6 +897,9 @@
for(var/trait in new_hive.hive_inherited_traits)
ADD_TRAIT(src, trait, TRAIT_SOURCE_HIVE)

if(new_hivenumber == XENO_HIVE_FORSAKEN)
update_minimap_see_humans()

generate_name()

lock_evolve = FALSE
Expand Down
Loading