mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 11:05:03 +01:00
Makes all global variables handled by the GLOB controller (#13152)
* 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:
@@ -212,7 +212,7 @@
|
||||
/obj/structure/closet/crate/proc/notifyRecipient(var/destination)
|
||||
var/msg = "[capitalize(name)] has arrived at [destination]."
|
||||
if(destination in announce_beacons)
|
||||
for(var/obj/machinery/requests_console/D in allConsoles)
|
||||
for(var/obj/machinery/requests_console/D in GLOB.allRequestConsoles)
|
||||
if(D.department in src.announce_beacons[destination])
|
||||
D.createMessage(name, "Your Crate has Arrived!", msg, 1)
|
||||
|
||||
|
||||
@@ -245,6 +245,7 @@
|
||||
|
||||
/obj/structure/falsewall/plasma/attackby(obj/item/W, mob/user, params)
|
||||
if(is_hot(W) > 300)
|
||||
var/turf/T = locate(user)
|
||||
message_admins("Plasma falsewall ignited by [key_name_admin(user)] in [ADMIN_VERBOSEJMP(T)]")
|
||||
log_game("Plasma falsewall ignited by [key_name(user)] in [AREACOORD(T)]")
|
||||
investigate_log("was <font color='red'><b>ignited</b></font> by [key_name(user)]","atmos")
|
||||
|
||||
@@ -135,13 +135,13 @@
|
||||
var/voice_mutation
|
||||
switch(voice_choice)
|
||||
if("Comic Sans")
|
||||
voice_mutation = COMICBLOCK
|
||||
voice_mutation = GLOB.comicblock
|
||||
if("Wingdings")
|
||||
voice_mutation = WINGDINGSBLOCK
|
||||
voice_mutation = GLOB.wingdingsblock
|
||||
if("Swedish")
|
||||
voice_mutation = SWEDEBLOCK
|
||||
voice_mutation = GLOB.swedeblock
|
||||
if("Chav")
|
||||
voice_mutation = CHAVBLOCK
|
||||
voice_mutation = GLOB.chavblock
|
||||
if(voice_mutation)
|
||||
if(H.dna.GetSEState(voice_mutation))
|
||||
H.dna.SetSEState(voice_mutation, FALSE)
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
if(user.z != src.z) return
|
||||
|
||||
user.loc.loc.Exited(user)
|
||||
user.loc = pick(carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
|
||||
user.loc = pick(GLOB.carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
|
||||
|
||||
|
||||
playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1)
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
ui.open()
|
||||
ui.set_auto_update(1)
|
||||
|
||||
/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
|
||||
/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
|
||||
var/data[0]
|
||||
|
||||
data["lines"] = lines
|
||||
@@ -309,7 +309,7 @@
|
||||
|
||||
song.ui_interact(user, ui_key, ui, force_open)
|
||||
|
||||
/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
|
||||
/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
|
||||
return song.ui_data(user, ui_key, state)
|
||||
|
||||
/obj/structure/piano/Topic(href, href_list)
|
||||
|
||||
@@ -185,7 +185,7 @@ GLOBAL_LIST_EMPTY(safes)
|
||||
ui.open()
|
||||
ui.set_auto_update(1)
|
||||
|
||||
/obj/structure/safe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
|
||||
/obj/structure/safe/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
|
||||
var/data[0]
|
||||
var/list/contents_names = list()
|
||||
if(open)
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
/obj/structure/dispenser/attack_ghost(mob/user)
|
||||
ui_interact(user)
|
||||
|
||||
/obj/structure/dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
|
||||
/obj/structure/dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state)
|
||||
user.set_machine(src)
|
||||
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
|
||||
if(!ui)
|
||||
|
||||
@@ -704,7 +704,7 @@
|
||||
return
|
||||
if(proximity_flag != 1) //if we aren't next to the wall
|
||||
return
|
||||
if(!(get_dir(on_wall, user) in cardinal))
|
||||
if(!(get_dir(on_wall, user) in GLOB.cardinal))
|
||||
to_chat(user, "<span class='warning'>You need to be standing next to a wall to place \the [src].</span>")
|
||||
return
|
||||
return 1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var/global/wcBar = pick(list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#ffffff"))
|
||||
var/global/wcBrig = pick(list("#aa0808", "#7f0606", "#ff0000"))
|
||||
var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff"))
|
||||
GLOBAL_LIST_INIT(wcBar, pick(list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#ffffff")))
|
||||
GLOBAL_LIST_INIT(wcBrig, pick(list("#aa0808", "#7f0606", "#ff0000")))
|
||||
GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff")))
|
||||
|
||||
/obj/proc/color_windows(obj/W)
|
||||
var/list/wcBarAreas = list(/area/crew_quarters/bar)
|
||||
@@ -13,11 +13,11 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
|
||||
var/area/A = T.loc
|
||||
|
||||
if(is_type_in_list(A,wcBarAreas))
|
||||
newcolor = wcBar
|
||||
newcolor = GLOB.wcBar
|
||||
else if(is_type_in_list(A,wcBrigAreas))
|
||||
newcolor = wcBrig
|
||||
newcolor = GLOB.wcBrig
|
||||
else
|
||||
newcolor = wcCommon
|
||||
newcolor = GLOB.wcCommon
|
||||
|
||||
return newcolor
|
||||
|
||||
|
||||
Reference in New Issue
Block a user