cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 22:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

More globals (#19247)

Browse Source 
* More globals

* planets

* .

* .

* Update jukebox.dm

* Fix timer callback syntax in jukebox.dm

* .
This commit is contained in:
Kashargul
2026-03-15 02:54:17 -04:00
committed by GitHub
parent 24d023dfa8
commit 72628d226c
210 changed files with 941 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/emergency_shuttle_controller.dm
+3 -3
View File
@@ -59,7 +59,7 @@
if (evac)
emergency_shuttle_docked.Announce(replacetext(replacetext(using_map.emergency_shuttle_docked_message, "%dock_name%", "[using_map.dock_name]"), "%ETD%", "[estimated_time] minute\s"))
else
priority_announcement.Announce(replacetext(replacetext(using_map.shuttle_docked_message, "%dock_name%", "[using_map.dock_name]"), "%ETD%", "[estimated_time] minute\s"), "Transfer System", 'sound/AI/tramarrived.ogg') //VOREStation Edit - TTS
GLOB.priority_announcement.Announce(replacetext(replacetext(using_map.shuttle_docked_message, "%dock_name%", "[using_map.dock_name]"), "%ETD%", "[estimated_time] minute\s"), "Transfer System", 'sound/AI/tramarrived.ogg') //VOREStation Edit - TTS
//arm the escape pods
if (evac)
@@ -116,7 +116,7 @@
shuttle.move_time = SHUTTLE_TRANSIT_DURATION
var/estimated_time = round(estimate_arrival_time()/60,1)
priority_announcement.Announce(replacetext(replacetext(using_map.shuttle_called_message, "%dock_name%", "[using_map.dock_name]"), "%ETA%", "[estimated_time] minute\s"), "Transfer System", 'sound/AI/tramcalled.ogg')
GLOB.priority_announcement.Announce(replacetext(replacetext(using_map.shuttle_called_message, "%dock_name%", "[using_map.dock_name]"), "%ETA%", "[estimated_time] minute\s"), "Transfer System", 'sound/AI/tramcalled.ogg')
SSatc.shift_ending()
//recalls the shuttle
@@ -134,7 +134,7 @@
A.readyreset()
evac = 0
else
priority_announcement.Announce(using_map.shuttle_recall_message)
GLOB.priority_announcement.Announce(using_map.shuttle_recall_message)
/datum/emergency_shuttle_controller/proc/can_call()
if (!GLOB.universe.OnShuttleCall(null))
code/controllers/master_controller.dm
-3
View File
@@ -48,6 +48,3 @@ GLOBAL_DATUM(master_controller, /datum/controller/game_controller) //Set in worl
/datum/controller/game_controller/proc/setup_objects()
// Set up antagonists.
populate_antag_type_list()
//Set up spawn points.
populate_spawn_points()
code/controllers/subsystems/nightshift.dm
+1 -1
View File
@@ -35,7 +35,7 @@ SUBSYSTEM_DEF(nightshift)
pickedsound = 'sound/AI/dim_lights.ogg'
else
pickedsound = 'sound/AI/bright_lights.ogg'
priority_announcement.Announce(message, new_title = "Automated Lighting System Announcement", new_sound = pickedsound, zlevel = announce_z)
GLOB.priority_announcement.Announce(message, new_title = "Automated Lighting System Announcement", new_sound = pickedsound, zlevel = announce_z)
/datum/controller/subsystem/nightshift/proc/check_nightshift(forced) //This is called from elsewhere, like setting the alert levels, sadly
var/emergency = GLOB.security_level > SEC_LEVEL_GREEN
code/controllers/subsystems/planets.dm
+1 -1
View File
@@ -25,7 +25,7 @@ SUBSYSTEM_DEF(planets)
var/list/planet_datums = using_map.planet_datums_to_make
for(var/P in planet_datums)
var/datum/planet/NP = new P()
planets.Add(NP)
planets += NP
for(var/index in 1 to length(NP.expected_z_levels))
var/Z = NP.expected_z_levels[index]
if(!isnum(Z))
code/controllers/subsystems/ticker.dm
+2 -2
View File
@@ -354,8 +354,8 @@ SUBSYSTEM_DEF(ticker)
feedback_set_details("end_proper", "proper completion")
restart_timeleft = restart_timeout
if(blackbox)
blackbox.save_all_data_to_sql() // TODO - Blackbox or statistics subsystem
if(GLOB.blackbox)
GLOB.blackbox.save_all_data_to_sql() // TODO - Blackbox or statistics subsystem
end_game_state = END_GAME_ENDING
return