Skip to content

Lone Op's Antag Cap Fix #5735

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
merged 4 commits into from
Mar 3, 2025
Merged

Lone Op's Antag Cap Fix #5735

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5d9e51
fixes lone op cap override
Coll6 Mar 1, 2025
185046e
Merge branch 'master' into loneop
Coll6 Mar 1, 2025
a8424a4
Merge branch 'master' into loneop
Coll6 Mar 1, 2025
58ec3a4
fixes potential runtime.
Coll6 Mar 1, 2025
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
10 changes: 6 additions & 4 deletions code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
/obj/item/disk/nuclear/proc/secured_process(last_move)
var/turf/new_turf = get_turf(src)
var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
if(istype(loneop) && loneop.occurrences < loneop.max_occurrences && prob(loneop.weight))
var/datum/round_event_control/operative/loneopmode = locate(/datum/round_event_control/operative) in SSgamemode.control
if((istype(loneop) && istype(loneopmode)) && loneop.occurrences < loneop.max_occurrences && prob(loneop.weight))
loneop.weight = max(loneop.weight - 1, 1) //monkestation edit: increased minimum to 1
loneop.checks_antag_cap = (loneop.weight < 3)
loneopmode.checks_antag_cap = (loneop.weight < 3)
if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1)
message_admins("[src] is secured (currently in [ADMIN_VERBOSEJMP(new_turf)]). The weight of Lone Operative is now [loneop.weight].")
log_game("[src] being secured has reduced the weight of the Lone Operative event to [loneop.weight].")
Expand All @@ -57,8 +58,9 @@

if(last_move < world.time - 300 SECONDS && prob((world.time - 300 SECONDS - last_move)*0.0001)) //monkestation edit: weight will start increasing at 5 minutes unsecure, rather than 8.3
var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
if(istype(loneop) && loneop.occurrences < loneop.max_occurrences)
loneop.checks_antag_cap = (loneop.weight < 3)
var/datum/round_event_control/operative/loneopmode = locate(/datum/round_event_control/operative) in SSgamemode.control
if((istype(loneop) && istype(loneopmode)) && loneop.occurrences < loneop.max_occurrences)
loneopmode.checks_antag_cap = (loneop.weight < 3)
loneop.weight += 1
if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1)
if(disk_comfort_level >= 2)
Expand Down
Loading