mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-27 22:18:27 +01:00
code/global.dm => code/_global_vars/ (#17244)
* 1 * Full conversion * . * . --------- Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
@@ -305,8 +305,8 @@
|
||||
/obj/item/communicator/tgui_static_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
|
||||
var/list/data = ..()
|
||||
// Update manifest'
|
||||
if(data_core)
|
||||
data_core.get_manifest_list()
|
||||
if(GLOB.data_core)
|
||||
GLOB.data_core.get_manifest_list()
|
||||
data["manifest"] = GLOB.PDA_Manifest
|
||||
data["mapRef"] = map_name
|
||||
return data
|
||||
|
||||
@@ -26,15 +26,15 @@
|
||||
/obj/item/holowarrant/attack_self(mob/living/user as mob)
|
||||
active = null
|
||||
var/list/warrants = list()
|
||||
if(!isnull(data_core.general))
|
||||
for(var/datum/data/record/warrant/W in data_core.warrants)
|
||||
if(!isnull(GLOB.data_core.general))
|
||||
for(var/datum/data/record/warrant/W in GLOB.data_core.warrants)
|
||||
warrants += W.fields["namewarrant"]
|
||||
if(warrants.len == 0)
|
||||
to_chat(user,span_notice("There are no warrants available"))
|
||||
return
|
||||
var/temp
|
||||
temp = tgui_input_list(user, "Which warrant would you like to load?", "Warrant Selection", warrants)
|
||||
for(var/datum/data/record/warrant/W in data_core.warrants)
|
||||
for(var/datum/data/record/warrant/W in GLOB.data_core.warrants)
|
||||
if(W.fields["namewarrant"] == temp)
|
||||
active = W
|
||||
update_icon()
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
A.holder = src
|
||||
A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
|
||||
|
||||
bombers += "[key_name(user)] attached a [item] to a transfer valve."
|
||||
GLOB.bombers += "[key_name(user)] attached a [item] to a transfer valve."
|
||||
message_admins("[key_name_admin(user)] attached a [item] to a transfer valve. [ADMIN_JMP(location)]")
|
||||
log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
|
||||
attacher = user
|
||||
@@ -208,7 +208,7 @@
|
||||
last_touch_info = ADMIN_QUE(mob)
|
||||
|
||||
log_str += " Last touched by: [src.fingerprintslast][last_touch_info]"
|
||||
bombers += log_str
|
||||
GLOB.bombers += log_str
|
||||
message_admins(log_str, 0, 1)
|
||||
log_game(log_str)
|
||||
merge_gases()
|
||||
|
||||
@@ -130,7 +130,7 @@
|
||||
data["locked_records"] = null
|
||||
|
||||
if(exploit_id)
|
||||
for(var/datum/data/record/L in data_core.locked)
|
||||
for(var/datum/data/record/L in GLOB.data_core.locked)
|
||||
if(L.fields["id"] == exploit_id)
|
||||
data["exploit"] = list() // Setting this to equal L.fields passes it's variables that are lists as reference instead of value.
|
||||
// We trade off being able to automatically add shit for more control over what gets passed to json
|
||||
@@ -155,7 +155,7 @@
|
||||
break
|
||||
else
|
||||
var/list/permanentData = list()
|
||||
for(var/datum/data/record/L in sortRecord(data_core.locked))
|
||||
for(var/datum/data/record/L in sortRecord(GLOB.data_core.locked))
|
||||
permanentData.Add(list(list(
|
||||
"name" = L.fields["name"],
|
||||
"id" = L.fields["id"]
|
||||
|
||||
Reference in New Issue
Block a user