cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes all global variables handled by the GLOB controller (#13152)

Browse Source 
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
This commit is contained in:
AffectedArc07
2020-03-20 21:56:37 -06:00
committed by GitHub
parent c8dbd0190e
commit 210f8badf4
667 changed files with 4243 additions and 4240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/aicard.dm
+2 -2
View File
@@ -40,7 +40,7 @@
ui_interact(user)
/obj/item/aicard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
/obj/item/aicard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "aicard.tmpl", "[name]", 600, 400, state = state)
@@ -48,7 +48,7 @@
ui.set_auto_update(1)
/obj/item/aicard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
/obj/item/aicard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
var/data[0]
var/mob/living/silicon/ai/AI = locate() in src
code/game/objects/items/devices/autopsy.dm
+1 -1
View File
@@ -74,7 +74,7 @@
var/dead_notes = input("Insert any relevant notes")
var/obj/item/paper/R = new(user.loc)
R.name = "Official Coroner's Report - [dead_name]"
R.info = "<b>Nanotrasen Science Station [using_map.station_short] - Coroner's Report</b><br><br><b>Name of Deceased:</b> [dead_name]</br><br><b>Rank of Deceased:</b> [dead_rank]<br><br><b>Time of Death:</b> [dead_tod]<br><br><b>Cause of Death:</b> [dead_cause]<br><br><b>Trace Chemicals:</b> [dead_chems]<br><br><b>Additional Coroner's Notes:</b> [dead_notes]<br><br><b>Coroner's Signature:</b> <span class=\"paper_field\">"
R.info = "<b>Nanotrasen Science Station [GLOB.using_map.station_short] - Coroner's Report</b><br><br><b>Name of Deceased:</b> [dead_name]</br><br><b>Rank of Deceased:</b> [dead_rank]<br><br><b>Time of Death:</b> [dead_tod]<br><br><b>Cause of Death:</b> [dead_cause]<br><br><b>Trace Chemicals:</b> [dead_chems]<br><br><b>Additional Coroner's Notes:</b> [dead_notes]<br><br><b>Coroner's Signature:</b> <span class=\"paper_field\">"
playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
sleep(10)
user.put_in_hands(R)
code/game/objects/items/devices/camera_bug.dm
+1 -1
View File
@@ -73,7 +73,7 @@
/obj/item/camera_bug/proc/get_cameras()
if(world.time > (last_net_update + 100))
bugged_cameras = list()
for(var/obj/machinery/camera/camera in cameranet.cameras)
for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras)
if(camera.stat || !camera.can_use())
continue
if(length(list("SS13","MINE")&camera.network))
code/game/objects/items/devices/instruments.dm
+1 -1
View File
@@ -35,7 +35,7 @@
song.ui_interact(user, ui_key, ui, force_open)
/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
return song.ui_data(user, ui_key, state)
/obj/item/instrument/Topic(href, href_list)
code/game/objects/items/devices/paicard.dm
+1 -1
View File
@@ -264,7 +264,7 @@
return
last_request = world.time / 10
looking_for_personality = 1
paiController.findPAI(src, usr)
GLOB.paiController.findPAI(src, usr)
if(href_list["wipe"])
var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No")
if(confirm == "Yes")
code/game/objects/items/devices/pipe_painter.dm
+2 -2
View File
@@ -9,7 +9,7 @@
/obj/item/pipe_painter/New()
..()
modes = new()
for(var/C in pipe_colors)
for(var/C in GLOB.pipe_colors)
modes += "[C]"
mode = pick(modes)
@@ -23,7 +23,7 @@
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
return
P.change_color(pipe_colors[mode])
P.change_color(GLOB.pipe_colors[mode])
/obj/item/pipe_painter/attack_self(mob/user as mob)
mode = input("Which colour do you want to use?", "Pipe Painter", mode) in modes
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -103,7 +103,7 @@
ui.open()
ui.set_auto_update(1)
/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["power"] = on
code/game/objects/items/devices/radio/intercom.dm
+1 -1
View File
@@ -63,7 +63,7 @@
/obj/item/radio/intercom/department/medbay/New()
..()
internal_channels = default_medbay_channels.Copy()
internal_channels = GLOB.default_medbay_channels.Copy()
/obj/item/radio/intercom/department/security/New()
..()
code/game/objects/items/devices/radio/radio.dm
+11 -11
View File
@@ -1,4 +1,4 @@
var/global/list/default_internal_channels = list(
GLOBAL_LIST_INIT(default_internal_channels, list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(ACCESS_CAPTAIN),
num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
@@ -11,13 +11,13 @@ var/global/list/default_internal_channels = list(
num2text(SCI_FREQ) = list(ACCESS_RESEARCH),
num2text(SUP_FREQ) = list(ACCESS_CARGO),
num2text(SRV_FREQ) = list(ACCESS_HOP, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CLOWN, ACCESS_MIME)
)
))
var/global/list/default_medbay_channels = list(
GLOBAL_LIST_INIT(default_medbay_channels, list(
num2text(PUB_FREQ) = list(),
num2text(MED_FREQ) = list(ACCESS_MEDICAL),
num2text(MED_I_FREQ) = list(ACCESS_MEDICAL)
)
))
/obj/item/radio
icon = 'icons/obj/radio.dmi'
@@ -69,7 +69,7 @@ var/global/list/default_medbay_channels = list(
..()
wires = new(src)
internal_channels = default_internal_channels.Copy()
internal_channels = GLOB.default_internal_channels.Copy()
GLOB.global_radios |= src
/obj/item/radio/Destroy()
@@ -116,7 +116,7 @@ var/global/list/default_medbay_channels = list(
ui.open()
ui.set_auto_update(1)
/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["mic_status"] = broadcasting
@@ -448,12 +448,12 @@ var/global/list/default_medbay_channels = list(
//#### Sending the signal to all subspace receivers ####//
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
for(var/obj/machinery/telecomms/receiver/R in GLOB.telecomms_list)
spawn(0)
R.receive_signal(signal)
// Allinone can act as receivers.
for(var/obj/machinery/telecomms/allinone/R in telecomms_list)
for(var/obj/machinery/telecomms/allinone/R in GLOB.telecomms_list)
spawn(0)
R.receive_signal(signal)
@@ -503,7 +503,7 @@ var/global/list/default_medbay_channels = list(
)
signal.frequency = connection.frequency // Quick frequency set
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
for(var/obj/machinery/telecomms/receiver/R in GLOB.telecomms_list)
spawn(0)
R.receive_signal(signal)
@@ -812,7 +812,7 @@ var/global/list/default_medbay_channels = list(
ui.open()
ui.set_auto_update(1)
/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["mic_status"] = broadcasting
@@ -863,4 +863,4 @@ var/global/list/default_medbay_channels = list(
/obj/item/radio/phone/medbay/New()
..()
internal_channels = default_medbay_channels.Copy()
internal_channels = GLOB.default_medbay_channels.Copy()
code/game/objects/items/devices/taperecorder.dm
-2
View File
@@ -194,13 +194,11 @@
if(mytape.storedinfo.len < i + 1)
playsleepseconds = 1
sleep(10)
T = get_turf(src)
atom_say("End of recording.")
else
playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i]
if(playsleepseconds > 14)
sleep(10)
T = get_turf(src)
atom_say("Skipping [playsleepseconds] seconds of silence.")
playsleepseconds = 1
i++
code/game/objects/items/devices/transfer_valve.dm
+1 -1
View File
@@ -100,7 +100,7 @@
// auto update every Master Controller tick
//ui.set_auto_update(1)
/obj/item/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
/obj/item/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
data["attachmentOne"] = tank_one ? tank_one.name : null
code/game/objects/items/devices/uplinks.dm
+7 -7
View File
@@ -6,7 +6,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
*/
var/list/world_uplinks = list()
GLOBAL_LIST_EMPTY(world_uplinks)
/obj/item/uplink
var/welcome // Welcoming menu message
@@ -35,10 +35,10 @@ var/list/world_uplinks = list()
uses = SSticker.mode.uplink_uses
uplink_items = get_uplink_items()
world_uplinks += src
GLOB.world_uplinks += src
/obj/item/uplink/Destroy()
world_uplinks -= src
GLOB.world_uplinks -= src
return ..()
/obj/item/uplink/proc/generate_items(mob/user as mob)
@@ -216,7 +216,7 @@ var/list/world_uplinks = list()
/*
NANO UI FOR UPLINK WOOP WOOP
*/
/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = GLOB.inventory_state)
var/title = "Remote Uplink"
// update the ui if it exists, returns null if no ui is passed/found
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -227,7 +227,7 @@ var/list/world_uplinks = list()
// open the new ui window
ui.open()
/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
/obj/item/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.inventory_state)
var/data[0]
data["welcome"] = welcome
@@ -277,14 +277,14 @@ var/list/world_uplinks = list()
/obj/item/uplink/hidden/proc/update_nano_data(var/id)
if(nanoui_menu == 1)
var/permanentData[0]
for(var/datum/data/record/L in sortRecord(data_core.general))
for(var/datum/data/record/L in sortRecord(GLOB.data_core.general))
permanentData[++permanentData.len] = list(Name = sanitize(L.fields["name"]),"id" = L.fields["id"])
nanoui_data["exploit_records"] = permanentData
if(nanoui_menu == 11)
nanoui_data["exploit_exists"] = 0
for(var/datum/data/record/L in data_core.general)
for(var/datum/data/record/L in GLOB.data_core.general)
if(L.fields["id"] == id)
nanoui_data["exploit"] = list() // Setting this to equal L.fields passes it's variables that are lists as reference instead of value.
nanoui_data["exploit"]["name"] = html_encode(L.fields["name"])