Skip to content

Commit

Permalink
turns all processes into subsystems
Browse files Browse the repository at this point in the history
  • Loading branch information
kachnov committed Sep 30, 2018
1 parent 7351cf2 commit 264d5dc
Show file tree
Hide file tree
Showing 51 changed files with 235 additions and 1,393 deletions.
30 changes: 12 additions & 18 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
#include "code\__defines\misc.dm"
#include "code\__defines\mobs.dm"
#include "code\__defines\proc_presets.dm"
#include "code\__defines\process_scheduler.dm"
#include "code\__defines\qdel.dm"
#include "code\__defines\research.dm"
#include "code\__defines\rust_g.dm"
Expand Down Expand Up @@ -159,32 +158,29 @@
#include "code\controllers\evacuation\evacuation_predicate.dm"
#include "code\controllers\evacuation\evacuation_shuttle.dm"
#include "code\controllers\evacuation\~evac.dm"
#include "code\controllers\Processes\emergencyShuttle.dm"
#include "code\controllers\Processes\event.dm"
#include "code\controllers\Processes\inactivity.dm"
#include "code\controllers\Processes\nanoui.dm"
//#include "code\controllers\Processes\radiation.dm"
#include "code\controllers\Processes\Shuttle.dm"
#include "code\controllers\Processes\supply.dm"
#include "code\controllers\Processes\tgui.dm"
#include "code\controllers\Processes\ticker.dm"
#include "code\controllers\Processes\timer.dm"
#include "code\controllers\Processes\trade.dm"
#include "code\controllers\Processes\vote.dm"
#include "code\controllers\ProcessScheduler\core\process.dm"
#include "code\controllers\ProcessScheduler\core\processScheduler.dm"
#include "code\controllers\subsystems\air.dm"
#include "code\controllers\subsystems\alarm.dm"
#include "code\controllers\subsystems\atoms.dm"
#include "code\controllers\subsystems\evacuation.dm"
#include "code\controllers\subsystems\events.dm"
#include "code\controllers\subsystems\garbage.dm"
#include "code\controllers\subsystems\legacy.dm"
#include "code\controllers\subsystems\inactivity.dm"
#include "code\controllers\subsystems\lighting.dm"
#include "code\controllers\subsystems\machines.dm"
#include "code\controllers\subsystems\mapping.dm"
#include "code\controllers\subsystems\minimap.dm"
#include "code\controllers\subsystems\nanoui.dm"
#include "code\controllers\subsystems\open_space.dm"
#include "code\controllers\subsystems\shuttle.dm"
#include "code\controllers\subsystems\skybox.dm"
#include "code\controllers\subsystems\sun.dm"
#include "code\controllers\subsystems\supply.dm"
#include "code\controllers\subsystems\tgui.dm"
#include "code\controllers\subsystems\ticker.dm"
#include "code\controllers\subsystems\timer.dm"
#include "code\controllers\subsystems\trade.dm"
#include "code\controllers\subsystems\turbolift.dm"
#include "code\controllers\subsystems\voting.dm"
#include "code\controllers\subsystems\wireless.dm"
#include "code\controllers\subsystems\xenoarch.dm"
#include "code\controllers\subsystems\processing\airflow.dm"
Expand Down Expand Up @@ -2392,7 +2388,6 @@
#include "code\modules\tables\tables.dm"
#include "code\modules\tables\update_triggers.dm"
#include "code\modules\tgui\external.dm"
#include "code\modules\tgui\process.dm"
#include "code\modules\tgui\states.dm"
#include "code\modules\tgui\tgui.dm"
#include "code\modules\tgui\states\admin.dm"
Expand All @@ -2416,7 +2411,6 @@
#include "code\modules\turbolift\turbolift_door.dm"
#include "code\modules\turbolift\turbolift_floor.dm"
#include "code\modules\turbolift\turbolift_map.dm"
#include "code\modules\turbolift\turbolift_process.dm"
#include "code\modules\turbolift\turbolift_turfs.dm"
#include "code\modules\vehicles\bike.dm"
#include "code\modules\vehicles\cargo_train.dm"
Expand Down
19 changes: 0 additions & 19 deletions code/__defines/process_scheduler.dm

This file was deleted.

12 changes: 11 additions & 1 deletion code/__defines/subsystem-priority.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// SS_TICKER
// < none >

#define SS_PRIORITY_TICKER 200

#define SS_PRIORITY_DEFAULT 50 // Default priority for both normal and background processes

