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

End game timing changes #4353

Merged
merged 2 commits into from
Sep 11, 2023
Merged

End game timing changes #4353

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
8e87329
Initial
morrowwolf Sep 8, 2023
3ab8848
This doesn't seem to break everything?
morrowwolf Sep 8, 2023
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/__DEFINES/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
#define XENO_BURIED_LARVA_TIME_LIMIT (30 MINUTES)

/// The time when xenos can start taking over comm towers
#define XENO_COMM_ACQUISITION_TIME (90 MINUTES)
#define XENO_COMM_ACQUISITION_TIME (55 MINUTES)

/// The time it takes for a pylon to give one larva while activated
#define XENO_PYLON_ACTIVATION_COOLDOWN (5 MINUTES)
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/ticker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ SUBSYSTEM_DEF(ticker)
if(CONFIG_GET(flag/autooocmute))
ooc_allowed = FALSE

round_start_time = world.time

CHECK_TICK
for(var/I in round_start_events)
var/datum/callback/cb = I
Expand All @@ -222,9 +224,7 @@ SUBSYSTEM_DEF(ticker)
equip_characters()

GLOB.data_core.manifest()

log_world("Game start took [(world.timeofday - init_start) / 10]s")
round_start_time = world.time
//SSdbcore.SetRoundStart()

current_state = GAME_STATE_PLAYING
Expand Down
11 changes: 6 additions & 5 deletions code/modules/cm_tech/techs/marine/tier4/nuke.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#define NUKE_UNLOCK_TIME (120 MINUTES)
#define NUKE_UNLOCK_TIME (115 MINUTES)

/datum/tech/nuke
name = "Nuclear Device"
//desc = "Purchase a nuclear device. Only able to purchase after X minutes into the operation. It's the only way to be sure." //See New()
desc = "Purchase a nuclear device. It's the only way to be sure."
icon_state = "nuke"

required_points = 20
required_points = 5

tier = /datum/tier/four

Expand All @@ -15,7 +15,7 @@
flags = TREE_FLAG_MARINE

/datum/tech/nuke/New()
desc = "Purchase a nuclear device. Only able to purchase [NUKE_UNLOCK_TIME / (1 MINUTES)] minutes into the operation. It's the only way to be sure."
SSticker.OnRoundstart(CALLBACK(src, PROC_REF(handle_description)))

/datum/tech/nuke/on_unlock()
. = ..()
Expand All @@ -41,4 +41,5 @@

return TRUE

#undef NUKE_UNLOCK_TIME
/datum/tech/nuke/proc/handle_description()
desc = "Purchase a nuclear device. Only purchasable [Ceiling((NUKE_UNLOCK_TIME + SSticker.round_start_time) / (1 MINUTES))] minutes into the operation. It's the only way to be sure."