cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 12:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Brig timers now calculate from real time, not time dilation time. You can set brig timers to 60 minutes (#1939)

Browse Source 
* Update brigdoors.dm

* Update brigdoors.dm
This commit is contained in:
Azarak
2021-01-18 19:36:07 +00:00
committed by GitHub
parent eda1bd9941
commit 2027e6b8d5
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/brigdoors.dm
+16 -8
View File
@@ -2,11 +2,15 @@
#define FONT_SIZE "5pt"
#define FONT_COLOR "#09f"
#define FONT_STYLE "Small Fonts"
#define MAX_TIMER 9000
//#define MAX_TIMER 9000 //ORIGINAL
#define MAX_TIMER 36000 //SKYRAT EDIT CHANGE
#define PRESET_SHORT 1200
#define PRESET_MEDIUM 1800
#define PRESET_LONG 3000
//#define PRESET_SHORT 1200 //ORIGINAL
#define PRESET_SHORT 3000 //SKYRAT EDIT CHANGE
//#define PRESET_MEDIUM 1800 //ORIGINAL
#define PRESET_MEDIUM 6000 //SKYRAT EDIT CHANGE
//#define PRESET_LONG 3000 //ORIGINAL
#define PRESET_LONG 9000 //SKYRAT EDIT CHANGE
@@ -72,7 +76,8 @@
return
if(timing)
if(world.time - activation_time >= timer_duration)
//if(world.time - activation_time >= timer_duration) //ORIGINAL
if(world.realtime - activation_time >= timer_duration) //SKYRAT EDIT CHANGE
timer_end() // open doors, reset timer, clear status screen
update_icon()
@@ -82,7 +87,8 @@
if(machine_stat & (NOPOWER|BROKEN))
return 0
activation_time = world.time
//activation_time = world.time //ORIGINAL
activation_time = world.realtime //SKYRAT EDIT CHANGE
timing = TRUE
for(var/obj/machinery/door/window/brigdoor/door in targets)
@@ -131,7 +137,8 @@
/obj/machinery/door_timer/proc/time_left(seconds = FALSE)
. = max(0,timer_duration - (activation_time ? world.time - activation_time : 0))
//. = max(0,timer_duration - (activation_time ? world.time - activation_time : 0)) //ORIGINAL
. = max(0,timer_duration - (activation_time ? world.realtime - activation_time : 0)) //SKYRAT EDIT CHANGE
if(seconds)
. /= 10
@@ -238,7 +245,8 @@
preset_time = PRESET_LONG
. = set_timer(preset_time)
if(timing)
activation_time = world.time
//activation_time = world.time //ORIGINAL
activation_time = world.realtime
else
. = FALSE