cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release Update

Browse Source 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
This commit is contained in:
Repede
2020-04-16 21:07:33 -04:00
parent 2d313894a3 48ad4d95b3
commit e44e346352
657 changed files with 195131 additions and 226215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/master.dm
View File

@@ -50,8 +50,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/current_runlevel //for scheduling different subsystems for different stages of the round
var/dbg_is_running_subsystem = FALSE // TEMPORARY DEBUGGING - true only while we are actually waiting on a subsystem
var/static/restart_clear = 0
var/static/restart_timeout = 0
var/static/restart_count = 0
@@ -478,11 +476,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
queue_node.state = SS_RUNNING
dbg_is_running_subsystem = TRUE // TEMPORARY DEBUGGING
tick_usage = TICK_USAGE
var/state = queue_node.ignite(queue_node_paused)
tick_usage = TICK_USAGE - tick_usage
dbg_is_running_subsystem = FALSE // TEMPORARY DEBUGGING
if (state == SS_RUNNING)
state = SS_IDLE