// Normal
Expand All @@ -22,4 +24,12 @@
#define SS_PRIORITY_GARBAGE 25 // Garbage collection.
#define SS_PRIORITY_VINES 25 // Spreading vine effects.
#define SS_PRIORITY_TURF 20 // Radioactive walls/blob.
#define SS_PRIORITY_WIRELESS 10 // Wireless connection setup.
#define SS_PRIORITY_WIRELESS 15 // Wireless connection setup.
#define SS_PRIORITY_TRADE 10
#define SS_PRIORITY_SUPPLY 10
#define SS_PRIORITY_EVENTS 10
#define SS_PRIORITY_EVACUATION 10
#define SS_PRIORITY_VOTING 5
#define SS_PRIORITY_NANOUI 5
#define SS_PRIORITY_TGUI 5
#define SS_PRIORITY_INACTIVITY 3
28 changes: 17 additions & 11 deletions code/__defines/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,24 @@
#define INIT_ORDER_AIR -1
#define INIT_ORDER_ALARM -2
#define INIT_ORDER_LIGHTING -3
#define INIT_ORDER_MINIMAP -2
#define INIT_ORDER_ASSETS -3
#define INIT_ORDER_ICON_SMOOTHING -5
#define INIT_ORDER_MINIMAP -4
#define INIT_ORDER_ASSETS -5
#define INIT_ORDER_ICON_SMOOTHING -6
#define INIT_ORDER_OVERLAY -6
#define INIT_ORDER_XKEYSCORE -10
#define INIT_ORDER_STICKY_BAN -10
#define INIT_ORDER_SQUEAK -40
#define INIT_ORDER_XENOARCH -50
#define INIT_ORDER_PERSISTENCE -100
#define INIT_OPEN_SPACE -150
#define INIT_BAY_LEGACY -200

#define INIT_ORDER_XKEYSCORE -7
#define INIT_ORDER_STICKY_BAN -8
#define INIT_ORDER_SQUEAK -9
#define INIT_ORDER_XENOARCH -10
#define INIT_ORDER_PERSISTENCE -11
#define INIT_ORDER_OPEN_SPACE -12
#define INIT_ORDER_TRADE -13
#define INIT_ORDER_SUPPLY -14
#define INIT_ORDER_EVENTS -15
#define INIT_ORDER_EVACUATION -16
#define INIT_ORDER_VOTING -17
#define INIT_ORDER_NANOUI -18
#define INIT_ORDER_TGUI -19
#define INIT_ORDER_INACTIVITY -20
// SS runlevels

#define RUNLEVEL_INIT 0
Expand Down
24 changes: 0 additions & 24 deletions code/_helpers/global_access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@
return global.SSfastprocess;
if("SSgarbage")
return global.SSgarbage;
if("SSlegacy")
return global.SSlegacy;
if("SSmachines")
return global.SSmachines;
if("SSmapping")
Expand Down Expand Up @@ -755,8 +753,6 @@
return global.priv_station_access;
if("priv_syndicate_access")
return global.priv_syndicate_access;
if("processScheduler")
return global.processScheduler;
if("prometheans")
return global.prometheans;
if("protected_objects")
Expand Down Expand Up @@ -969,12 +965,8 @@
return global.tg_self_state;
if("tg_z_state")
return global.tg_z_state;
if("tgui_process")
return global.tgui_process;
if("ticker")
return global.ticker;
if("tickerProcess")
return global.tickerProcess;
if("ticket_panels")
return global.ticket_panels;
if("tickets")
Expand All @@ -985,8 +977,6 @@
return global.traitors;
if("transfer_controller")
return global.transfer_controller;
if("turbolift_controller")
return global.turbolift_controller;
if("turbolifts")
return global.turbolifts;
if("turret_icons")
Expand Down Expand Up @@ -1098,8 +1088,6 @@
global.SSfastprocess=newval;
if("SSgarbage")
global.SSgarbage=newval;
if("SSlegacy")
global.SSlegacy=newval;
if("SSmachines")
global.SSmachines=newval;
if("SSmapping")
Expand Down Expand Up @@ -1804,8 +1792,6 @@
global.priv_station_access=newval;
if("priv_syndicate_access")
global.priv_syndicate_access=newval;
if("processScheduler")
global.processScheduler=newval;
if("prometheans")
global.prometheans=newval;
if("protected_objects")
Expand Down Expand Up @@ -2018,12 +2004,8 @@
global.tg_self_state=newval;
if("tg_z_state")
global.tg_z_state=newval;
if("tgui_process")
global.tgui_process=newval;
if("ticker")
global.ticker=newval;
if("tickerProcess")
global.tickerProcess=newval;
if("ticket_panels")
global.ticket_panels=newval;
if("tickets")
Expand All @@ -2034,8 +2016,6 @@
global.traitors=newval;
if("transfer_controller")
global.transfer_controller=newval;
if("turbolift_controller")
global.turbolift_controller=newval;
if("turbolifts")
global.turbolifts=newval;
if("turret_icons")
Expand Down Expand Up @@ -2124,7 +2104,6 @@
"SSatoms",
"SSfastprocess",
"SSgarbage",
"SSlegacy",
"SSmachines",
"SSmapping",
"SSminimap",
Expand Down Expand Up @@ -2478,7 +2457,6 @@
"priv_region_access",
"priv_station_access",
"priv_syndicate_access",
"processScheduler",
"processing_turfs",
"prometheans",
"protected_objects",
Expand Down Expand Up @@ -2586,9 +2564,7 @@
"tg_physical_state",
"tg_self_state",
"tg_z_state",
"tgui_process",
"ticker",
"tickerProcess",
"ticket_panels",
"tickets",
"total_lighting_corners",
Expand Down
6 changes: 0 additions & 6 deletions code/controllers/ProcessScheduler/.gitignore

This file was deleted.

Loading

0 comments on commit 264d5dc

Please sign in to comment.