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

Raise Corpsespawner Limit #7389

Merged
merged 9 commits into from
Nov 7, 2024
Merged

Raise Corpsespawner Limit #7389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aefcfe2
stuff
BOBAMAx Oct 26, 2024
3cef0fe
corpsespawner additions and removals
BOBAMAx Oct 29, 2024
2ca4caa
science!
BOBAMAx Oct 29, 2024
be38163
Merge branch 'master' into corpse
BOBAMAx Oct 29, 2024
4573580
Merge branch 'master' into corpse
BOBAMAx Nov 1, 2024
a76292e
no more spacemen
BOBAMAx Nov 1, 2024
a8abefa
more stuff
BOBAMAx Nov 2, 2024
495db47
shotguns
BOBAMAx Nov 3, 2024
0eb6de5
Merge branch 'master' into corpse
BOBAMAx Nov 6, 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/controllers/subsystem/objectives_controller.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define CORPSES_TO_SPAWN 25
#define CORPSES_TO_SPAWN 100

SUBSYSTEM_DEF(objectives)
name = "Objectives"
Expand Down
12 changes: 8 additions & 4 deletions code/modules/objectives/mob_objectives.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
controller = TREE_MARINE
/// List of list of active corpses per tech-faction ownership
var/list/corpses = list()
var/list/scored_corpses = list()
var/list/scored_other_corpses = list()
var/list/scored_humansynth_corpses = list()

/datum/cm_objective/recover_corpses/New()
. = ..()
Expand Down Expand Up @@ -54,7 +55,7 @@
return

// This mob has already been scored before
if(LAZYISIN(scored_corpses, dead_mob))
if(LAZYISIN(scored_other_corpses, dead_mob) || LAZYISIN(scored_humansynth_corpses, dead_mob))
return

LAZYDISTINCTADD(corpses, dead_mob)
Expand Down Expand Up @@ -117,7 +118,7 @@
if(isqueen(X)) //Queen is Tier 0 for some reason...
value = OBJECTIVE_ABSOLUTE_VALUE

else if(ishumansynth_strict(target))
else if(ishumansynth_strict(target) && length(scored_humansynth_corpses) <= 49) // Limit human corpse recovery to 5 total points (.1 each)
return OBJECTIVE_LOW_VALUE

return value
Expand All @@ -141,7 +142,10 @@
award_points(corpse_val)

corpses -= target
scored_corpses += target
if(ishumansynth_strict(target))
scored_humansynth_corpses += target
else
scored_other_corpses += target

if (isxeno(target))
UnregisterSignal(target, COMSIG_XENO_REVIVED)
Expand Down
Loading
Loading