mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 21:40:55 +01:00
Ports the TG globals controller and converts globals. (#18057)
* SDQL2 update * fix that verb * cl * fix that * toworld * this is pointless * update info * siiiiick.. * vv edit update * fix that * fix editing vars * fix VV * Port the /TG/ globals controller. * part 1 * part 2 * oops * part 3 * Hollow Purple * sadas * bsbsdb * muda na agaki ta * ids 1-15 * 16-31 * 41-75 * bring me back to how things used to be before i lost it all * the strength of mayhem * final touches * cl * protect some vars * update sdql2 to use glob * stuff? * forgot that is not defined there * whoops * observ * but it never gets better * a --------- Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
selectable = 0
|
||||
|
||||
/datum/ai_laws/nanotrasen/malfunction/New()
|
||||
set_zeroth_law(config.law_zero)
|
||||
set_zeroth_law(GLOB.config.law_zero)
|
||||
..()
|
||||
|
||||
/************* NanoTrasen Aggressive *************/
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
return FALSE
|
||||
|
||||
if(id_tag)
|
||||
var/datum/local_network/old_lan = local_networks[id_tag]
|
||||
var/datum/local_network/old_lan = GLOB.local_networks[id_tag]
|
||||
if(old_lan)
|
||||
if(!old_lan.remove_device(parent))
|
||||
to_chat(user, SPAN_WARNING("You encounter an error when trying to unregister \the [parent] from the [id_tag] local network."))
|
||||
return FALSE
|
||||
to_chat(user, SPAN_NOTICE("You unregister \the [parent] from the [id_tag] local network."))
|
||||
|
||||
var/datum/local_network/lan = local_networks[new_ident]
|
||||
var/datum/local_network/lan = GLOB.local_networks[new_ident]
|
||||
if(!lan)
|
||||
lan = new(new_ident)
|
||||
lan.add_device(parent)
|
||||
@@ -40,7 +40,7 @@
|
||||
return TRUE
|
||||
|
||||
/datum/component/local_network_member/proc/get_local_network()
|
||||
var/datum/local_network/lan = id_tag ? local_networks[id_tag] : null
|
||||
var/datum/local_network/lan = id_tag ? GLOB.local_networks[id_tag] : null
|
||||
if(lan && !lan.within_radius(parent))
|
||||
lan.remove_device(parent)
|
||||
id_tag = null
|
||||
@@ -65,14 +65,14 @@
|
||||
return FALSE
|
||||
|
||||
if(id_tag)
|
||||
var/datum/local_network/multilevel/old_lan = multilevel_local_networks[id_tag]
|
||||
var/datum/local_network/multilevel/old_lan = GLOB.multilevel_local_networks[id_tag]
|
||||
if(old_lan)
|
||||
if(!old_lan.remove_device(parent))
|
||||
to_chat(user, SPAN_WARNING("You encounter an error when trying to unregister \the [parent] from the [id_tag] local network."))
|
||||
return FALSE
|
||||
to_chat(user, SPAN_NOTICE("You unregister \the [parent] from the [id_tag] local network."))
|
||||
|
||||
var/datum/local_network/multilevel/lan = multilevel_local_networks[new_ident]
|
||||
var/datum/local_network/multilevel/lan = GLOB.multilevel_local_networks[new_ident]
|
||||
if(!lan)
|
||||
lan = new(new_ident)
|
||||
lan.add_device(parent)
|
||||
@@ -87,7 +87,7 @@
|
||||
return TRUE
|
||||
|
||||
/datum/component/local_network_member/multilevel/get_local_network()
|
||||
var/datum/local_network/multilevel/lan = id_tag ? multilevel_local_networks[id_tag] : null
|
||||
var/datum/local_network/multilevel/lan = id_tag ? GLOB.multilevel_local_networks[id_tag] : null
|
||||
if(lan && !lan.within_radius(parent))
|
||||
lan.remove_device(parent)
|
||||
id_tag = null
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
SHOULD_CALL_PARENT(TRUE)
|
||||
|
||||
weakref = null
|
||||
destroyed_event.raise_event(src)
|
||||
GLOB.destroyed_event.raise_event(src)
|
||||
var/ui_key = SOFTREF(src)
|
||||
if(LAZYISIN(SSnanoui.open_uis, ui_key))
|
||||
SSnanoui.close_uis(src)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
var/list/global_webhooks = list()
|
||||
|
||||
/proc/global_initialize_webhooks()
|
||||
if(!establish_db_connection(dbcon))
|
||||
if(!establish_db_connection(GLOB.dbcon))
|
||||
var/file = return_file_text("config/webhooks.json")
|
||||
if (file)
|
||||
var/jsonData = json_decode(file)
|
||||
@@ -23,7 +23,7 @@ var/list/global_webhooks = list()
|
||||
else
|
||||
return 0
|
||||
else
|
||||
var/DBQuery/query = dbcon.NewQuery("SELECT url, tags, mention FROM ss13_webhooks")
|
||||
var/DBQuery/query = GLOB.dbcon.NewQuery("SELECT url, tags, mention FROM ss13_webhooks")
|
||||
query.Execute()
|
||||
while (query.NextRow())
|
||||
var/url = query.item[1]
|
||||
|
||||
@@ -47,8 +47,8 @@ var/global/datum/getrev/revdata = new()
|
||||
|
||||
if(revdata.revision)
|
||||
to_chat(src, "<b>Server revision:</b> [revdata.branch] - [revdata.date]")
|
||||
if(config.githuburl)
|
||||
to_chat(src, "<a href='[config.githuburl]/commit/[revdata.revision]'>[revdata.revision]</a>")
|
||||
if(GLOB.config.githuburl)
|
||||
to_chat(src, "<a href='[GLOB.config.githuburl]/commit/[revdata.revision]'>[revdata.revision]</a>")
|
||||
else
|
||||
to_chat(src, revdata.revision)
|
||||
else
|
||||
@@ -106,8 +106,8 @@ var/global/datum/getrev/revdata = new()
|
||||
. += "<hr><p>PR #[tm.number]: \"[html_encode(tm.title)]\""
|
||||
. += "<br>\tAuthor: [html_encode(tm.author)]"
|
||||
|
||||
if (config.githuburl)
|
||||
. += "<br>\t<a href='[config.githuburl]pull/[tm.number]'>\[Details...\]</a>"
|
||||
if (GLOB.config.githuburl)
|
||||
. += "<br>\t<a href='[GLOB.config.githuburl]pull/[tm.number]'>\[Details...\]</a>"
|
||||
|
||||
. += "</p>"
|
||||
|
||||
@@ -121,7 +121,7 @@ var/global/datum/getrev/revdata = new()
|
||||
. += {"<table class="table">"}
|
||||
. += {"<tr><th>Author:</th><td>[html_encode(tm.author)]</td></tr>"}
|
||||
|
||||
if (config.githuburl)
|
||||
if (GLOB.config.githuburl)
|
||||
. += {"<tr><td colspan="2"><a href="?JSlink=github;pr=[tm.number]">Link to GitHub</a></td></tr>"}
|
||||
|
||||
. += {"<tr><th>Description:</th><td>[html_encode(tm.body)]</td></tr>"}
|
||||
|
||||
@@ -49,16 +49,16 @@ paiicon is the pai icon sprite name
|
||||
robot_custom_icons[synthsprite] = synth
|
||||
|
||||
/proc/loadsynths_from_sql()
|
||||
if(!config.sql_enabled)
|
||||
if(!GLOB.config.sql_enabled)
|
||||
LOG_DEBUG("Synthsprites: SQL Disabled - Falling back to JSON")
|
||||
loadsynths_from_json()
|
||||
return
|
||||
if(!establish_db_connection(dbcon))
|
||||
if(!establish_db_connection(GLOB.dbcon))
|
||||
LOG_DEBUG("Synthsprites: SQL ERROR - Failed to connect. - Falling back to JSON")
|
||||
loadsynths_from_json()
|
||||
return
|
||||
|
||||
var/DBQuery/customsynthsprites = dbcon.NewQuery("SELECT synthname, synthckey, synthicon, aichassisicon, aiholoicon, paiicon FROM ss13_customsynths ORDER BY synthckey ASC")
|
||||
var/DBQuery/customsynthsprites = GLOB.dbcon.NewQuery("SELECT synthname, synthckey, synthicon, aichassisicon, aiholoicon, paiicon FROM ss13_customsynths ORDER BY synthckey ASC")
|
||||
customsynthsprites.Execute()
|
||||
while(customsynthsprites.NextRow())
|
||||
CHECK_TICK
|
||||
|
||||
@@ -289,7 +289,7 @@
|
||||
|
||||
/datum/teleport/instant/science/setEffects(datum/effect/effect/system/aeffectin,datum/effect/effect/system/aeffectout)
|
||||
if(!aeffectin || !aeffectout)
|
||||
var/datum/effect_system/sparks/aeffect = new(null, FALSE, 5, alldirs)
|
||||
var/datum/effect_system/sparks/aeffect = new(null, FALSE, 5, GLOB.alldirs)
|
||||
effectin = effectin || aeffect
|
||||
effectout = effectout || aeffect
|
||||
return TRUE
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
var/global/list/local_networks = list()
|
||||
GLOBAL_LIST_EMPTY(local_networks)
|
||||
|
||||
/datum/local_network
|
||||
var/id_tag
|
||||
@@ -7,11 +7,11 @@ var/global/list/local_networks = list()
|
||||
|
||||
/datum/local_network/New(_id)
|
||||
id_tag = _id
|
||||
local_networks[id_tag] = src
|
||||
GLOB.local_networks[id_tag] = src
|
||||
|
||||
/datum/local_network/Destroy()
|
||||
network_entities.Cut()
|
||||
local_networks -= src
|
||||
GLOB.local_networks -= src
|
||||
. = ..()
|
||||
|
||||
/datum/local_network/proc/within_radius(atom/checking)
|
||||
@@ -58,15 +58,15 @@ var/global/list/local_networks = list()
|
||||
|
||||
|
||||
//Multilevel network
|
||||
var/global/list/multilevel_local_networks = list()
|
||||
GLOBAL_LIST_EMPTY(multilevel_local_networks)
|
||||
|
||||
/datum/local_network/multilevel/New(_id)
|
||||
id_tag = _id
|
||||
multilevel_local_networks[id_tag] = src
|
||||
GLOB.multilevel_local_networks[id_tag] = src
|
||||
|
||||
/datum/local_network/multilevel/Destroy()
|
||||
network_entities.Cut()
|
||||
multilevel_local_networks -= src
|
||||
GLOB.multilevel_local_networks -= src
|
||||
. = ..()
|
||||
|
||||
/datum/local_network/multilevel/within_radius(atom/checking)
|
||||
|
||||
+10
-10
@@ -96,8 +96,8 @@
|
||||
|
||||
SSnanoui.user_transferred(current, new_character)
|
||||
SStgui.on_transfer(current, new_character)
|
||||
if(current.client && ticket_panels[current.client])
|
||||
var/datum/ticket_panel/tp = ticket_panels[current.client]
|
||||
if(current.client && GLOB.ticket_panels[current.client])
|
||||
var/datum/ticket_panel/tp = GLOB.ticket_panels[current.client]
|
||||
tp.ticket_panel_window.user = new_character
|
||||
|
||||
if(new_character.mind) //remove any mind currently in our new body's mind variable
|
||||
@@ -151,8 +151,8 @@
|
||||
out += "Assigned role: [assigned_role]. <a href='?src=\ref[src];role_edit=1'>Edit</a><br>"
|
||||
out += "<hr>"
|
||||
out += "Factions and special roles:<br><table>"
|
||||
for(var/antag_type in all_antag_types)
|
||||
var/datum/antagonist/antag = all_antag_types[antag_type]
|
||||
for(var/antag_type in GLOB.all_antag_types)
|
||||
var/datum/antagonist/antag = GLOB.all_antag_types[antag_type]
|
||||
out += "[antag.get_panel_entry(src)]"
|
||||
out += "</table><hr>"
|
||||
out += "<b>Objectives</b></br>"
|
||||
@@ -180,7 +180,7 @@
|
||||
if(!check_rights(R_ADMIN)) return
|
||||
|
||||
if(href_list["add_antagonist"])
|
||||
var/datum/antagonist/antag = all_antag_types[href_list["add_antagonist"]]
|
||||
var/datum/antagonist/antag = GLOB.all_antag_types[href_list["add_antagonist"]]
|
||||
if(antag)
|
||||
if(antag.add_antagonist(src, 1, 1, 0, 1, 1)) // Ignore equipment and role type for this.
|
||||
log_admin("[key_name_admin(usr)] made [key_name(src, highlight_special = 1)] into a [antag.role_text].",admin_key=key_name(usr),ckey=key_name(src))
|
||||
@@ -188,23 +188,23 @@
|
||||
to_chat(usr, "<span class='warning'>[src] could not be made into a [antag.role_text]!</span>")
|
||||
|
||||
else if(href_list["remove_antagonist"])
|
||||
var/datum/antagonist/antag = all_antag_types[href_list["remove_antagonist"]]
|
||||
var/datum/antagonist/antag = GLOB.all_antag_types[href_list["remove_antagonist"]]
|
||||
if(antag) antag.remove_antagonist(src)
|
||||
|
||||
else if(href_list["equip_antagonist"])
|
||||
var/datum/antagonist/antag = all_antag_types[href_list["equip_antagonist"]]
|
||||
var/datum/antagonist/antag = GLOB.all_antag_types[href_list["equip_antagonist"]]
|
||||
if(antag) antag.equip(src.current)
|
||||
|
||||
else if(href_list["unequip_antagonist"])
|
||||
var/datum/antagonist/antag = all_antag_types[href_list["unequip_antagonist"]]
|
||||
var/datum/antagonist/antag = GLOB.all_antag_types[href_list["unequip_antagonist"]]
|
||||
if(antag) antag.unequip(src.current)
|
||||
|
||||
else if(href_list["move_antag_to_spawn"])
|
||||
var/datum/antagonist/antag = all_antag_types[href_list["move_antag_to_spawn"]]
|
||||
var/datum/antagonist/antag = GLOB.all_antag_types[href_list["move_antag_to_spawn"]]
|
||||
if(antag) antag.place_mob(src.current)
|
||||
|
||||
else if (href_list["role_edit"])
|
||||
var/new_role = input("Select new role", "Assigned role", assigned_role) as null|anything in joblist
|
||||
var/new_role = input("Select new role", "Assigned role", assigned_role) as null|anything in GLOB.joblist
|
||||
if (!new_role) return
|
||||
assigned_role = new_role
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@ var/list/modules = list( // global associative list
|
||||
|
||||
var/type = O.type // the type of the creating object
|
||||
|
||||
var/mneed = mods.inmodlist(type) // find if this type has modules defined
|
||||
var/mneed = GLOB.mods.inmodlist(type) // find if this type has modules defined
|
||||
|
||||
if(!mneed) // not found in module list?
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
var/needed = mods.getbitmask(type) // get a bitmask for the number of modules in this object
|
||||
var/needed = GLOB.mods.getbitmask(type) // get a bitmask for the number of modules in this object
|
||||
status = needed
|
||||
installed = needed
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/****************
|
||||
* Debug Support *
|
||||
****************/
|
||||
var/list/all_observable_events = list()
|
||||
GLOBAL_LIST_EMPTY(all_observable_events)
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// Arguments that the called proc should expect:
|
||||
// /mob/dead: The mob that was added to the dead_mob_list
|
||||
|
||||
var/singleton/observ/death/death_event = new()
|
||||
GLOBAL_DATUM_INIT(death_event, /singleton/observ/death, new)
|
||||
|
||||
/singleton/observ/death
|
||||
name = "Death"
|
||||
@@ -19,4 +19,4 @@ var/singleton/observ/death/death_event = new()
|
||||
/mob/living/add_to_dead_mob_list()
|
||||
. = ..()
|
||||
if(.)
|
||||
death_event.raise_event(src)
|
||||
GLOB.death_event.raise_event(src)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
var/singleton/observ/destroyed/destroyed_event = new()
|
||||
GLOBAL_DATUM_INIT(destroyed_event, /singleton/observ/destroyed, new)
|
||||
|
||||
/singleton/observ/destroyed
|
||||
name = "Destroyed"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
// /old_dir: The dir before the change.
|
||||
// /new_dir: The dir after the change.
|
||||
|
||||
var/singleton/observ/dir_set/dir_set_event = new()
|
||||
GLOBAL_DATUM_INIT(dir_set_event, /singleton/observ/dir_set, new)
|
||||
|
||||
/singleton/observ/dir_set
|
||||
name = "Direction Set"
|
||||
@@ -27,9 +27,9 @@ var/singleton/observ/dir_set/dir_set_event = new()
|
||||
|
||||
/atom/movable/Entered(var/atom/movable/am, atom/old_loc)
|
||||
. = ..()
|
||||
if(dir_set_event.has_listeners(am))
|
||||
dir_set_event.register(src, am, TYPE_PROC_REF(/atom, recursive_dir_set))
|
||||
if(GLOB.dir_set_event.has_listeners(am))
|
||||
GLOB.dir_set_event.register(src, am, TYPE_PROC_REF(/atom, recursive_dir_set))
|
||||
|
||||
/atom/movable/Exited(var/atom/movable/am, atom/new_loc)
|
||||
. = ..()
|
||||
dir_set_event.unregister(src, am, TYPE_PROC_REF(/atom, recursive_dir_set))
|
||||
GLOB.dir_set_event.unregister(src, am, TYPE_PROC_REF(/atom, recursive_dir_set))
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
// /atom/old_loc: The atom the enterer came from
|
||||
//
|
||||
|
||||
var/singleton/observ/entered/entered_event = new()
|
||||
GLOBAL_DATUM_INIT(entered_event, /singleton/observ/entered, new)
|
||||
|
||||
/singleton/observ/entered
|
||||
name = "Entered"
|
||||
@@ -21,4 +21,4 @@ var/singleton/observ/entered/entered_event = new()
|
||||
|
||||
/atom/Entered(atom/movable/enterer, atom/old_loc)
|
||||
..()
|
||||
entered_event.raise_event(src, enterer, old_loc)
|
||||
GLOB.entered_event.raise_event(src, enterer, old_loc)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
// /obj/item/item: The equipped item.
|
||||
// slot: The slot equipped to.
|
||||
|
||||
var/singleton/observ/mob_equipped/mob_equipped_event = new()
|
||||
GLOBAL_DATUM_INIT(mob_equipped_event, /singleton/observ/mob_equipped, new)
|
||||
|
||||
/singleton/observ/mob_equipped
|
||||
name = "Mob Equipped"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
// /atom/new_loc: The atom the exitee is now residing in
|
||||
//
|
||||
|
||||
var/singleton/observ/exited/exited_event = new()
|
||||
GLOBAL_DATUM_INIT(exited_event, /singleton/observ/exited, new)
|
||||
|
||||
/singleton/observ/exited
|
||||
name = "Exited"
|
||||
@@ -21,4 +21,4 @@ var/singleton/observ/exited/exited_event = new()
|
||||
|
||||
/atom/Exited(atom/movable/exitee, atom/new_loc)
|
||||
. = ..()
|
||||
exited_event.raise_event(src, exitee, new_loc)
|
||||
GLOB.exited_event.raise_event(src, exitee, new_loc)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
// Arguments that the called proc should expect:
|
||||
// /obj/other : reference to instrument that started playing a song
|
||||
|
||||
var/singleton/observ/instrument_synchronizer/instrument_synchronizer = new()
|
||||
GLOBAL_DATUM_INIT(instrument_synchronizer, /singleton/observ/instrument_synchronizer, new)
|
||||
|
||||
/singleton/observ/instrument_synchronizer
|
||||
name = "Instrument synchronizer"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
var/singleton/observ/moved/moved_event = new()
|
||||
GLOBAL_DATUM_INIT(moved_event, /singleton/observ/moved, new)
|
||||
|
||||
/singleton/observ/moved
|
||||
name = "Moved"
|
||||
@@ -9,8 +9,8 @@ var/singleton/observ/moved/moved_event = new()
|
||||
var/atom/movable/child = eventSource
|
||||
if(.)
|
||||
var/atom/movable/parent = child.loc
|
||||
while(istype(parent) && !moved_event.is_listening(parent, child))
|
||||
moved_event.register(parent, child, TYPE_PROC_REF(/atom/movable, recursive_move))
|
||||
while(istype(parent) && !GLOB.moved_event.is_listening(parent, child))
|
||||
GLOB.moved_event.register(parent, child, TYPE_PROC_REF(/atom/movable, recursive_move))
|
||||
child = parent
|
||||
parent = child.loc
|
||||
|
||||
@@ -19,18 +19,18 @@ var/singleton/observ/moved/moved_event = new()
|
||||
var/atom/movable/child = event_source
|
||||
if(.)
|
||||
var/atom/movable/parent = child.loc
|
||||
while(istype(parent) && moved_event.is_listening(parent, child))
|
||||
moved_event.unregister(parent, child, TYPE_PROC_REF(/atom/movable, recursive_move))
|
||||
while(istype(parent) && GLOB.moved_event.is_listening(parent, child))
|
||||
GLOB.moved_event.unregister(parent, child, TYPE_PROC_REF(/atom/movable, recursive_move))
|
||||
child = parent
|
||||
parent = child.loc
|
||||
|
||||
/singleton/observ/moved/proc/register_all_movement(var/event_source, var/listener)
|
||||
moved_event.register(event_source, listener, /atom/movable/proc/recursive_move)
|
||||
dir_set_event.register(event_source, listener, /atom/proc/recursive_dir_set)
|
||||
GLOB.moved_event.register(event_source, listener, /atom/movable/proc/recursive_move)
|
||||
GLOB.dir_set_event.register(event_source, listener, /atom/proc/recursive_dir_set)
|
||||
|
||||
/singleton/observ/moved/proc/unregister_all_movement(var/event_source, var/listener)
|
||||
moved_event.unregister(event_source, listener, /atom/movable/proc/recursive_move)
|
||||
dir_set_event.unregister(event_source, listener, /atom/proc/recursive_dir_set)
|
||||
GLOB.moved_event.unregister(event_source, listener, /atom/movable/proc/recursive_move)
|
||||
GLOB.dir_set_event.unregister(event_source, listener, /atom/proc/recursive_dir_set)
|
||||
|
||||
/********************
|
||||
* Movement Handling *
|
||||
@@ -42,18 +42,18 @@ var/singleton/observ/moved/moved_event = new()
|
||||
forceMove(T)
|
||||
|
||||
/atom/movable/proc/recursive_move(var/atom/movable/am, var/old_loc, var/new_loc)
|
||||
moved_event.raise_event(src, old_loc, new_loc)
|
||||
GLOB.moved_event.raise_event(src, old_loc, new_loc)
|
||||
|
||||
/atom/Entered(var/atom/movable/am, atom/old_loc)
|
||||
..()
|
||||
moved_event.raise_event(am, old_loc, am.loc)
|
||||
GLOB.moved_event.raise_event(am, old_loc, am.loc)
|
||||
|
||||
/atom/movable/Entered(var/atom/movable/am, atom/old_loc)
|
||||
..()
|
||||
if(moved_event.has_listeners(am) && !moved_event.is_listening(src, am))
|
||||
moved_event.register(src, am, TYPE_PROC_REF(/atom/movable, recursive_move))
|
||||
if(GLOB.moved_event.has_listeners(am) && !GLOB.moved_event.is_listening(src, am))
|
||||
GLOB.moved_event.register(src, am, TYPE_PROC_REF(/atom/movable, recursive_move))
|
||||
|
||||
/atom/movable/Exited(var/atom/movable/am, atom/old_loc)
|
||||
..()
|
||||
if(moved_event.is_listening(src, am, TYPE_PROC_REF(/atom/movable, recursive_move)))
|
||||
moved_event.unregister(src, am)
|
||||
if(GLOB.moved_event.is_listening(src, am, TYPE_PROC_REF(/atom/movable, recursive_move)))
|
||||
GLOB.moved_event.unregister(src, am)
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
var/list/global_listeners = list() // Associative list of instances that listen to all events of this type (as opposed to events belonging to a specific source) and the proc to call.
|
||||
|
||||
/singleton/observ/New()
|
||||
all_observable_events += src
|
||||
GLOB.all_observable_events += src
|
||||
..()
|
||||
|
||||
/singleton/observ/proc/is_listening(event_source, datum/listener, proc_call)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
// /old_see_invisible: see_invisible before the change
|
||||
// /new_see_invisible: see_invisible after the change
|
||||
|
||||
var/singleton/observ/see_invisible_set/see_invisible_set_event = new()
|
||||
GLOBAL_DATUM_INIT(see_invisible_set_event, /singleton/observ/see_invisible_set, new)
|
||||
|
||||
/singleton/observ/see_invisible_set
|
||||
name = "See Invisible Set"
|
||||
@@ -22,4 +22,4 @@ var/singleton/observ/see_invisible_set/see_invisible_set_event = new()
|
||||
var/old_see_invisible = see_invisible
|
||||
if(old_see_invisible != new_see_invisible)
|
||||
see_invisible = new_see_invisible
|
||||
see_invisible_set_event.raise_event(src, old_see_invisible, new_see_invisible)
|
||||
GLOB.see_invisible_set_event.raise_event(src, old_see_invisible, new_see_invisible)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
// /old_invisibility: invisibility before the change
|
||||
// /new_invisibility: invisibility after the change
|
||||
|
||||
var/singleton/observ/invisibility_set/set_invisible_event = new()
|
||||
GLOBAL_DATUM_INIT(set_invisible_event, /singleton/observ/invisibility_set, new)
|
||||
|
||||
/singleton/observ/invisibility_set
|
||||
name = "Invisibility Set"
|
||||
@@ -22,5 +22,5 @@ var/singleton/observ/invisibility_set/set_invisible_event = new()
|
||||
var/old_invisibility = invisibility
|
||||
if(old_invisibility != new_invisibility)
|
||||
invisibility = new_invisibility
|
||||
set_invisible_event.raise_event(src, old_invisibility, new_invisibility)
|
||||
GLOB.set_invisible_event.raise_event(src, old_invisibility, new_invisibility)
|
||||
update_above()
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
// /obj/effect/shuttle_landmark/old_location: the old location's shuttle landmark
|
||||
// /obj/effect/shuttle_landmark/new_location: the new location's shuttle landmark
|
||||
|
||||
var/singleton/observ/shuttle_moved/shuttle_moved_event = new()
|
||||
GLOBAL_DATUM_INIT(shuttle_moved_event, /singleton/observ/shuttle_moved, new)
|
||||
|
||||
/singleton/observ/shuttle_moved
|
||||
name = "Shuttle Moved"
|
||||
expected_type = /datum/shuttle
|
||||
|
||||
var/singleton/observ/shuttle_pre_move/shuttle_pre_move_event = new()
|
||||
GLOBAL_DATUM_INIT(shuttle_pre_move_event, /singleton/observ/shuttle_pre_move, new)
|
||||
|
||||
/singleton/observ/shuttle_pre_move
|
||||
name = "Shuttle Pre Move"
|
||||
|
||||
@@ -8,7 +8,8 @@
|
||||
// /old_sight: sight before the change
|
||||
// /new_sight: sight after the change
|
||||
|
||||
var/singleton/observ/sight_set/sight_set_event = new()
|
||||
GLOBAL_DATUM_INIT(sight_set_event, /singleton/observ/sight_set, new)
|
||||
|
||||
|
||||
/singleton/observ/sight_set
|
||||
name = "Sight Set"
|
||||
@@ -22,4 +23,4 @@ var/singleton/observ/sight_set/sight_set_event = new()
|
||||
var/old_sight = sight
|
||||
if(old_sight != new_sight)
|
||||
sight = new_sight
|
||||
sight_set_event.raise_event(src, old_sight, new_sight)
|
||||
GLOB.sight_set_event.raise_event(src, old_sight, new_sight)
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
var/singleton/observ/stat_set/stat_set_event = new()
|
||||
|
||||
// Observer Pattern Implementation: Stat Set
|
||||
// Registration type: /mob/living
|
||||
//
|
||||
@@ -10,6 +8,9 @@ var/singleton/observ/stat_set/stat_set_event = new()
|
||||
// /old_stat: Status before the change.
|
||||
// /new_stat: Status after the change.
|
||||
|
||||
GLOBAL_DATUM_INIT(stat_set_event, /singleton/observ/stat_set, new)
|
||||
|
||||
|
||||
/singleton/observ/stat_set
|
||||
name = "Stat Set"
|
||||
expected_type = /mob/living
|
||||
@@ -21,4 +22,4 @@ var/singleton/observ/stat_set/stat_set_event = new()
|
||||
var/old_stat = stat
|
||||
. = ..()
|
||||
if(stat != old_stat)
|
||||
stat_set_event.raise_event(src, old_stat, new_stat)
|
||||
GLOB.stat_set_event.raise_event(src, old_stat, new_stat)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
accessory_contents = list(/obj/item/gun/projectile/colt = 1)
|
||||
|
||||
/datum/outfit/admin/ert/coalition/get_id_access()
|
||||
return list(access_distress, access_external_airlocks, access_coalition, access_coalition_navy)
|
||||
return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY)
|
||||
|
||||
/datum/outfit/admin/ert/coalition/medic
|
||||
name = "Coalition Medic"
|
||||
@@ -117,7 +117,7 @@
|
||||
)
|
||||
|
||||
/datum/outfit/admin/ert/konyang/get_id_access()
|
||||
return list(access_distress, access_external_airlocks, access_coalition, access_coalition_navy, access_konyang_police)
|
||||
return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY, ACCESS_KONYANG_POLICE)
|
||||
|
||||
/datum/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
|
||||
. = ..()
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
/datum/outfit/admin/ert/legion/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
|
||||
.=..()
|
||||
var/obj/item/card/id/distress/legion/I = H.wear_id
|
||||
I.access += (access_cent_specops)
|
||||
I.access += (ACCESS_CENT_SPECOPS)
|
||||
|
||||
/datum/outfit/admin/ert/legion/pilot
|
||||
name = "TCFL Dropship Pilot"
|
||||
@@ -82,4 +82,4 @@
|
||||
/datum/outfit/admin/ert/legion/sentinel/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
|
||||
.=..()
|
||||
var/obj/item/card/id/distress/legion/I = H.wear_id
|
||||
I.access += (access_cent_specops)
|
||||
I.access += (ACCESS_CENT_SPECOPS)
|
||||
|
||||
@@ -24,7 +24,7 @@ var/global/datum/repository/cameras/camera_repository = new()
|
||||
return
|
||||
invalidated = 0
|
||||
|
||||
for(var/obj/machinery/camera/C in cameranet.cameras)
|
||||
for(var/obj/machinery/camera/C in GLOB.cameranet.cameras)
|
||||
var/cam = C.nano_structure()
|
||||
for(var/network in C.network)
|
||||
if(!networks[network])
|
||||
|
||||
@@ -101,7 +101,7 @@ var/global/datum/repository/crew/crew_repository = new()
|
||||
|
||||
/datum/repository/crew/proc/scan()
|
||||
var/list/tracked = list()
|
||||
for(var/mob/living/carbon/human/H in mob_list)
|
||||
for(var/mob/living/carbon/human/H in GLOB.mob_list)
|
||||
if(istype(H.w_uniform, /obj/item/clothing/under))
|
||||
var/obj/item/clothing/under/C = H.w_uniform
|
||||
if (C.has_sensor)
|
||||
|
||||
@@ -114,7 +114,7 @@ var/singleton/sound_player/sound_player = new()
|
||||
listeners = list()
|
||||
listener_status = list()
|
||||
|
||||
destroyed_event.register(source, src, TYPE_PROC_REF(/datum, qdel_self))
|
||||
GLOB.destroyed_event.register(source, src, TYPE_PROC_REF(/datum, qdel_self))
|
||||
|
||||
PrivLocateListeners()
|
||||
START_PROCESSING(SSprocessing, src)
|
||||
@@ -154,7 +154,7 @@ var/singleton/sound_player/sound_player = new()
|
||||
listeners = null
|
||||
listener_status = null
|
||||
|
||||
destroyed_event.unregister(source, src, TYPE_PROC_REF(/datum, qdel_self))
|
||||
GLOB.destroyed_event.unregister(source, src, TYPE_PROC_REF(/datum, qdel_self))
|
||||
source = null
|
||||
|
||||
sound_player.PrivStopSound(src)
|
||||
@@ -197,16 +197,16 @@ var/singleton/sound_player/sound_player = new()
|
||||
|
||||
listeners += listener
|
||||
|
||||
moved_event.register(listener, src, PROC_REF(PrivUpdateListenerLoc))
|
||||
destroyed_event.register(listener, src, PROC_REF(PrivRemoveListener))
|
||||
GLOB.moved_event.register(listener, src, PROC_REF(PrivUpdateListenerLoc))
|
||||
GLOB.destroyed_event.register(listener, src, PROC_REF(PrivRemoveListener))
|
||||
|
||||
PrivUpdateListenerLoc(listener, FALSE)
|
||||
|
||||
/datum/sound_token/proc/PrivRemoveListener(atom/listener, sound/null_sound)
|
||||
null_sound = null_sound || new(channel = sound.channel)
|
||||
sound_to(listener, null_sound)
|
||||
moved_event.unregister(listener, src, PROC_REF(PrivUpdateListenerLoc))
|
||||
destroyed_event.unregister(listener, src, PROC_REF(PrivRemoveListener))
|
||||
GLOB.moved_event.unregister(listener, src, PROC_REF(PrivUpdateListenerLoc))
|
||||
GLOB.destroyed_event.unregister(listener, src, PROC_REF(PrivRemoveListener))
|
||||
listeners -= listener
|
||||
|
||||
/datum/sound_token/proc/PrivUpdateListenerLoc(atom/listener, update_sound = TRUE)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// I thought about splitting these into files per category, but that just makes Ctrl+F'ing for problematic tips harder, so I'll just list them all in one file
|
||||
|
||||
var/global/list/tips_by_category = list()
|
||||
GLOBAL_LIST_EMPTY(tips_by_category)
|
||||
|
||||
/*
|
||||
BASELINE TIP
|
||||
@@ -344,4 +344,4 @@ var/global/list/tips_by_category = list()
|
||||
/proc/populate_tip_list()
|
||||
for(var/tip_type in subtypesof(/datum/tip))
|
||||
var/datum/tip/tip_datum = new tip_type
|
||||
tips_by_category[tip_datum.category] = tip_datum
|
||||
GLOB.tips_by_category[tip_datum.category] = tip_datum
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
if(name_language == TRADER_DEFAULT_NAME)
|
||||
name = capitalize(pick(first_names_female + first_names_male)) + " " + capitalize(pick(last_names))
|
||||
else
|
||||
var/datum/language/L = all_languages[name_language]
|
||||
var/datum/language/L = GLOB.all_languages[name_language]
|
||||
if(L)
|
||||
name = L.get_random_name(pick(MALE,FEMALE))
|
||||
if(possible_origins && possible_origins.len)
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
/datum/uplink_category/proc/can_view(obj/item/device/uplink/U)
|
||||
if(LAZYLEN(restricted_antags))
|
||||
for(var/antag_role in restricted_antags)
|
||||
var/datum/antagonist/antag = all_antag_types[antag_role]
|
||||
var/datum/antagonist/antag = GLOB.all_antag_types[antag_role]
|
||||
if(antag.is_antagonist(U.uplink_owner))
|
||||
return FALSE
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
return FALSE
|
||||
|
||||
for(var/antag_role in antag_roles)
|
||||
var/datum/antagonist/antag = all_antag_types[antag_role]
|
||||
var/datum/antagonist/antag = GLOB.all_antag_types[antag_role]
|
||||
if(antag.is_antagonist(U.uplink_owner))
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
@@ -124,7 +124,7 @@ var/datum/uplink/uplink
|
||||
return FALSE
|
||||
|
||||
for(var/antag_role in antag_roles)
|
||||
var/datum/antagonist/antag = all_antag_types[antag_role]
|
||||
var/datum/antagonist/antag = GLOB.all_antag_types[antag_role]
|
||||
if(antag.is_antagonist(U.uplink_owner))
|
||||
return TRUE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user