cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-22 05:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repaths subsystem to controller/subsystem (#24624)

Browse Source 
* Repaths subsystem to controller/subsystem

* Fix the shit
This commit is contained in:
Cyberboss
2017-03-08 16:05:45 -05:00
committed by AnturK
parent 4c4d2c28f9
commit 31ee152489
55 changed files with 437 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/wizard/fakeexplosion.dm
+1 -1
View File
@@ -8,4 +8,4 @@
/datum/round_event/wizard/fake_explosion/start()
for(var/mob/M in player_list)
M << 'sound/machines/Alarm.ogg'
addtimer(CALLBACK(ticker, /datum/subsystem/ticker/.proc/station_explosion_cinematic, 1, "fake"), 100) //:o)
addtimer(CALLBACK(ticker, /datum/controller/subsystem/ticker/.proc/station_explosion_cinematic, 1, "fake"), 100) //:o)
code/modules/mob/mob.dm
+1 -1
View File
@@ -585,7 +585,7 @@ var/next_mob_id = 0
stat("Failsafe Controller:", "ERROR")
if(Master)
stat(null)
for(var/datum/subsystem/SS in Master.subsystems)
for(var/datum/controller/subsystem/SS in Master.subsystems)
SS.stat_entry()
cameranet.stat_entry()
code/modules/tgui/subsystem.dm
+11 -11
View File
@@ -17,7 +17,7 @@
*
* return datum/tgui The found UI.
**/
/datum/subsystem/tgui/proc/try_update_ui(mob/user, datum/src_object, ui_key, datum/tgui/ui, force_open = 0)
/datum/controller/subsystem/tgui/proc/try_update_ui(mob/user, datum/src_object, ui_key, datum/tgui/ui, force_open = 0)
if(isnull(ui)) // No UI was passed, so look for one.
ui = get_open_ui(user, src_object, ui_key)
@@ -42,7 +42,7 @@
*
* return datum/tgui The found UI.
**/
/datum/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object, ui_key)
/datum/controller/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object, ui_key)
var/src_object_key = "\ref[src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
return null // No UIs open.
@@ -64,7 +64,7 @@
*
* return int The number of UIs updated.
**/
/datum/subsystem/tgui/proc/update_uis(datum/src_object)
/datum/controller/subsystem/tgui/proc/update_uis(datum/src_object)
var/src_object_key = "\ref[src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
return 0 // Couldn't find any UIs for this object.
@@ -86,7 +86,7 @@
*
* return int The number of UIs closed.
**/
/datum/subsystem/tgui/proc/close_uis(datum/src_object)
/datum/controller/subsystem/tgui/proc/close_uis(datum/src_object)
var/src_object_key = "\ref[src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
return 0 // Couldn't find any UIs for this object.
@@ -106,7 +106,7 @@
*
* return int The number of UIs closed.
**/
/datum/subsystem/tgui/proc/close_all_uis()
/datum/controller/subsystem/tgui/proc/close_all_uis()
var/close_count = 0
for(var/src_object_key in open_uis)
for(var/ui_key in open_uis[src_object_key])
@@ -127,7 +127,7 @@
*
* return int The number of UIs updated.
**/
/datum/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object = null, ui_key = null)
/datum/controller/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object = null, ui_key = null)
if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
@@ -149,7 +149,7 @@
*
* return int The number of UIs closed.
**/
/datum/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object = null, ui_key = null)
/datum/controller/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object = null, ui_key = null)
if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
@@ -167,7 +167,7 @@
*
* required ui datum/tgui The UI to be added.
**/
/datum/subsystem/tgui/proc/on_open(datum/tgui/ui)
/datum/controller/subsystem/tgui/proc/on_open(datum/tgui/ui)
var/src_object_key = "\ref[ui.src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
open_uis[src_object_key] = list(ui.ui_key = list()) // Make a list for the ui_key and src_object.
@@ -189,7 +189,7 @@
*
* return bool If the UI was removed or not.
**/
/datum/subsystem/tgui/proc/on_close(datum/tgui/ui)
/datum/controller/subsystem/tgui/proc/on_close(datum/tgui/ui)
var/src_object_key = "\ref[ui.src_object]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
return 0 // It wasn't open.
@@ -219,7 +219,7 @@
*
* return int The number of UIs closed.
**/
/datum/subsystem/tgui/proc/on_logout(mob/user)
/datum/controller/subsystem/tgui/proc/on_logout(mob/user)
return close_user_uis(user)
/**
@@ -232,7 +232,7 @@
*
* return bool If the UIs were transferred.
**/
/datum/subsystem/tgui/proc/on_transfer(mob/source, mob/target)
/datum/controller/subsystem/tgui/proc/on_transfer(mob/source, mob/target)
if(!source || isnull(source.open_uis) || !istype(source.open_uis, /list) || open_uis.len == 0)
return 0 // The old mob had no open UIs.