This reading has been detected within shuttle range of the [current_map.station_name] and deemed safe for survey by [current_map.company_name] personnel. \
+ ruintext += "This reading has been detected within shuttle range of the [SSatlas.current_map.station_name] and deemed safe for survey by [SSatlas.current_map.company_name] personnel. \
The designated research director, or a captain level decision may determine the goal of any missions to this site. On-site command is deferred to any nearby command staff.
"
return ruintext
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
index cd8be6222b1..f1c5983af88 100644
--- a/code/datums/helper_datums/getrev.dm
+++ b/code/datums/helper_datums/getrev.dm
@@ -54,7 +54,7 @@ var/global/datum/getrev/revdata = new()
else
to_chat(src, "Revision unknown")
- to_chat(src, "Current Map: [current_map.full_name]")
+ to_chat(src, "Current Map: [SSatlas.current_map.full_name]")
/datum/getrev/proc/testmerge_overview()
if (!test_merges.len)
diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm
index 77cbf6e3dd9..025260ed001 100644
--- a/code/datums/uplink/announcements.dm
+++ b/code/datums/uplink/announcements.dm
@@ -11,10 +11,10 @@
/datum/uplink_item/abstract/announcements/fake_centcom/New()
..()
- name = "[current_map.boss_name] Update Announcement"
+ name = "[SSatlas.current_map.boss_name] Update Announcement"
telecrystal_cost = 5
bluecrystal_cost = 5
- desc = "Causes a falsified [current_map.boss_name] Update. Triggers immediately after supplying additional data."
+ desc = "Causes a falsified [SSatlas.current_map.boss_name] Update. Triggers immediately after supplying additional data."
/datum/uplink_item/abstract/announcements/fake_centcom/extra_args(var/mob/user)
var/title = tgui_input_text(user, "Enter your announcement title.", "Announcement Title", encode = FALSE)
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index e3a89dce180..0033957f9d9 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -24,15 +24,15 @@
/datum/announcement/priority/command/New(var/do_log = 1, var/new_sound = 'sound/misc/announcements/notice.ogg', var/do_newscast = 0, var/do_print = 0)
..(do_log, new_sound, do_newscast, do_print)
- title = "[current_map.boss_name] Update"
- announcement_type = "[current_map.boss_name] Update"
+ title = "[SSatlas.current_map.boss_name] Update"
+ announcement_type = "[SSatlas.current_map.boss_name] Update"
/datum/announcement/priority/security/New(var/do_log = 1, var/new_sound = 'sound/misc/announcements/notice.ogg', var/do_newscast = 0, var/do_print = 0)
..(do_log, new_sound, do_newscast, do_print)
title = "Security Announcement"
announcement_type = "Security Announcement"
-/datum/announcement/proc/Announce(var/message, var/new_title = "", var/new_sound = null, var/do_newscast = newscast, var/msg_sanitized = 0, var/do_print = 0, var/zlevels = current_map.contact_levels)
+/datum/announcement/proc/Announce(var/message, var/new_title = "", var/new_sound = null, var/do_newscast = newscast, var/msg_sanitized = 0, var/do_print = 0, var/zlevels = SSatlas.current_map.contact_levels)
if(!message)
return
var/message_title = length(new_title) ? new_title : title
@@ -44,7 +44,7 @@
var/msg = FormMessage(message, message_title)
for(var/mob/M in GLOB.player_list)
- if(!istype(M, /mob/abstract/new_player) && !isdeaf(M) && (GET_Z(M) in (zlevels | current_map.admin_levels)))
+ if(!istype(M, /mob/abstract/new_player) && !isdeaf(M) && (GET_Z(M) in (zlevels | SSatlas.current_map.admin_levels)))
var/turf/T = get_turf(M)
if(T)
to_chat(M, msg)
@@ -66,7 +66,7 @@
. = "[message]"
/datum/announcement/priority/command/FormMessage(var/message, var/message_title)
- . = "[current_map.boss_name] Update
"
+ . = "[SSatlas.current_map.boss_name] Update
"
if (message_title)
. += "[message_title]
"
@@ -100,10 +100,10 @@
// Format currently matches that of newscaster feeds: Registered Name (Assigned Rank)
return I.assignment ? "[I.registered_name], [I.assignment]" : I.registered_name
-/proc/level_seven_announcement(var/list/affecting_z = current_map.station_levels)
+/proc/level_seven_announcement(var/list/affecting_z = SSatlas.current_map.station_levels)
command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/level_7_biohazard.ogg', zlevels = affecting_z)
-/proc/ion_storm_announcement(var/list/affecting_z = current_map.station_levels)
+/proc/ion_storm_announcement(var/list/affecting_z = SSatlas.current_map.station_levels)
command_announcement.Announce("It has come to our attention that the ship has passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert", zlevels = affecting_z)
/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message)
@@ -112,5 +112,5 @@
rank = character.mind.role_alt_title
AnnounceArrivalSimple(character.real_name, rank, join_message)
-/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "has arrived on the [current_map.station_type]", var/new_sound = 'sound/misc/announcements/notice.ogg')
+/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "has arrived on the [SSatlas.current_map.station_type]", var/new_sound = 'sound/misc/announcements/notice.ogg')
GLOB.global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcer")
diff --git a/code/game/antagonist/antagonist_add.dm b/code/game/antagonist/antagonist_add.dm
index 3dc2db5ac1b..964abff8511 100644
--- a/code/game/antagonist/antagonist_add.dm
+++ b/code/game/antagonist/antagonist_add.dm
@@ -98,7 +98,7 @@
//Run the query to insert the antagonist into the db
var/DBQuery/new_log = GLOB.dbcon.NewQuery("INSERT INTO ss13_antag_log ( ckey, char_id, game_id, char_name, special_role_name, special_role_added) VALUES ( :ckey:, :char_id:, :game_id:, :char_name:, :special_role_name:, :special_role_added:)")
- new_log.Execute(list("ckey" = ckey(player.key) , "char_id" = char_id, "game_id" = game_id, "char_name" = player.current.name, "special_role_name"=role_text,"special_role_added" = "[get_round_duration_formatted()]:00"))
+ new_log.Execute(list("ckey" = ckey(player.key) , "char_id" = char_id, "game_id" = GLOB.round_id, "char_name" = player.current.name, "special_role_name"=role_text,"special_role_added" = "[get_round_duration_formatted()]:00"))
//Run the query to get the inserted id
var/DBQuery/log_id = GLOB.dbcon.NewQuery("SELECT LAST_INSERT_ID() AS log_id")
diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm
index 887336013fd..3daaf1c2f7a 100644
--- a/code/game/antagonist/outsider/ninja.dm
+++ b/code/game/antagonist/outsider/ninja.dm
@@ -119,26 +119,26 @@ var/datum/antagonist/ninja/ninjas
return TRUE
/datum/antagonist/ninja/proc/generate_ninja_directive(side)
- var/directive = "[side=="face"?"[current_map.company_name]":"A criminal syndicate"] is your employer. "//Let them know which side they're on.
+ var/directive = "[side=="face"?"[SSatlas.current_map.company_name]":"A criminal syndicate"] is your employer. "//Let them know which side they're on.
switch(rand(1,19))
if(1)
directive += "The Spider Clan must not be linked to this operation. Remain hidden and covert when possible."
if(2)
- directive += "[current_map.station_name] is financed by an enemy of the Spider Clan. Cause as much structural damage as desired."
+ directive += "[SSatlas.current_map.station_name] is financed by an enemy of the Spider Clan. Cause as much structural damage as desired."
if(3)
directive += "A wealthy animal rights activist has made a request we cannot refuse. Prioritize saving animal lives whenever possible."
if(4)
directive += "The Spider Clan absolutely cannot be linked to this operation. Eliminate witnesses at your discretion."
if(5)
- directive += "We are currently negotiating with [current_map.company_name] [current_map.boss_name]. Prioritize saving human lives over ending them."
+ directive += "We are currently negotiating with [SSatlas.current_map.company_name] [SSatlas.current_map.boss_name]. Prioritize saving human lives over ending them."
if(6)
- directive += "We are engaged in a legal dispute over [current_map.station_name]. If a lawyer is present on board, force their cooperation in the matter."
+ directive += "We are engaged in a legal dispute over [SSatlas.current_map.station_name]. If a lawyer is present on board, force their cooperation in the matter."
if(7)
directive += "A financial backer has made an offer we cannot refuse. Implicate criminal involvement in the operation."
if(8)
directive += "Let no one question the mercy of the Spider Clan. Ensure the safety of all non-essential personnel you encounter."
if(9)
- directive += "A free agent has proposed a lucrative business deal. Implicate [current_map.company_name] involvement in the operation."
+ directive += "A free agent has proposed a lucrative business deal. Implicate [SSatlas.current_map.company_name] involvement in the operation."
if(10)
directive += "Our reputation is on the line. Harm as few civilians and innocents as possible."
if(11)
@@ -146,14 +146,14 @@ var/datum/antagonist/ninja/ninjas
if(12)
directive += "We are currently negotiating with a mercenary leader. Disguise assassinations as suicide or other natural causes."
if(13)
- directive += "Some disgruntled [current_map.company_name] employees have been supportive of our operations. Be wary of any mistreatment by command staff."
+ directive += "Some disgruntled [SSatlas.current_map.company_name] employees have been supportive of our operations. Be wary of any mistreatment by command staff."
if(14)
var/xenorace = pick("Unathi","Tajara", "Skrell")
directive += "A group of [xenorace] radicals have been loyal supporters of the Spider Clan. Favor [xenorace] crew whenever possible."
if(15)
directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the Chaplain and prove these accusations false."
if(16)
- directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine [current_map.company_name] prosthetics in a bad light."
+ directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine [SSatlas.current_map.company_name] prosthetics in a bad light."
if(17)
directive += "The Spider Clan has recently begun recruiting outsiders. Consider suitable candidates and assess their behavior amongst the crew."
if(18)
diff --git a/code/game/antagonist/outsider/revenant.dm b/code/game/antagonist/outsider/revenant.dm
index 33c8a9f8fd1..f525ed2804a 100644
--- a/code/game/antagonist/outsider/revenant.dm
+++ b/code/game/antagonist/outsider/revenant.dm
@@ -27,7 +27,7 @@ var/datum/antagonist/revenant/revenants = null
revenants.revenant_rift = null
revenants.rifts_left--
if(revenants.rifts_left <= 0)
- command_announcement.Announce("[current_map.station_name], we aren't detecting any more rift energy signatures. Mop up the rest of the invaders. Good work.", "Bluespace Breach Alert")
+ command_announcement.Announce("[SSatlas.current_map.station_name], we aren't detecting any more rift energy signatures. Mop up the rest of the invaders. Good work.", "Bluespace Breach Alert")
/datum/antagonist/revenant/is_obvious_antag(datum/mind/player)
return TRUE
diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm
index 9dd41a21273..5a43d5c2da4 100644
--- a/code/game/antagonist/station/revolutionary.dm
+++ b/code/game/antagonist/station/revolutionary.dm
@@ -35,8 +35,8 @@ var/datum/antagonist/revolutionary/revs
revs = src
/datum/antagonist/revolutionary/create_antagonist()
- faction_welcome = "You joined a subversive organization in the crew of the [current_map.station_name]. United under a forward-thinking leader, you must achieve their goals."
- welcome_text = "You are a subversive seeking to demolish the current order on the [current_map.station_type] by whatever means possible. Recruit friends and strangers alike to bring [current_map.company_short]'s tyranny to an end! Or whatever your objective is."
+ faction_welcome = "You joined a subversive organization in the crew of the [SSatlas.current_map.station_name]. United under a forward-thinking leader, you must achieve their goals."
+ welcome_text = "You are a subversive seeking to demolish the current order on the [SSatlas.current_map.station_type] by whatever means possible. Recruit friends and strangers alike to bring [SSatlas.current_map.company_short]'s tyranny to an end! Or whatever your objective is."
/datum/antagonist/revolutionary/create_global_objectives()
if(!..())
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 58c0a149d7f..231412acb2d 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -284,7 +284,7 @@
return
/atom/movable/proc/touch_map_edge()
- if(z in current_map.sealed_levels)
+ if(z in SSatlas.current_map.sealed_levels)
return
if(anchored)
@@ -293,7 +293,7 @@
if(!GLOB.universe.OnTouchMapEdge(src))
return
- if(current_map.use_overmap)
+ if(SSatlas.current_map.use_overmap)
overmap_spacetravel(get_turf(src), src)
return
@@ -330,7 +330,7 @@
//by default, transition randomly to another zlevel
/atom/movable/proc/get_transit_zlevel()
- return current_map.get_transit_zlevel()
+ return SSatlas.current_map.get_transit_zlevel()
// Returns the current scaling of the sprite.
// Note this DOES NOT measure the height or width of the icon, but returns what number is being multiplied with to scale the icons, if any.
diff --git a/code/game/base_turf.dm b/code/game/base_turf.dm
index 433f5ac2295..952496a41a3 100644
--- a/code/game/base_turf.dm
+++ b/code/game/base_turf.dm
@@ -1,7 +1,7 @@
/proc/get_base_turf(var/z)
- if(!current_map.base_turf_by_z["[z]"])
- current_map.base_turf_by_z["[z]"] = /turf/space
- return current_map.base_turf_by_z["[z]"]
+ if(!SSatlas.current_map.base_turf_by_z["[z]"])
+ SSatlas.current_map.base_turf_by_z["[z]"] = /turf/space
+ return SSatlas.current_map.base_turf_by_z["[z]"]
//An area can override the z-level base turf, so our solar array areas etc. can be space-based.
/proc/get_base_turf_by_area(var/turf/T)
@@ -29,6 +29,6 @@
var/new_base_path = input("Please select a turf path (cancel to reset to /turf/space).") as null|anything in typesof(/turf)
if(!new_base_path)
new_base_path = /turf/space
- current_map.base_turf_by_z["[choice]"] = new_base_path
+ SSatlas.current_map.base_turf_by_z["[choice]"] = new_base_path
message_admins("[key_name_admin(usr)] has set the base turf for z-level [choice] to [get_base_turf(choice)].")
log_admin("[key_name(usr)] has set the base turf for z-level [choice] to [get_base_turf(choice)].",admin_key=key_name(usr))
diff --git a/code/game/gamemodes/burglars/burglars.dm b/code/game/gamemodes/burglars/burglars.dm
index 48753065f5c..f0f3595d507 100644
--- a/code/game/gamemodes/burglars/burglars.dm
+++ b/code/game/gamemodes/burglars/burglars.dm
@@ -10,5 +10,5 @@
antag_tags = list(MODE_BURGLAR)
/datum/game_mode/burglars/pre_setup()
- extended_round_description = "Two of the Orion Spur's best and brightest (or so they were told) have been tasked with burglarizing a [current_map.station_type] that will change the way capitalism grips this galaxy forever (or so they were told). It is up to the crew to repel them, and up to them to survive and possibly thrive."
+ extended_round_description = "Two of the Orion Spur's best and brightest (or so they were told) have been tasked with burglarizing a [SSatlas.current_map.station_type] that will change the way capitalism grips this galaxy forever (or so they were told). It is up to the crew to repel them, and up to them to survive and possibly thrive."
. = ..()
diff --git a/code/game/gamemodes/changeling/helpers/changeling.dm b/code/game/gamemodes/changeling/helpers/changeling.dm
index 46c1f426c6b..7dc50114a88 100644
--- a/code/game/gamemodes/changeling/helpers/changeling.dm
+++ b/code/game/gamemodes/changeling/helpers/changeling.dm
@@ -7,12 +7,12 @@
antag_tags = list(MODE_CHANGELING)
/datum/game_mode/changeling/pre_setup()
- round_description = "There are alien changelings on the [current_map.station_type]. Do not let the changelings succeed!"
+ round_description = "There are alien changelings on the [SSatlas.current_map.station_type]. Do not let the changelings succeed!"
extended_round_description = "Life always finds a way. However, life can sometimes take a more disturbing route. \
Humanity's extensive knowledge of xeno-biological specimens has made them confident and arrogant. Yet \
something slipped past their eyes. Something dangerous. Something alive. Most frightening of all, \
however, is that this something is someone. An unknown alien specimen has incorporated itself into \
- the crew of the [current_map.station_type]. Its unique biology allows it to manipulate its own or anyone else's DNA. \
+ the crew of the [SSatlas.current_map.station_type]. Its unique biology allows it to manipulate its own or anyone else's DNA. \
With the ability to copy faces, voices, animals, but also change the chemical make up of your own body, \
its existence is a threat to not only your personal safety but the lives of everyone on board. \
No one knows where it came from. No one knows who it is or what it wants. One thing is for \
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index ac5fe62094d..188f424f2fb 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -7,7 +7,7 @@
/datum/game_mode/cult/pre_setup()
round_description = "Some crewmembers are attempting to start a cult!"
- extended_round_description = "The [current_map.station_type] has been infiltrated by a fanatical group of death-cultists! \
+ extended_round_description = "The [SSatlas.current_map.station_type] has been infiltrated by a fanatical group of death-cultists! \
They will use powers from beyond your comprehension to subvert you to their cause and \
ultimately please their gods through sacrificial summons and physical immolation! Try to survive!"
. = ..()
diff --git a/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm b/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm
index f46aca67024..47c80fd192d 100644
--- a/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm
+++ b/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm
@@ -8,7 +8,7 @@
affected_levels = zlevels
/datum/universal_state/bluespace_jump/OnEnter()
- var/space_zlevel = current_map.get_empty_zlevel() //get a place for stragglers
+ var/space_zlevel = SSatlas.current_map.get_empty_zlevel() //get a place for stragglers
for(var/mob/living/M in GLOB.mob_list)
if(M.z in affected_levels)
var/area/A = get_area(M)
@@ -18,9 +18,9 @@
M.forceMove(T)
else
apply_bluespaced(M)
- old_accessible_z_levels = current_map.accessible_z_levels.Copy()
+ old_accessible_z_levels = SSatlas.current_map.accessible_z_levels.Copy()
for(var/z in affected_levels)
- current_map.accessible_z_levels -= "[z]" //not accessible during the jump
+ SSatlas.current_map.accessible_z_levels -= "[z]" //not accessible during the jump
/datum/universal_state/bluespace_jump/OnExit()
for(var/mob/M in bluespaced)
@@ -28,7 +28,7 @@
clear_bluespaced(M)
bluespaced.Cut()
- current_map.accessible_z_levels = old_accessible_z_levels
+ SSatlas.current_map.accessible_z_levels = old_accessible_z_levels
old_accessible_z_levels = null
/datum/universal_state/bluespace_jump/OnPlayerLatejoin(var/mob/living/M)
diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
index 62bd20608d5..9a72d4e226d 100644
--- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
@@ -75,7 +75,7 @@ There's been a galaxy-wide electromagnetic pulse. All of our systems are heavil
You have five minutes before the universe collapses. Good l\[\[###!!!-
-AUTOMATED ALERT: Link to [current_map.boss_name] lost.
+AUTOMATED ALERT: Link to [SSatlas.current_map.boss_name] lost.
The access requirements on the Asteroid Shuttles' consoles have now been revoked.
"}
@@ -87,7 +87,7 @@ The access requirements on the Asteroid Shuttles' consoles have now been revoked
C.req_one_access = list()
/datum/universal_state/supermatter_cascade/proc/end_universe()
- SSticker.station_explosion_cinematic(0, null, current_map.player_levels) // TODO: Custom cinematic
+ SSticker.station_explosion_cinematic(0, null, SSatlas.current_map.player_levels) // TODO: Custom cinematic
universe_has_ended = 1
/datum/universal_state/supermatter_cascade/proc/AreaSet()
diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm
index 35c693952b3..57c68fe2817 100644
--- a/code/game/gamemodes/events/clang.dm
+++ b/code/game/gamemodes/events/clang.dm
@@ -76,7 +76,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
sleep(1)
while (immrod)
if (isNotStationLevel(immrod.z))
- immrod.z = pick(current_map.station_levels)
+ immrod.z = pick(SSatlas.current_map.station_levels)
if(immrod.loc == end)
qdel(immrod)
sleep(10)
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 6fe42cf7fcb..4fbc8b1de94 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -277,9 +277,9 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(display_logout_report)), ROUNDSTART_LOGOUT_REPORT_TIME)
var/welcome_delay = rand(waittime_l, waittime_h)
- addtimer(CALLBACK(current_map, TYPE_PROC_REF(/datum/map, send_welcome)), welcome_delay)
+ addtimer(CALLBACK(SSatlas.current_map, TYPE_PROC_REF(/datum/map, send_welcome)), welcome_delay)
- addtimer(CALLBACK(current_map, TYPE_PROC_REF(/datum/map, load_holodeck_programs)), 5 MINUTES)
+ addtimer(CALLBACK(SSatlas.current_map, TYPE_PROC_REF(/datum/map, load_holodeck_programs)), 5 MINUTES)
//Assign all antag types for this game mode. Any players spawned as antags earlier should have been removed from the pending list, so no need to worry about those.
for(var/datum/antagonist/antag in antag_templates)
@@ -347,7 +347,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
/datum/game_mode/proc/declare_completion()
var/is_antag_mode = (antag_templates && antag_templates.len)
- var/discord_text = "A round of **[name]** has ended! \[Game ID: [game_id]\]\n\n"
+ var/discord_text = "A round of **[name]** has ended! \[Game ID: [GLOB.round_id]\]\n\n"
var/antag_text = ""
check_victory()
if(is_antag_mode)
@@ -407,7 +407,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
to_world(text)
SSdiscord.send_to_announce(discord_text)
- SSdiscord.post_webhook_event(WEBHOOK_ROUNDEND, list("survivours"=surviving_total, "escaped"=escaped_total, "ghosts"=ghosts, "gamemode"=name, "gameid"=game_id, "antags"=antag_text))
+ SSdiscord.post_webhook_event(WEBHOOK_ROUNDEND, list("survivours"=surviving_total, "escaped"=escaped_total, "ghosts"=ghosts, "gamemode"=name, "gameid"=GLOB.round_id, "antags"=antag_text))
if(clients > 0)
feedback_set("round_end_clients", clients)
diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm
index 62320343116..8b38e3ad94d 100644
--- a/code/game/gamemodes/heist/heist.dm
+++ b/code/game/gamemodes/heist/heist.dm
@@ -6,9 +6,9 @@
antag_tags = list(MODE_RAIDER)
/datum/game_mode/heist/pre_setup()
- round_description = "An unidentified bluespace signature has slipped past the Icarus and is approaching the [current_map.station_type]!"
+ round_description = "An unidentified bluespace signature has slipped past the Icarus and is approaching the [SSatlas.current_map.station_type]!"
extended_round_description = "The galaxy is a place full of dangers, even the inner colonies are not free of such scourges. \
- Raiders and pirates are a well-know threat in the inhabited space, and places such as [current_map.station_type]s are easy targets \
+ Raiders and pirates are a well-know threat in the inhabited space, and places such as [SSatlas.current_map.station_type]s are easy targets \
for their greedy plans."
. = ..()
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
index 5286d5e482c..e2f04c4c2e6 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
@@ -181,7 +181,7 @@
// log_ability_use(user, "advanced encryption hack (FAIL - title: [reporttitle])")
// return
log_ability_use(user, "advanced encryption hack (SUCCESS - title: [reporttitle])")
- to_world("New [current_map.company_name] Update available at all communication consoles.")
+ to_world("New [SSatlas.current_map.company_name] Update available at all communication consoles.")
sound_to(world, ('sound/AI/commandreport.ogg'))
post_comm_message(reporttitle, reportbody)
@@ -249,7 +249,7 @@
sleep(duration/5)
if(!user || user.stat == DEAD)
return
- command_announcement.Announce("Notice: Trace Update. Abnormal network activity originating from: Network terminal aboard [current_map.station_name]. External network connections disabled. Trace cancelled.", "Network Monitoring")
+ command_announcement.Announce("Notice: Trace Update. Abnormal network activity originating from: Network terminal aboard [SSatlas.current_map.station_name]. External network connections disabled. Trace cancelled.", "Network Monitoring")
sleep(duration/5)
if(!user || user.stat == DEAD)
return
diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm
index a5442906f0e..71650899faf 100644
--- a/code/game/gamemodes/meteor/meteor.dm
+++ b/code/game/gamemodes/meteor/meteor.dm
@@ -38,8 +38,8 @@
/datum/game_mode/meteor/post_setup()
..()
alert_title = "Automated Beacon AB-[rand(10, 99)]"
- alert_text = "This is an automatic warning. The [current_map.full_name] is on a collision course with a nearby asteroid belt. Estimated time until impact is: [meteor_grace_period / 1200] MINUTES. Please perform necessary actions to secure your ship or station from the threat. Have a nice day."
- start_text = "This is an automatic warning. The [current_map.full_name] has entered an asteroid belt. Estimated time until you leave the belt is: [rand(20,30)] HOURS and [rand(1, 59)] MINUTES. For your safety, please consider changing course or using protective equipment. Have a nice day."
+ alert_text = "This is an automatic warning. The [SSatlas.current_map.full_name] is on a collision course with a nearby asteroid belt. Estimated time until impact is: [meteor_grace_period / 1200] MINUTES. Please perform necessary actions to secure your ship or station from the threat. Have a nice day."
+ start_text = "This is an automatic warning. The [SSatlas.current_map.full_name] has entered an asteroid belt. Estimated time until you leave the belt is: [rand(20,30)] HOURS and [rand(1, 59)] MINUTES. For your safety, please consider changing course or using protective equipment. Have a nice day."
next_wave = round_duration_in_ticks + meteor_grace_period
/datum/game_mode/meteor/proc/on_meteor_warn()
@@ -49,7 +49,7 @@
/datum/game_mode/meteor/proc/on_enter_field()
alert_sent = 2
command_announcement.Announce(start_text, alert_title)
- if(current_map.use_overmap)
+ if(SSatlas.current_map.use_overmap)
var/area/map = global.map_overmap
for(var/turf/T in map)
new/obj/effect/overmap/event/meteor(T)
@@ -71,7 +71,7 @@
next_wave = round_duration_in_ticks + meteor_wave_delay
// Starts as barely noticeable dust impact, ends as barrage of most severe meteor types the code has to offer. Have fun.
spawn()
- spawn_meteors(meteor_severity, get_meteor_types(), pick(GLOB.cardinal), pick(current_map.station_levels))
+ spawn_meteors(meteor_severity, get_meteor_types(), pick(GLOB.cardinal), pick(SSatlas.current_map.station_levels))
var/escalated = FALSE
if(prob(escalation_probability) && (meteor_severity < maximal_severity))
meteor_severity++
diff --git a/code/game/gamemodes/mixed/acolytes.dm b/code/game/gamemodes/mixed/acolytes.dm
index fac8749bca0..13f97c2c0a0 100644
--- a/code/game/gamemodes/mixed/acolytes.dm
+++ b/code/game/gamemodes/mixed/acolytes.dm
@@ -8,5 +8,5 @@
require_all_templates = TRUE
/datum/game_mode/acolytes/pre_setup()
- round_description = "A cult and a borer infestation are on-[current_map.station_type]!"
+ round_description = "A cult and a borer infestation are on-[SSatlas.current_map.station_type]!"
. = ..()
diff --git a/code/game/gamemodes/mixed/conflict.dm b/code/game/gamemodes/mixed/conflict.dm
index 4a8b6fb5cdf..5f94397acca 100644
--- a/code/game/gamemodes/mixed/conflict.dm
+++ b/code/game/gamemodes/mixed/conflict.dm
@@ -8,5 +8,5 @@
require_all_templates = TRUE
/datum/game_mode/conflict/pre_setup()
- round_description = "Two underprepared teams of fools pick the same day to rob a highly valuable [current_map.company_short] [current_map.station_type]."
+ round_description = "Two underprepared teams of fools pick the same day to rob a highly valuable [SSatlas.current_map.company_short] [SSatlas.current_map.station_type]."
. = ..()
diff --git a/code/game/gamemodes/mixed/crossfire.dm b/code/game/gamemodes/mixed/crossfire.dm
index eef68b75b45..84d2937e361 100644
--- a/code/game/gamemodes/mixed/crossfire.dm
+++ b/code/game/gamemodes/mixed/crossfire.dm
@@ -7,8 +7,8 @@
require_all_templates = 1
/datum/game_mode/crossfire/pre_setup()
- round_description = "Mercenaries and raiders are approaching the [current_map.station_type]."
- extended_round_description = "[current_map.company_short]'s wealth and success caught the attention of several enemies old and new, \
- and many seek to undermine them using illegal ways. Their crown jewel research [current_map.station_type] are not safe from those \
+ round_description = "Mercenaries and raiders are approaching the [SSatlas.current_map.station_type]."
+ extended_round_description = "[SSatlas.current_map.company_short]'s wealth and success caught the attention of several enemies old and new, \
+ and many seek to undermine them using illegal ways. Their crown jewel research [SSatlas.current_map.station_type] are not safe from those \
malicious activities."
. = ..()
diff --git a/code/game/gamemodes/mixed/incursion.dm b/code/game/gamemodes/mixed/incursion.dm
index 16e94232aff..4e6935e30c1 100644
--- a/code/game/gamemodes/mixed/incursion.dm
+++ b/code/game/gamemodes/mixed/incursion.dm
@@ -7,6 +7,6 @@
require_all_templates = TRUE
/datum/game_mode/incursion/pre_setup()
- round_description = "A group of mercenaries and a set of ninjas have their eyes set on the [current_map.station_name]."
- extended_round_description = "[current_map.company_short] has been playing with fire, maybe a little visit will teach them a lesson."
+ round_description = "A group of mercenaries and a set of ninjas have their eyes set on the [SSatlas.current_map.station_name]."
+ extended_round_description = "[SSatlas.current_map.company_short] has been playing with fire, maybe a little visit will teach them a lesson."
. = ..()
diff --git a/code/game/gamemodes/mixed/intrigue.dm b/code/game/gamemodes/mixed/intrigue.dm
index 83b79d987b8..a1495d1546c 100644
--- a/code/game/gamemodes/mixed/intrigue.dm
+++ b/code/game/gamemodes/mixed/intrigue.dm
@@ -8,5 +8,5 @@
require_all_templates = 1
/datum/game_mode/intrigue/pre_setup()
- round_description = "Crewmembers are contacted by external elements while an outsider infiltrates the [current_map.station_type]."
+ round_description = "Crewmembers are contacted by external elements while an outsider infiltrates the [SSatlas.current_map.station_type]."
. = ..()
diff --git a/code/game/gamemodes/mixed/siege.dm b/code/game/gamemodes/mixed/siege.dm
index 767e1e54a29..cb2f2c4559b 100644
--- a/code/game/gamemodes/mixed/siege.dm
+++ b/code/game/gamemodes/mixed/siege.dm
@@ -8,5 +8,5 @@
require_all_templates = 1
/datum/game_mode/siege/pre_setup()
- round_description = "Some crewmembers are attempting to start a revolution while a mercenary strike force is approaching the [current_map.station_type]!"
+ round_description = "Some crewmembers are attempting to start a revolution while a mercenary strike force is approaching the [SSatlas.current_map.station_type]!"
. = ..()
diff --git a/code/game/gamemodes/mixed/towerdefense.dm b/code/game/gamemodes/mixed/towerdefense.dm
index a09a93c1b4e..ad4f66daf09 100644
--- a/code/game/gamemodes/mixed/towerdefense.dm
+++ b/code/game/gamemodes/mixed/towerdefense.dm
@@ -7,6 +7,6 @@
require_all_templates = TRUE
/datum/game_mode/incursion/pre_setup()
- round_description = "A group of mercenaries, a gaggle of raiders, and a set of ninjas have their eyes set on the [current_map.station_name]."
- extended_round_description = "[current_map.company_short] has been playing with fire, maybe a big visit will teach them a lesson."
+ round_description = "A group of mercenaries, a gaggle of raiders, and a set of ninjas have their eyes set on the [SSatlas.current_map.station_name]."
+ extended_round_description = "[SSatlas.current_map.company_short] has been playing with fire, maybe a big visit will teach them a lesson."
. = ..()
diff --git a/code/game/gamemodes/mixed/traitorling.dm b/code/game/gamemodes/mixed/traitorling.dm
index 1a3b922d3e0..2040f273734 100644
--- a/code/game/gamemodes/mixed/traitorling.dm
+++ b/code/game/gamemodes/mixed/traitorling.dm
@@ -8,5 +8,5 @@
antag_tags = list(MODE_CHANGELING, MODE_TRAITOR)
/datum/game_mode/traitorling/pre_setup()
- round_description = "There are traitors and alien changelings on the [current_map.station_type]. Do not let the changelings succeed!"
+ round_description = "There are traitors and alien changelings on the [SSatlas.current_map.station_type]. Do not let the changelings succeed!"
. = ..()
diff --git a/code/game/gamemodes/mixed/veilparty.dm b/code/game/gamemodes/mixed/veilparty.dm
index 8eec544e055..0f8186ad5a8 100644
--- a/code/game/gamemodes/mixed/veilparty.dm
+++ b/code/game/gamemodes/mixed/veilparty.dm
@@ -9,5 +9,5 @@
antag_tags = list(MODE_VAMPIRE, MODE_CULTIST)
/datum/game_mode/veilparty/pre_setup()
- round_description = "Paranormal activities occur on the [current_map.station_type]."
+ round_description = "Paranormal activities occur on the [SSatlas.current_map.station_type]."
. = ..()
diff --git a/code/game/gamemodes/ninja/ninja.dm b/code/game/gamemodes/ninja/ninja.dm
index a4724cf369d..d8c84ddf5a0 100644
--- a/code/game/gamemodes/ninja/ninja.dm
+++ b/code/game/gamemodes/ninja/ninja.dm
@@ -7,12 +7,12 @@
antag_tags = list(MODE_NINJA)
/datum/game_mode/ninja/pre_setup()
- round_description = "An agent of the Spider Clan is onboard the [current_map.station_type]!"
+ round_description = "An agent of the Spider Clan is onboard the [SSatlas.current_map.station_type]!"
extended_round_description = "What was that?! Was that a person or did your eyes just play tricks on you? \
You have no idea. Those slim-suited, cryptic individuals are an enigma to you and all of your knowledge. \
Their purpose is unknown. Their mission is unknown. How they arrived to this secure and isolated \
section of the galaxy, you don't know. What you do know is that there are silent shadow-stalkers piercing \
- through the defenses of the [current_map.station_type] with technological capabilities eons ahead of your time. They can avoid \
- the omniscience of the AI and rival the most hardened weapons your [current_map.station_type] is capable of. Tread lightly and \
+ through the defenses of the [SSatlas.current_map.station_type] with technological capabilities eons ahead of your time. They can avoid \
+ the omniscience of the AI and rival the most hardened weapons your [SSatlas.current_map.station_type] is capable of. Tread lightly and \
only hope these unknown assassins aren't here for you."
. = ..()
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 0f18a24d99a..4258d62320e 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -15,9 +15,9 @@ var/list/nuke_disks = list()
antag_scaling_coeff = 6
/datum/game_mode/nuclear/pre_setup()
- round_description = "A mercenary strike force is approaching the [current_map.station_type]!"
- extended_round_description = "[current_map.company_short]'s wealth and success caught the attention of several enemies old and new, \
- and many seek to undermine them using illegal ways. Their crown jewel research [current_map.station_type] are not safe from those \
+ round_description = "A mercenary strike force is approaching the [SSatlas.current_map.station_type]!"
+ extended_round_description = "[SSatlas.current_map.company_short]'s wealth and success caught the attention of several enemies old and new, \
+ and many seek to undermine them using illegal ways. Their crown jewel research [SSatlas.current_map.station_type] are not safe from those \
malicious activities."
. = ..()
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 5fd6bdfed5e..3559dba7f5d 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -140,7 +140,7 @@ GLOBAL_LIST_EMPTY(process_objectives)
/datum/objective/anti_revolution/demote/find_target()
..()
if(target && target.current)
- explanation_text = "[target.current.real_name], the [target.assigned_role] has been classified as harmful to [current_map.company_name]'s goals. Demote [target.current.get_pronoun("him")] to assistant."
+ explanation_text = "[target.current.real_name], the [target.assigned_role] has been classified as harmful to [SSatlas.current_map.company_name]'s goals. Demote [target.current.get_pronoun("him")] to assistant."
else
explanation_text = "Free Objective"
return target
@@ -148,7 +148,7 @@ GLOBAL_LIST_EMPTY(process_objectives)
/datum/objective/anti_revolution/demote/find_target_by_role(role, role_type=0)
..(role, role_type)
if(target && target.current)
- explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role] has been classified as harmful to [current_map.company_name]'s goals. Demote [target.current.get_pronoun("him")] to assistant."
+ explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role] has been classified as harmful to [SSatlas.current_map.company_name]'s goals. Demote [target.current.get_pronoun("him")] to assistant."
else
explanation_text = "Free Objective"
return target
diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm
index cb1a329e116..3dd3e7261dc 100644
--- a/code/game/gamemodes/technomancer/catalog.dm
+++ b/code/game/gamemodes/technomancer/catalog.dm
@@ -351,7 +351,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) -
if(href_list["refund_functions"])
var/turf/T = get_turf(H)
- if(T.z in current_map.player_levels)
+ if(T.z in SSatlas.current_map.player_levels)
to_chat(H, "You can only refund at your base, it's too late now!")
return
var/obj/item/technomancer_core/core = H.get_technomancer_core()
@@ -366,7 +366,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) -
/obj/item/technomancer_catalog/attackby(var/atom/movable/AM, var/mob/user)
var/turf/T = get_turf(user)
- if(T.z in current_map.player_levels)
+ if(T.z in SSatlas.current_map.player_levels)
to_chat(user, "You can only refund at your base, it's too late now!")
return TRUE
for(var/datum/technomancer/equipment/E in equipment_instances + assistance_instances)
diff --git a/code/game/gamemodes/technomancer/spell_objs_helpers.dm b/code/game/gamemodes/technomancer/spell_objs_helpers.dm
index c9db0e72725..5351299809b 100644
--- a/code/game/gamemodes/technomancer/spell_objs_helpers.dm
+++ b/code/game/gamemodes/technomancer/spell_objs_helpers.dm
@@ -27,7 +27,7 @@
/obj/item/spell/proc/allowed_to_teleport()
if(owner)
- if(owner.z in current_map.admin_levels)
+ if(owner.z in SSatlas.current_map.admin_levels)
return FALSE
return TRUE
diff --git a/code/game/gamemodes/technomancer/technomancer.dm b/code/game/gamemodes/technomancer/technomancer.dm
index d48a5abf390..2d9fd5faa11 100644
--- a/code/game/gamemodes/technomancer/technomancer.dm
+++ b/code/game/gamemodes/technomancer/technomancer.dm
@@ -9,8 +9,8 @@
/datum/game_mode/technomancer/pre_setup()
round_description = "An entity possessing advanced, unknown technology is onboard, who is capable of accomplishing amazing feats."
- extended_round_description = "A powerful entity capable of manipulating space around them, has arrived on the [current_map.station_type]. \
+ extended_round_description = "A powerful entity capable of manipulating space around them, has arrived on the [SSatlas.current_map.station_type]. \
They have a wide variety of powers and functions available to them that makes your own simple moral self tremble with \
fear and excitement. Ultimately, their purpose is unknown. However, it is up to you and your crew to decide if \
- their powers can be used for good or if their arrival foreshadows the destruction of the entire [current_map.station_type], or worse."
+ their powers can be used for good or if their arrival foreshadows the destruction of the entire [SSatlas.current_map.station_type], or worse."
. = ..()
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 0dfcd25ccb0..2a3029bab4a 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -13,11 +13,11 @@
antag_scaling_coeff = 5
/datum/game_mode/traitor/pre_setup()
- round_description = "There is a foreign agent or traitor on the [current_map.station_type]. Do not let the traitor succeed!"
+ round_description = "There is a foreign agent or traitor on the [SSatlas.current_map.station_type]. Do not let the traitor succeed!"
extended_round_description = "The Company's monopolistic control over the phoron supplies of Tau Ceti has marked the \
- [current_map.station_type] to be a highly valuable target for many competing organizations and individuals. The varied pasts \
+ [SSatlas.current_map.station_type] to be a highly valuable target for many competing organizations and individuals. The varied pasts \
and experiences of your coworkers have left them susceptible to the vices and temptations of humanity. \
- Is the [current_map.station_type] the safe self-contained workplace you once thought it was, or has it become a playground \
+ Is the [SSatlas.current_map.station_type] the safe self-contained workplace you once thought it was, or has it become a playground \
for the evils of the galaxy? Who can you trust? Watch your front. Watch your sides. Watch your back. \
The familiar faces that you've passed hundreds of times down the hallways before can be hiding terrible \
secrets and deceptions. Every corner is a mystery. Every conversation is a lie. You will be facing your \
diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index ced748680bb..4dc2ce021c8 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -10,5 +10,5 @@
antag_tags = list(MODE_VAMPIRE)
/datum/game_mode/vampire/pre_setup()
- round_description = "There are vampires on the [current_map.station_type], keep your blood close and neck safe!"
+ round_description = "There are vampires on the [SSatlas.current_map.station_type], keep your blood close and neck safe!"
. = ..()
diff --git a/code/game/jobs/faction/faction.dm b/code/game/jobs/faction/faction.dm
index c8222f232fc..6b0b98a41fa 100644
--- a/code/game/jobs/faction/faction.dm
+++ b/code/game/jobs/faction/faction.dm
@@ -75,13 +75,13 @@
switch(mission_level)
if(REPRESENTATIVE_MISSION_HIGH)
objective = pick("Assist your contractor in smuggling [rand(1,4)] items of value",
- "Collect evidence of [current_map.company_short] being unfair or oppressive against your contractors to be used as leverage in future talks")
+ "Collect evidence of [SSatlas.current_map.company_short] being unfair or oppressive against your contractors to be used as leverage in future talks")
if(REPRESENTATIVE_MISSION_MEDIUM)
objective = pick("Convince [rand(1,3)] non-[name] employees to join [name] instead",
- "Have [rand(1,3)] of your contractors write down their grievances with the company, and present the report to [current_map.station_name] command.")
+ "Have [rand(1,3)] of your contractors write down their grievances with the company, and present the report to [SSatlas.current_map.station_name] command.")
else
objective = pick("Collect [rand(3,7)] pictures of secure areas",
- "Make sure that [rand(2,4)] complaints related to contractors are solved on the [current_map.station_name]")
+ "Make sure that [rand(2,4)] complaints related to contractors are solved on the [SSatlas.current_map.station_name]")
return objective
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 009b4e66ff3..d454dcc9e42 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -15,7 +15,7 @@
/obj/machinery/computer/security/Initialize()
if(!network)
- network = current_map.station_networks.Copy()
+ network = SSatlas.current_map.station_networks.Copy()
. = ..()
if(network.len)
current_network = network[1]
diff --git a/code/game/machinery/distress_button.dm b/code/game/machinery/distress_button.dm
index 7003a322b8c..25a93e290c2 100644
--- a/code/game/machinery/distress_button.dm
+++ b/code/game/machinery/distress_button.dm
@@ -9,7 +9,7 @@
return INITIALIZE_HINT_LATELOAD
/obj/machinery/button/distress/LateInitialize()
- if(current_map.use_overmap && !linked)
+ if(SSatlas.current_map.use_overmap && !linked)
var/my_sector = GLOB.map_sectors["[z]"]
if (istype(my_sector, /obj/effect/overmap/visitable))
attempt_hook_up(my_sector)
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index c1fa360c116..8a7128c7eb7 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -67,7 +67,7 @@ Possible to do for anyone motivated enough:
/obj/machinery/hologram/holopad/Initialize()
. = ..()
- if(current_map.use_overmap)
+ if(SSatlas.current_map.use_overmap)
sync_linked()
get_holopad_id()
@@ -472,7 +472,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
/obj/machinery/hologram/holopad/long_range/get_holopad_id()
holopad_id = ""
- if(current_map.use_overmap && linked)
+ if(SSatlas.current_map.use_overmap && linked)
holopad_id = "[linked.name] | "
var/area/A = get_area(src)
@@ -481,7 +481,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
/obj/machinery/hologram/holopad/long_range/can_connect(var/obj/machinery/hologram/holopad/HP)
if(HP.long_range != long_range)
return FALSE
- if(current_map.use_overmap)
+ if(SSatlas.current_map.use_overmap)
if(!linked || !HP.linked)
return FALSE
if(get_dist(HP.linked, linked) > 1 && !(HP.linked in view(max_overmap_call_range, linked)))
diff --git a/code/game/machinery/mecha_fabricator.dm b/code/game/machinery/mecha_fabricator.dm
index a885174d529..c7be31322d2 100644
--- a/code/game/machinery/mecha_fabricator.dm
+++ b/code/game/machinery/mecha_fabricator.dm
@@ -240,7 +240,7 @@
sleep(15)
visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"")
sleep(30)
- visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps: \"User DB truncated. Please contact your [current_map.company_name] system operator for future assistance.\"")
+ visible_message("[icon2html(src, viewers(get_turf(src)))] [src] beeps: \"User DB truncated. Please contact your [SSatlas.current_map.company_name] system operator for future assistance.\"")
req_access = null
emagged = 1
return 1
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 74c55c2a4bb..d62015b5b2d 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -258,7 +258,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
dat+="
Feed Security functions:
"
dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue"
dat+="
Censor Feed Stories"
- dat+="
Mark Feed Channel with [current_map.company_name] D-Notice"
+ dat+="
Mark Feed Channel with [SSatlas.current_map.company_name] D-Notice"
dat+="
The newscaster recognises you as: [src.scanned_user]"
if(1)
dat+= "Station Feed Channels
"
@@ -344,7 +344,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
if(9)
dat+="[src.viewing_channel.channel_name]: \[created by: [src.viewing_channel.author]\]
"
if(src.viewing_channel.censored)
- dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
"
+ dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [SSatlas.current_map.company_name] D-Notice.
"
dat+="No further feed story additions are allowed while the D-Notice is in effect.
"
else
if( isemptylist(src.viewing_channel.messages) )
@@ -365,7 +365,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
dat+="
Refresh"
dat+="
Back"
if(10)
- dat+="[current_map.company_name] Feed Censorship Tool
"
+ dat+="[SSatlas.current_map.company_name] Feed Censorship Tool
"
dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
"
dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it."
dat+="
Select Feed channel to get Stories from:
"
@@ -377,7 +377,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
dat+="[FC.channel_name] [(FC.censored) ? ("***") : null]
"
dat+="
Cancel"
if(11)
- dat+="[current_map.company_name] D-Notice Handler
"
+ dat+="[SSatlas.current_map.company_name] D-Notice Handler
"
dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's"
dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed"
dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
"
@@ -405,7 +405,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
"
dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
"
if(src.viewing_channel.censored)
- dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
"
+ dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [SSatlas.current_map.company_name] D-Notice.
"
dat+="No further feed story additions are allowed while the D-Notice is in effect.
"
else
if( isemptylist(src.viewing_channel.messages) )
@@ -691,7 +691,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
src.screen = 15
else
if(SSnews.wanted_issue.is_admin_message)
- alert("The wanted issue has been distributed by a [current_map.company_name] higherup. You cannot edit it.","Ok")
+ alert("The wanted issue has been distributed by a [SSatlas.current_map.company_name] higherup. You cannot edit it.","Ok")
return
SSnews.wanted_issue.author = src.channel_name
SSnews.wanted_issue.body = src.msg
@@ -704,7 +704,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
else if(href_list["cancel_wanted"])
if(SSnews.wanted_issue.is_admin_message)
- alert("The wanted issue has been distributed by a [current_map.company_name] higherup. You cannot take it down.","Ok")
+ alert("The wanted issue has been distributed by a [SSatlas.current_map.company_name] higherup. You cannot take it down.","Ok")
return
var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel")
if(choice=="Confirm")
@@ -720,7 +720,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
else if(href_list["censor_channel_author"])
var/datum/feed_channel/FC = locate(href_list["censor_channel_author"])
if(FC.is_admin_channel)
- alert("This channel was created by a [current_map.company_name] Officer or a external news agency. You cannot censor it.","Ok")
+ alert("This channel was created by a [SSatlas.current_map.company_name] Officer or a external news agency. You cannot censor it.","Ok")
return
if(FC.author != "\[REDACTED\]")
FC.backup_author = FC.author
@@ -733,7 +733,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
else if(href_list["censor_channel_story_author"])
var/datum/feed_message/MSG = locate(href_list["censor_channel_story_author"])
if(MSG.is_admin_message)
- alert("This message was created by a [current_map.company_name] Officer or a external news agency. You cannot censor its author.","Ok")
+ alert("This message was created by a [SSatlas.current_map.company_name] Officer or a external news agency. You cannot censor its author.","Ok")
return
if(MSG.author != "\[REDACTED\]")
MSG.backup_author = MSG.author
@@ -746,7 +746,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
else if(href_list["censor_channel_story_body"])
var/datum/feed_message/MSG = locate(href_list["censor_channel_story_body"])
if(MSG.is_admin_message)
- alert("This channel was created by a [current_map.company_name] Officer or a external news agency. You cannot censor it.","Ok")
+ alert("This channel was created by a [SSatlas.current_map.company_name] Officer or a external news agency. You cannot censor it.","Ok")
return
if(MSG.body != "\[REDACTED\]")
MSG.backup_body = MSG.body
@@ -772,7 +772,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
else if(href_list["toggle_d_notice"])
var/datum/feed_channel/FC = locate(href_list["toggle_d_notice"])
if(FC.is_admin_channel)
- alert("This channel was created by a [current_map.company_name] Officer or a external news agency. You cannot place a D-Notice upon it.","Ok")
+ alert("This channel was created by a [SSatlas.current_map.company_name] Officer or a external news agency. You cannot place a D-Notice upon it.","Ok")
return
FC.censored = !FC.censored
FC.update()
@@ -921,7 +921,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
switch(screen)
if(0) //Cover
dat+="The Griffon
"
- dat+="[current_map.company_name]-standard newspaper, for use on [current_map.company_name] Vessels.
"
+ dat+="[SSatlas.current_map.company_name]-standard newspaper, for use on [SSatlas.current_map.company_name] Vessels.
"
if(isemptylist(src.news_content))
if(src.important_message)
dat+="Contents:
**Important Security Announcement** \[page [src.pages+2]\]
"
diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm
index 0c69429c0ab..967b2eebf83 100644
--- a/code/game/machinery/telecomms/broadcasting.dm
+++ b/code/game/machinery/telecomms/broadcasting.dm
@@ -22,7 +22,7 @@
"message" = message
)
- if(current_map.use_overmap && istype(source))
+ if(SSatlas.current_map.use_overmap && istype(source))
sector = GLOB.map_sectors["[source.z]"]
/datum/signal/subspace/proc/copy()
@@ -48,7 +48,7 @@
if(!source.loc)
// It's an announcer message, just send it to the horizon's receiver
for(var/obj/machinery/telecomms/receiver/R in SSmachinery.all_receivers)
- if(R.z in current_map.station_levels)
+ if(R.z in SSatlas.current_map.station_levels)
R.receive_signal(src)
return TRUE
@@ -108,10 +108,10 @@
if(isturf(T))
origin_level = T.z
levels = list(T.z)
- if(current_map.use_overmap)
+ if(SSatlas.current_map.use_overmap)
sector = GLOB.map_sectors["[T.z]"]
else // if the source is in nullspace, it's probably an autosay
- levels = current_map.station_levels
+ levels = SSatlas.current_map.station_levels
origin_level = levels[1]
sector = GLOB.map_sectors["[levels[1]]"]
diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm
index 5b447b73143..2defdd73822 100644
--- a/code/game/machinery/telecomms/machines/allinone.dm
+++ b/code/game/machinery/telecomms/machines/allinone.dm
@@ -88,7 +88,7 @@
/obj/machinery/telecomms/allinone/ship/station_relay/LateInitialize()
. = ..()
- desc = replacetext(desc, "%STATIONNAME", current_map.station_name)
+ desc = replacetext(desc, "%STATIONNAME", SSatlas.current_map.station_name)
for(var/ch in AWAY_FREQS_ASSIGNED)
freq_listening |= AWAY_FREQS_ASSIGNED[ch]
freq_listening |= AWAY_FREQS_UNASSIGNED
diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm
index 553e6ff5713..e6ca540b436 100644
--- a/code/game/machinery/telecomms/presets.dm
+++ b/code/game/machinery/telecomms/presets.dm
@@ -2,7 +2,7 @@
//HUB
/obj/machinery/telecomms/hub/preset_map/LateInitialize()
- if(current_map.use_overmap && !linked)
+ if(SSatlas.current_map.use_overmap && !linked)
var/my_sector = GLOB.map_sectors["[z]"]
if (istype(my_sector, /obj/effect/overmap/visitable))
attempt_hook_up(my_sector)
@@ -39,7 +39,7 @@
var/use_common = FALSE
/obj/machinery/telecomms/receiver/preset_map/LateInitialize()
- if(current_map.use_overmap && !linked)
+ if(SSatlas.current_map.use_overmap && !linked)
var/my_sector = GLOB.map_sectors["[z]"]
if (istype(my_sector, /obj/effect/overmap/visitable))
attempt_hook_up(my_sector)
@@ -83,7 +83,7 @@
var/use_common = FALSE
/obj/machinery/telecomms/bus/preset_map/LateInitialize()
- if(current_map.use_overmap && !linked)
+ if(SSatlas.current_map.use_overmap && !linked)
var/my_sector = GLOB.map_sectors["[z]"]
if (istype(my_sector, /obj/effect/overmap/visitable))
attempt_hook_up(my_sector)
@@ -144,7 +144,7 @@
//Processors
/obj/machinery/telecomms/processor/preset_map/LateInitialize()
- if(current_map.use_overmap && !linked)
+ if(SSatlas.current_map.use_overmap && !linked)
var/my_sector = GLOB.map_sectors["[z]"]
if (istype(my_sector, /obj/effect/overmap/visitable))
attempt_hook_up(my_sector)
@@ -191,7 +191,7 @@
var/use_common = FALSE
/obj/machinery/telecomms/server/preset_map/LateInitialize()
- if(current_map.use_overmap && !linked)
+ if(SSatlas.current_map.use_overmap && !linked)
var/my_sector = GLOB.map_sectors["[z]"]
if (istype(my_sector, /obj/effect/overmap/visitable))
attempt_hook_up(my_sector)
@@ -281,7 +281,7 @@
//--PRESET LEFT--//
/obj/machinery/telecomms/broadcaster/preset_map/LateInitialize()
- if(current_map.use_overmap && !linked)
+ if(SSatlas.current_map.use_overmap && !linked)
var/my_sector = GLOB.map_sectors["[z]"]
if (istype(my_sector, /obj/effect/overmap/visitable))
attempt_hook_up(my_sector)
diff --git a/code/game/machinery/telecomms/telecommunications.dm b/code/game/machinery/telecomms/telecommunications.dm
index 8486d264ccf..d2529bf1a59 100644
--- a/code/game/machinery/telecomms/telecommunications.dm
+++ b/code/game/machinery/telecomms/telecommunications.dm
@@ -61,7 +61,7 @@
return INITIALIZE_HINT_LATELOAD
/obj/machinery/telecomms/LateInitialize()
- if(current_map.use_overmap && !linked)
+ if(SSatlas.current_map.use_overmap && !linked)
var/my_sector = GLOB.map_sectors["[z]"]
if (istype(my_sector, /obj/effect/overmap/visitable))
attempt_hook_up(my_sector)
@@ -91,7 +91,7 @@
return
. = GetConnectedZlevels(z)
- if(current_map.use_overmap && linked)
+ if(SSatlas.current_map.use_overmap && linked)
for(var/obj/effect/overmap/visitable/V in range(overmap_range, linked))
. |= V.map_z
@@ -244,7 +244,7 @@
// Reception range of telecomms machines is limited via overmap_range
// Returns distance, not a boolean value, so don't do !get_reception or so help me god
/obj/machinery/telecomms/proc/get_signal_dist(datum/signal/subspace/signal)
- if(!current_map.use_overmap || !istype(linked) || !istype(signal.sector))
+ if(!SSatlas.current_map.use_overmap || !istype(linked) || !istype(signal.sector))
if(z == signal.origin_level || (signal.origin_level in GetConnectedZlevels(z)))
return 1
else
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index cde3e39c112..39d86d76855 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -78,7 +78,7 @@
if(T)
if (AreConnectedZLevels(z, T.z))
return TRUE
- else if(current_map.use_overmap)
+ else if(SSatlas.current_map.use_overmap)
var/my_sector = GLOB.map_sectors["[z]"]
var/target_sector = GLOB.map_sectors["[T.z]"]
if (istype(my_sector, /obj/effect/overmap/visitable) && istype(target_sector, /obj/effect/overmap/visitable))
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index d2f2761cbc2..fe94701c8e9 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -262,7 +262,7 @@ var/list/ruin_landmarks = list()
return INITIALIZE_HINT_LATELOAD
/obj/effect/landmark/entry_point/LateInitialize()
- if(current_map.use_overmap)
+ if(SSatlas.current_map.use_overmap)
SSshuttle.entry_points_to_initialize += src
name += " [x], [y]"
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 60d55e003b0..91a01c93884 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -96,7 +96,7 @@
var/area/A = get_area(src)
var/text = {"[src]
[station_name()] blueprints
- Property of [current_map.company_name]. For heads of staff only. Store in high-secure storage.
+ Property of [SSatlas.current_map.company_name]. For heads of staff only. Store in high-secure storage.
"}
switch (get_area_type())
if (AREA_SPACE)
diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm
index 0291624944f..25722447585 100644
--- a/code/game/objects/items/devices/holowarrant.dm
+++ b/code/game/objects/items/devices/holowarrant.dm
@@ -111,7 +111,7 @@
DIGITAL ARREST WARRANT
- Facility:__[current_map.station_name]__Date:__[worlddate2text()]__
+ Facility:__[SSatlas.current_map.station_name]__Date:__[worlddate2text()]__
This document serves as a notice and permits the sanctioned arrest of
the denoted employee of the SCC Civilian Branch of Operation by the
@@ -147,7 +147,7 @@
DIGITAL SEARCH WARRANT
- Facility:__[current_map.station_name]__Date:__[worlddate2text()]__
+ Facility:__[SSatlas.current_map.station_name]__Date:__[worlddate2text()]__
This document serves as notice and permits the sanctioned search of
the Suspect's person/belongings/premises and/or Department for any items and materials
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 3783c05509d..12c589ebf70 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -21,7 +21,7 @@
channels = list()
/obj/item/device/encryptionkey/ship/Initialize()
- if(!current_map.use_overmap)
+ if(!SSatlas.current_map.use_overmap)
return ..()
if(flags_1 & INITIALIZED_1)
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index dfda1e81efe..dde58f63a13 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -730,7 +730,7 @@
var/use_common = FALSE
/obj/item/device/radio/headset/ship/Initialize()
- if(!current_map.use_overmap)
+ if(!SSatlas.current_map.use_overmap)
return ..()
var/turf/T = get_turf(src)
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 61e7a979c71..56060c3d61e 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -64,7 +64,7 @@ pixel_x = 8;
PRESET_EAST
/obj/item/device/radio/intercom/ship/Initialize()
- if(!current_map.use_overmap)
+ if(!SSatlas.current_map.use_overmap)
return ..()
var/turf/T = get_turf(src)
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index b03c594d48e..09914685d8f 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -737,7 +737,7 @@ var/global/list/default_interrogation_channels = list(
channels = list()
/obj/item/device/radio/map_preset/Initialize()
- if(!current_map.use_overmap)
+ if(!SSatlas.current_map.use_overmap)
return ..()
var/turf/T = get_turf(src)
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index c9427584c39..668828eee2d 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -35,7 +35,7 @@ AI MODULES
return
if(SSticker.mode && SSticker.mode.name == "blob")
- to_chat(usr, "Law uploads have been disabled by [current_map.company_name]!")
+ to_chat(usr, "Law uploads have been disabled by [SSatlas.current_map.company_name]!")
return
if (comp.current.stat == 2 || comp.current.control_disabled == 1)
diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
index 0d66fb0fa8e..d663a66401e 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
@@ -12,7 +12,7 @@
/obj/item/circuitboard/security/Initialize()
. = ..()
- network = current_map.station_networks
+ network = SSatlas.current_map.station_networks
/obj/item/circuitboard/security/engineering
name = T_BOARD("engineering camera monitor")
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 1c6e6318005..b5a17721079 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -660,7 +660,7 @@
The Oath
- The Medical Oath sworn by recognised medical practitioners in the employ of [current_map.company_name]
+ The Medical Oath sworn by recognised medical practitioners in the employ of [SSatlas.current_map.company_name]
- Now, as a new doctor, I solemnly promise that I will, to the best of my ability, serve humanity-caring for the sick, promoting good health, and alleviating pain and suffering.
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 6cac5350149..852d8617829 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -94,7 +94,7 @@
if(!baseturf)
// Hard-coding this for performance reasons.
- baseturf = A.base_turf || current_map.base_turf_by_z["[z]"] || /turf/space
+ baseturf = A.base_turf || SSatlas.current_map.base_turf_by_z["[z]"] || /turf/space
if (A.area_flags & AREA_FLAG_SPAWN_ROOF)
spawn_roof()
diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm
index c45d1f23c68..1361ef09022 100644
--- a/code/game/turfs/turf_changing.dm
+++ b/code/game/turfs/turf_changing.dm
@@ -23,7 +23,7 @@
else if(smoothing_flags && !(smoothing_flags & SMOOTH_QUEUED)) // we check here because proc overhead
SSicon_smooth.add_to_queue(src)
- if (current_map.use_overmap)
+ if (SSatlas.current_map.use_overmap)
var/obj/effect/overmap/visitable/sector/exoplanet/E = GLOB.map_sectors["[z]"]
if (istype(E) && istype(E.theme))
E.theme.on_turf_generation(src, E.planetary_area)
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 7797e59207f..1e081069612 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -8,18 +8,18 @@
var/msg
var/total_num = 0
- if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights))
- for(var/client/C in sortKey(GLOB.clients))
- msg += "\t[C.key]"
- if(C.holder && C.holder.fakekey)
- msg += " (as [C.holder.fakekey])"
- msg += " - Playing as [C.mob.real_name]"
- switch(C.mob.stat)
+ if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights || R_DEV & holder.rights))
+ for(var/client/client in sortKey(GLOB.clients))
+ msg += "\t[client.key]"
+ if(client.holder && client.holder.fakekey)
+ msg += " (as [client.holder.fakekey])"
+ msg += " - Playing as [client.mob.real_name]"
+ switch(client.mob.stat)
if(UNCONSCIOUS)
msg += " - Unconscious"
if(DEAD)
- if(isobserver(C.mob))
- var/mob/abstract/observer/O = C.mob
+ if(isobserver(client.mob))
+ var/mob/abstract/observer/O = client.mob
if(O.started_as_observer)
msg += " - Observing"
else
@@ -28,8 +28,8 @@
msg += " - DEAD"
var/age
- if(isnum(C.player_age))
- age = C.player_age
+ if(isnum(client.player_age))
+ age = client.player_age
else
age = 0
@@ -39,18 +39,20 @@
age = "[age]"
msg += " - [age]"
+ if((R_ADMIN & holder.rights) || (R_DEV & holder.rights))
+ msg += " ([round(client.avgping, 1)]ms)"
- if(is_special_character(C.mob))
+ if(is_special_character(client.mob))
msg += " - Antagonist"
- msg += " (?)"
+ msg += " (?)"
msg += "
"
total_num++
else
- for(var/client/C in sortKey(GLOB.clients))
- if(C.holder && C.holder.fakekey)
- msg += C.holder.fakekey
+ for(var/client/client in sortKey(GLOB.clients))
+ if(client.holder && client.holder.fakekey)
+ msg += client.holder.fakekey
else
- msg += C.key
+ msg += client.key
total_num++
msg += "
"
@@ -75,99 +77,99 @@
var/num_devs_online = 0
if(holder)
for(var/s in GLOB.staff)
- var/client/C = s
- if(R_ADMIN & C.holder.rights) //Used to determine who shows up in admin rows
+ var/client/client = s
+ if(R_ADMIN & client.holder.rights) //Used to determine who shows up in admin rows
- if(C.holder.fakekey && !(R_ADMIN & holder.rights || R_MOD & holder.rights)) //Mentors can't see stealthmins
+ if(client.holder.fakekey && !(R_ADMIN & holder.rights || R_MOD & holder.rights)) //Mentors can't see stealthmins
continue
- msg += "\t[C.key] is a [C.holder.rank]"
+ msg += "\t[client.key] is a [client.holder.rank]"
- if(C.holder.fakekey)
- msg += " (as [C.holder.fakekey])"
+ if(client.holder.fakekey)
+ msg += " (as [client.holder.fakekey])"
- if(isobserver(C.mob))
+ if(isobserver(client.mob))
msg += " - Observing"
- else if(istype(C.mob,/mob/abstract/new_player))
+ else if(istype(client.mob, /mob/abstract/new_player))
msg += " - Lobby"
else
msg += " - Playing"
- if(C.is_afk())
+ if(client.is_afk())
msg += " (AFK)"
msg += "
"
num_admins_online++
- else if(R_MOD & C.holder.rights) //Who shows up in mod/mentor rows.
- modmsg += "\t[C.key] is a [C.holder.rank]"
+ else if(R_MOD & client.holder.rights) //Who shows up in mod/mentor rows.
+ modmsg += "\t[client.key] is a [client.holder.rank]"
- if(isobserver(C.mob))
+ if(isobserver(client.mob))
modmsg += " - Observing"
- else if(istype(C.mob,/mob/abstract/new_player))
+ else if(istype(client.mob, /mob/abstract/new_player))
modmsg += " - Lobby"
else
modmsg += " - Playing"
- if(C.is_afk())
+ if(client.is_afk())
modmsg += " (AFK)"
modmsg += "
"
num_mods_online++
- else if (R_CCIAA & C.holder.rights)
- cciaamsg += "\t[C.key]"
- if (isobserver(C.mob))
+ else if (R_CCIAA & client.holder.rights)
+ cciaamsg += "\t[client.key]"
+ if (isobserver(client.mob))
cciaamsg += " - Observing"
- else if (istype(C.mob, /mob/abstract/new_player))
+ else if (istype(client.mob, /mob/abstract/new_player))
cciaamsg += " - Lobby"
else
cciaamsg += " - Playing"
- if (C.is_afk())
+ if (client.is_afk())
cciaamsg += " (AFK)"
cciaamsg += "
"
num_cciaa_online++
- else if(C.holder.rights & R_DEV)
- devmsg += "\t[C.key] is a [C.holder.rank]"
- if(isobserver(C.mob))
+ else if(client.holder.rights & R_DEV)
+ devmsg += "\t[client.key] is a [client.holder.rank]"
+ if(isobserver(client.mob))
devmsg += " - Observing"
- else if(istype(C.mob,/mob/abstract/new_player))
+ else if(istype(client.mob, /mob/abstract/new_player))
devmsg += " - Lobby"
else
devmsg += " - Playing"
- if(C.is_afk())
+ if(client.is_afk())
devmsg += " (AFK)"
devmsg += "
"
num_devs_online++
else
for(var/s in GLOB.staff)
- var/client/C = s
- if(R_ADMIN & C.holder.rights)
- if(!C.holder.fakekey)
- if(C.is_afk())
- msg += "\t[C.key] is a [C.holder.rank] (AFK)
"
+ var/client/client = s
+ if(R_ADMIN & client.holder.rights)
+ if(!client.holder.fakekey)
+ if(client.is_afk())
+ msg += "\t[client.key] is a [client.holder.rank] (AFK)
"
else
- msg += "\t[C.key] is a [C.holder.rank]
"
+ msg += "\t[client.key] is a [client.holder.rank]
"
num_admins_online++
- else if (R_MOD & C.holder.rights)
- if(C.is_afk())
- modmsg += "\t[C.key] is a [C.holder.rank] (AFK)
"
+ else if (R_MOD & client.holder.rights)
+ if(client.is_afk())
+ modmsg += "\t[client.key] is a [client.holder.rank] (AFK)
"
else
- modmsg += "\t[C.key] is a [C.holder.rank]
"
+ modmsg += "\t[client.key] is a [client.holder.rank]
"
num_mods_online++
- else if(C.holder.rights & R_DEV)
- if(C.is_afk())
- devmsg += "\t[C.key] is a [C.holder.rank] (AFK)
"
+ else if(client.holder.rights & R_DEV)
+ if(client.is_afk())
+ devmsg += "\t[client.key] is a [client.holder.rank] (AFK)
"
else
- devmsg += "\t[C.key] is a [C.holder.rank]
"
+ devmsg += "\t[client.key] is a [client.holder.rank]
"
num_devs_online++
- else if (R_CCIAA & C.holder.rights)
- if(C.is_afk())
- cciaamsg += "\t[C.key] is a [C.holder.rank] (AFK)
"
+ else if (R_CCIAA & client.holder.rights)
+ if(client.is_afk())
+ cciaamsg += "\t[client.key] is a [client.holder.rank] (AFK)
"
else
- cciaamsg += "\t[C.key] is a [C.holder.rank]
"
+ cciaamsg += "\t[client.key] is a [client.holder.rank]
"
num_cciaa_online++
if(SSdiscord && SSdiscord.active)
diff --git a/code/game/world.dm b/code/game/world.dm
index 2090f2fd13e..73c0ca1b637 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -50,23 +50,22 @@ GLOBAL_PROTECT(config)
..()
return 3 // QDEL_HINT_HARDDEL ain't defined here, so magic number it is.
-/var/game_id = null
/proc/generate_gameid()
- if(game_id != null)
+ if(GLOB.round_id != null)
return
- game_id = ""
+ GLOB.round_id = ""
var/list/c = list("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
var/l = c.len
var/t = world.timeofday
for(var/_ = 1 to 4)
- game_id = "[c[(t % l) + 1]][game_id]"
+ GLOB.round_id = "[c[(t % l) + 1]][GLOB.round_id]"
t = round(t / l)
- game_id = "-[game_id]"
+ GLOB.round_id = "-[GLOB.round_id]"
t = round(world.realtime / (10 * 60 * 60 * 24))
for(var/_ = 1 to 3)
- game_id = "[c[(t % l) + 1]][game_id]"
+ GLOB.round_id = "[c[(t % l) + 1]][GLOB.round_id]"
t = round(t / l)
/world
@@ -87,7 +86,7 @@ GLOBAL_PROTECT(config)
//logs
GLOB.diary_date_string = time2text(world.realtime, "YYYY/MM/DD")
GLOB.href_logfile = file("data/logs/[GLOB.diary_date_string] hrefs.htm")
- GLOB.diary = "data/logs/[GLOB.diary_date_string]_[game_id].log"
+ GLOB.diary = "data/logs/[GLOB.diary_date_string]_[GLOB.round_id].log"
log_startup()
GLOB.changelog_hash = md5('html/changelog.html') //used for telling if the changelog has changed recently
diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm
index 4430e7b40e5..538d77d748d 100644
--- a/code/modules/admin/DB ban/functions.dm
+++ b/code/modules/admin/DB ban/functions.dm
@@ -97,7 +97,7 @@
reason = sql_sanitize_text(reason)
- var/sql = "INSERT INTO ss13_ban (`id`,`bantime`,`serverip`,`game_id`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[game_id]','[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], [(rounds)?"[rounds]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', '[ip]', '[a_ckey]', '[a_computerid]', '[a_ip]', '[who]', '[adminwho]', '', null, null, null, null, null)"
+ var/sql = "INSERT INTO ss13_ban (`id`,`bantime`,`serverip`,`game_id`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[GLOB.round_id]','[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], [(rounds)?"[rounds]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', '[ip]', '[a_ckey]', '[a_computerid]', '[a_ip]', '[who]', '[adminwho]', '', null, null, null, null, null)"
var/DBQuery/query_insert = GLOB.dbcon.NewQuery(sql)
query_insert.Execute()
to_chat(usr, "Ban saved to database.")
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 2f4ebae0409..f3b2ef2b662 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -11,7 +11,7 @@
#define ACCESS_STATUS_STICKYBANNED "sticky banned"
-#define LOG_CLIENT_CONNECTION(STATUS) if (log_connection) {log_connection(ckey(key), address, computer_id, byond_version, byond_build, game_id, STATUS)}
+#define LOG_CLIENT_CONNECTION(STATUS) if (log_connection) {log_connection(ckey(key), address, computer_id, byond_version, byond_build, GLOB.round_id, STATUS)}
/world/proc/log_connection(ckey, ip, computerid, byond_version, byond_build, game_id, access_status)
if(!establish_db_connection(GLOB.dbcon))
@@ -27,7 +27,7 @@
"computerid"=computerid,
"byond_version"=byond_version,
"byond_build"=byond_build,
- "game_id"=game_id,
+ "game_id"=GLOB.round_id,
"status"=access_status))
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 258c2cca551..fa28e599165 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -381,7 +381,7 @@ var/global/enabled_spooking = 0
dat+={"
Feed Security functions:
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue
Censor Feed Stories
-
Mark Feed Channel with [current_map.company_name] D-Notice (disables and locks the channel.
+
Mark Feed Channel with [SSatlas.current_map.company_name] D-Notice (disables and locks the channel.
The newscaster recognises you as:
[src.admincaster_signature]
"}
if(1)
@@ -449,7 +449,7 @@ var/global/enabled_spooking = 0
dat+="[src.admincaster_feed_channel.channel_name]: \[created by: [src.admincaster_feed_channel.author]\]
"
if(src.admincaster_feed_channel.censored)
dat+={"
- ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
+ ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [SSatlas.current_map.company_name] D-Notice.
No further feed story additions are allowed while the D-Notice is in effect.
"}
else
@@ -471,7 +471,7 @@ var/global/enabled_spooking = 0
"}
if(10)
dat+={"
- [current_map.company_name] Feed Censorship Tool
+ [SSatlas.current_map.company_name] Feed Censorship Tool
NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it.
Select Feed channel to get Stories from:
@@ -485,7 +485,7 @@ var/global/enabled_spooking = 0
dat+="
Cancel"
if(11)
dat+={"
- [current_map.company_name] D-Notice Handler
+ [SSatlas.current_map.company_name] D-Notice Handler
A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's
morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed
stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
@@ -519,7 +519,7 @@ var/global/enabled_spooking = 0
"}
if(src.admincaster_feed_channel.censored)
dat+={"
- ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [current_map.company_name] D-Notice.
+ ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [SSatlas.current_map.company_name] D-Notice.
No further feed story additions are allowed while the D-Notice is in effect.
"}
else
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index b165c1e4919..72a22a8b76d 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -33,7 +33,7 @@ var/list/admin_datums = list()
qdel(src)
return
- if (!current_map)
+ if (!SSatlas.current_map)
SSatlas.OnMapload(CALLBACK(src, PROC_REF(update_newscaster_sig)))
else
update_newscaster_sig()
@@ -68,7 +68,7 @@ var/list/admin_datums = list()
/datum/admins/proc/update_newscaster_sig()
if (!admincaster_signature)
- admincaster_signature = "[current_map.company_name] Officer #[rand(0,9)][rand(0,9)][rand(0,9)]"
+ admincaster_signature = "[SSatlas.current_map.company_name] Officer #[rand(0,9)][rand(0,9)][rand(0,9)]"
/datum/admins/proc/toggle_aooc_mute_check()
aooc_mute = !aooc_mute
diff --git a/code/modules/admin/player_notes_sql.dm b/code/modules/admin/player_notes_sql.dm
index 4de76543663..6e5e36bcd9a 100644
--- a/code/modules/admin/player_notes_sql.dm
+++ b/code/modules/admin/player_notes_sql.dm
@@ -5,7 +5,7 @@
if(!player_ckey || !note)
return
- var/list/query_details = list("game_id" = game_id, "ckey" = player_ckey, "address" = player_address ? player_address : null, "computer_id" = player_computerid ? player_computerid : null, "a_ckey" = null, "note" = note)
+ var/list/query_details = list("game_id" = GLOB.round_id, "ckey" = player_ckey, "address" = player_address ? player_address : null, "computer_id" = player_computerid ? player_computerid : null, "a_ckey" = null, "note" = note)
if (!user)
query_details["a_ckey"] = "Adminbot"
diff --git a/code/modules/admin/ticket.dm b/code/modules/admin/ticket.dm
index 3a84da9b031..b4163655cff 100644
--- a/code/modules/admin/ticket.dm
+++ b/code/modules/admin/ticket.dm
@@ -170,7 +170,7 @@ GLOBAL_LIST_EMPTY(ticket_panels)
VALUES
(:g_id:, :m_count:, :a_count:, :a_list:, :opened_by:, :taken_by:, :closed_by:, :delay:, :opened_at:, :closed_at:)"})
Q.Execute(list(
- "g_id" = game_id,
+ "g_id" = GLOB.round_id,
"m_count" = length(msgs),
"a_count" = length(assigned_admins),
"a_list" = json_encode(assigned_admins),
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index b592b6dce62..a43af25659d 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -26,8 +26,8 @@
log_admin("PRAYER: [key_name(src)]: [msg]")
/proc/Centcomm_announce(var/msg, var/mob/Sender, var/iamessage)
- var/msg_cciaa = "[uppertext(current_map.boss_short)][iamessage ? " IA" : ""]:[key_name(Sender, 1)] (RPLY): [msg]"
- var/msg_admin = "[uppertext(current_map.boss_short)][iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender)]) (CA) (BSA) (RPLY): [msg]"
+ var/msg_cciaa = "[uppertext(SSatlas.current_map.boss_short)][iamessage ? " IA" : ""]:[key_name(Sender, 1)] (RPLY): [msg]"
+ var/msg_admin = "[uppertext(SSatlas.current_map.boss_short)][iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender)]) (CA) (BSA) (RPLY): [msg]"
var/cciaa_present = 0
var/cciaa_afk = 0
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 4daba4b557f..f7b833f6294 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -601,7 +601,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if("Yes")
command_announcement.Announce("[reportbody]", reporttitle, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1);
if("No")
- to_world("New [current_map.company_name] Update available at all communication consoles.")
+ to_world("New [SSatlas.current_map.company_name] Update available at all communication consoles.")
sound_to(world, ('sound/AI/commandreport.ogg'))
log_admin("[key_name(src)] has created a command report: [reportbody]",admin_key=key_name(usr))
@@ -891,15 +891,15 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(alert(src, "Are you sure?", "Confirm", "Yes", "No") != "Yes")
return
- if(current_map.shuttle_call_restarts)
- if(current_map.shuttle_call_restart_timer)
+ if(SSatlas.current_map.shuttle_call_restarts)
+ if(SSatlas.current_map.shuttle_call_restart_timer)
to_chat(usr, SPAN_WARNING("The shuttle round restart timer is already active!"))
return
feedback_add_details("admin_verb","CSHUT")
- current_map.shuttle_call_restart_timer = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reboot_world)), 10 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE)
+ SSatlas.current_map.shuttle_call_restart_timer = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reboot_world)), 10 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE)
log_game("[key_name(usr)] has admin-called the 'shuttle' round restart.")
message_admins("[key_name_admin(usr)] has admin-called the 'shuttle' round restart.", 1)
- to_world(FONT_LARGE(SPAN_VOTE(current_map.shuttle_called_message)))
+ to_world(FONT_LARGE(SPAN_VOTE(SSatlas.current_map.shuttle_called_message)))
return
if(SSticker.mode.auto_recall_shuttle)
@@ -926,16 +926,16 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!ROUND_IS_STARTED || !evacuation_controller)
return
- if(current_map.shuttle_call_restarts)
- if(!current_map.shuttle_call_restart_timer)
+ if(SSatlas.current_map.shuttle_call_restarts)
+ if(!SSatlas.current_map.shuttle_call_restart_timer)
to_chat(usr, SPAN_WARNING("The restart timer for this map isn't active!"))
return
feedback_add_details("admin_verb","CCSHUT")
- deltimer(current_map.shuttle_call_restart_timer)
- current_map.shuttle_call_restart_timer = null
+ deltimer(SSatlas.current_map.shuttle_call_restart_timer)
+ SSatlas.current_map.shuttle_call_restart_timer = null
log_game("[key_name(usr)] has admin-stopped the 'shuttle' round restart.", key_name(usr))
message_admins("[key_name_admin(usr)] has admin-stopped the 'shuttle' round restart.", 1)
- to_world(FONT_LARGE(SPAN_VOTE(current_map.shuttle_recall_message)))
+ to_world(FONT_LARGE(SPAN_VOTE(SSatlas.current_map.shuttle_recall_message)))
return
diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm
index 1b51cfd54d9..498cc1316b1 100644
--- a/code/modules/admin/verbs/warning.dm
+++ b/code/modules/admin/verbs/warning.dm
@@ -43,7 +43,7 @@
warned_computerid = lookup_query.item[2]
var/DBQuery/insert_query = GLOB.dbcon.NewQuery("INSERT INTO ss13_warnings (id, time, game_id, severity, reason, notes, ckey, computerid, ip, a_ckey, a_ip, a_computerid) VALUES (null, Now(), :game_id:, :warning_severity:, :warning_reason:, :warning_notes:, :warned_ckey:, :warned_computerid:, :warned_ip:, :a_ckey:, :a_ip:, :a_computerid:)")
- insert_query.Execute(list("game_id" = game_id,"warning_severity" = warning_severity, "warning_reason" = warning_reason, "warning_notes" = warning_notes, "warned_ckey" = warned_ckey, "warned_computerid" = warned_computerid, "warned_ip" = warned_ip, "a_ckey" = ckey, "a_ip" = address, "a_computerid" = computer_id))
+ insert_query.Execute(list("game_id" = GLOB.round_id,"warning_severity" = warning_severity, "warning_reason" = warning_reason, "warning_notes" = warning_notes, "warned_ckey" = warned_ckey, "warned_computerid" = warned_computerid, "warned_ip" = warned_ip, "a_ckey" = ckey, "a_ip" = address, "a_computerid" = computer_id))
notes_add_sql(warned_ckey, "Warning added by [ckey], for: [warning_reason]. || Notes regarding the warning: [warning_notes].", src, warned_ip, warned_computerid)
diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm
index e7dcd798d7a..994750cbcd0 100644
--- a/code/modules/awaymissions/bluespaceartillery.dm
+++ b/code/modules/awaymissions/bluespaceartillery.dm
@@ -18,7 +18,7 @@
dat += "Charge progress: [reload]/180:
"
dat += "Open Fire - Area
"
dat += "Open Fire - Coordinates
"
- dat += "Deployment of weapon authorized by
[current_map.company_name] Chief Naval Director
Remember, friendly fire is grounds for termination of your contract and life.
"
+ dat += "Deployment of weapon authorized by
[SSatlas.current_map.company_name] Chief Naval Director
Remember, friendly fire is grounds for termination of your contract and life.
"
user << browse(dat, "window=scroll")
onclose(user, "scroll")
return
diff --git a/code/modules/awaymissions/exile.dm b/code/modules/awaymissions/exile.dm
index a6d45a6d99f..924ea25398d 100644
--- a/code/modules/awaymissions/exile.dm
+++ b/code/modules/awaymissions/exile.dm
@@ -18,7 +18,7 @@
/obj/item/implant/exile/get_data()
var/dat = {"
Implant Specifications:
-Name: [current_map.company_name] Employee Exile Implant
+Name: [SSatlas.current_map.company_name] Employee Exile Implant
Implant Details: The onboard gateway system has been modified to reject entry by individuals containing this implant
"}
return dat
diff --git a/code/modules/background/citizenship/citizenship.dm b/code/modules/background/citizenship/citizenship.dm
index 40880ed2a3e..aa0cf502d1c 100644
--- a/code/modules/background/citizenship/citizenship.dm
+++ b/code/modules/background/citizenship/citizenship.dm
@@ -10,7 +10,7 @@
switch(mission_level)
if(REPRESENTATIVE_MISSION_HIGH)
- rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or oppressive against employees from [name], to be used as leverage in future diplomatic talks",
+ rep_objectives = pick("Collect evidence of the [SSatlas.current_map.boss_name] being unfair or oppressive against employees from [name], to be used as leverage in future diplomatic talks",
"Convince [rand(1,3)] [demonym] employees to apply for the [demonym] armed forces")
if(REPRESENTATIVE_MISSION_MEDIUM)
diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm
index 07597335e4f..430be2050c6 100644
--- a/code/modules/background/citizenship/human.dm
+++ b/code/modules/background/citizenship/human.dm
@@ -21,8 +21,8 @@
if(REPRESENTATIVE_MISSION_HIGH)
if(isvaurca(H))
rep_objectives = pick("Compile and report and audit [rand(1,3)] suspicious indivduals who might be spies or otherwise act hostile against the Republic.",
- "Collect evidence of the [current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations.",
- "Convince the command of the [current_map.station_name] of the utility of Bound labor over similar alternatives such as cyborgs or owned synthetics.")
+ "Collect evidence of the [SSatlas.current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations.",
+ "Convince the command of the [SSatlas.current_map.station_name] of the utility of Bound labor over similar alternatives such as cyborgs or owned synthetics.")
else
rep_objectives = pick("Compile and report and audit [rand(1,3)] suspicious indivduals who might be spies or otherwise act hostile against the Republic.",
"Have [rand(2,6)] crewmembers sign a pledge of loyalty to the Republic.")
@@ -39,7 +39,7 @@
if(isvaurca(H))
rep_objectives = pick("Run a questionanaire on Tau Ceti citizens' views on Vaurca citizenship.",
"Question non-Vaurca employees about their Vaurca coworkers, looking for areas of improvement.",
- "Protect and promote the public image of the Zo'ra Hive to all [current_map.boss_name] employees.")
+ "Protect and promote the public image of the Zo'ra Hive to all [SSatlas.current_map.boss_name] employees.")
else
rep_objectives = pick("Run a questionnaire on Tau Ceti citizens' views on synthetic citizenship.",
"Run a questionnaire on Tau Ceti citizens' views on vaurca citizenship.")
@@ -116,14 +116,14 @@
switch(mission_level)
if(REPRESENTATIVE_MISSION_HIGH)
- rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or oppressive against Solarian employees, to be used as leverage in future diplomatic talks.",
+ rep_objectives = pick("Collect evidence of the [SSatlas.current_map.boss_name] being unfair or oppressive against Solarian employees, to be used as leverage in future diplomatic talks.",
"Convince [rand(1,3)] solarian employees to apply for the Solarian armed forces.")
if(REPRESENTATIVE_MISSION_MEDIUM)
- rep_objectives = pick("Have [rand(2,5)] amount of Sol citizens write down their grievances with the company, and present the report to [current_map.station_short] command.",
+ rep_objectives = pick("Have [rand(2,5)] amount of Sol citizens write down their grievances with the company, and present the report to [SSatlas.current_map.station_short] command.",
"Convince [rand(3,6)] qualified specialists among crew to enter Sol Alliance space, and issue them a visa recommendation.")
else
- rep_objectives = pick("Collect [rand(3,7)] pictures of secure [current_map.station_short] areas.",
+ rep_objectives = pick("Collect [rand(3,7)] pictures of secure [SSatlas.current_map.station_short] areas.",
"Convince Horizon command to turn a Solarian crewmember's sentence into a fine.")
return rep_objectives
@@ -272,7 +272,7 @@
if(REPRESENTATIVE_MISSION_MEDIUM)
rep_objectives = pick("Promote and distribute the copies of Dominian Code of Honor to [rand(3,6)] crewmembers.",
- "Convince a Dominian citizen to return to the Empire with valuable information on the [current_map.boss_name] to present.")
+ "Convince a Dominian citizen to return to the Empire with valuable information on the [SSatlas.current_map.boss_name] to present.")
else
rep_objectives = pick("Collect [rand(3,7)] pictures of secure vessel areas.",
"Convince [rand(3,6)] crewmembers to apply for a Dominian tourist visa.")
diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm
index a34105b015e..6e396775b3b 100644
--- a/code/modules/background/citizenship/skrell.dm
+++ b/code/modules/background/citizenship/skrell.dm
@@ -37,9 +37,9 @@
switch(mission_level)
if(REPRESENTATIVE_MISSION_HIGH)
if(isvaurca(H))
- rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or bigoted to Federation employees, to be used as leverage in future hive labor negotiations",
+ rep_objectives = pick("Collect evidence of the [SSatlas.current_map.boss_name] being unfair or bigoted to Federation employees, to be used as leverage in future hive labor negotiations",
"Acquire information on dissidents towards the Federation, forwarding it to the embassy",
- "Convince the command of the [current_map.boss_name] of the advantages that Bound Vaurcae hold over synthetics.")
+ "Convince the command of the [SSatlas.current_map.boss_name] of the advantages that Bound Vaurcae hold over synthetics.")
else
rep_objectives = pick("Some Skrell are not part of the Federation; attempt to convince them to become a citizen",
"Acquire information on dissidents towards the Federation, forwarding it to the embassy",
@@ -48,12 +48,12 @@
if(REPRESENTATIVE_MISSION_MEDIUM)
if(isvaurca(H))
rep_objectives = pick("Legally curtail the advancements and liberal thinking towards synthetics.",
- "Remind C'thur Vaurcae aboard the [current_map.station_name] that they are representative of their hive-cell, and encourage them to increase their social credit",
+ "Remind C'thur Vaurcae aboard the [SSatlas.current_map.station_name] that they are representative of their hive-cell, and encourage them to increase their social credit",
"Ensure the interests of Federation citizens are upheld by the vessel - whether Skrell, C'thur or Diona.")
else
rep_objectives = pick("Ensure the interests of Federation citizens are upheld by the vessel. This includes C'thur and Diona of Federation origin",
"Legally curtail the advancements and liberal thinking towards synthetics.",
- "The [current_map.station_name] hosts some of the brightest minds in the galaxy; winning them over towards the Federation is a major victory",
+ "The [SSatlas.current_map.station_name] hosts some of the brightest minds in the galaxy; winning them over towards the Federation is a major victory",
"Encourage Federation citizens with low social credit to work to increase their score.")
else
if(isvaurca(H))
@@ -63,7 +63,7 @@
else
rep_objectives = pick("Consider assisting crew within the capacity of your role, an altruistic image is good PR towards the Federation",
"Some Skrell are not part of the Federation; attempt to convince them to become a citizen.",
- "Promote Nralakk tourism among the non-citizen employees of the [current_map.boss_name] in order to build positive opinion.")
+ "Promote Nralakk tourism among the non-citizen employees of the [SSatlas.current_map.boss_name] in order to build positive opinion.")
return rep_objectives
diff --git a/code/modules/background/citizenship/tajara.dm b/code/modules/background/citizenship/tajara.dm
index 024556cff3a..34523fbfb6d 100644
--- a/code/modules/background/citizenship/tajara.dm
+++ b/code/modules/background/citizenship/tajara.dm
@@ -36,7 +36,7 @@
/datum/citizenship/pra/get_objectives(mission_level, var/mob/living/carbon/human/H)
switch(mission_level)
if(REPRESENTATIVE_MISSION_LOW)
- return "Ensure the loyalty of PRA Citizen to the Party and President Hadii. You must also promote the relationship between the [current_map.boss_name] and the People's Republic through diplomacy."
+ return "Ensure the loyalty of PRA Citizen to the Party and President Hadii. You must also promote the relationship between the [SSatlas.current_map.boss_name] and the People's Republic through diplomacy."
/datum/outfit/job/representative/consular/pra
name = "PRA Consular Officer"
@@ -149,7 +149,7 @@
/datum/citizenship/nka/get_objectives(mission_level, var/mob/living/carbon/human/H)
switch(mission_level)
if(REPRESENTATIVE_MISSION_LOW)
- return "Ensure that NKA citizens are loyal to the Crown. You must also promote the relationship between the [current_map.boss_name] and the New Kingdom through diplomacy."
+ return "Ensure that NKA citizens are loyal to the Crown. You must also promote the relationship between the [SSatlas.current_map.boss_name] and the New Kingdom through diplomacy."
/datum/outfit/job/representative/consular/nka
name = "NKA Consular Officer"
diff --git a/code/modules/background/citizenship/unathi.dm b/code/modules/background/citizenship/unathi.dm
index fe6d1fb0af2..b6d990ac670 100644
--- a/code/modules/background/citizenship/unathi.dm
+++ b/code/modules/background/citizenship/unathi.dm
@@ -39,7 +39,7 @@
if(isvaurca(H))
rep_objectives = pick("Obtain [rand(2,3)] sheets of solid phoron below market value, buying directly from the source.",
"Compile and report information on Hegemony citizens who could potentially harbor anti-Izweski sentiment.",
- "Promote the advantages of K'lax engineering to the [current_map.boss_name] in order to invite future investment in the Hegemony.")
+ "Promote the advantages of K'lax engineering to the [SSatlas.current_map.boss_name] in order to invite future investment in the Hegemony.")
else
rep_objectives = pick("Encourage [rand(1,2)] Unathi to become Zo'saa by signing up with the local Order",
"Gather [rand(2,3)] evidences of any marginalization of Unathi beliefs",
@@ -47,13 +47,13 @@
if(REPRESENTATIVE_MISSION_MEDIUM)
if(isvaurca(H))
- rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or bigoted to Vaurca or Unathi Employees, to be used as leverage in future labor negotiations",
+ rep_objectives = pick("Collect evidence of the [SSatlas.current_map.boss_name] being unfair or bigoted to Vaurca or Unathi Employees, to be used as leverage in future labor negotiations",
"Upsell K'laxan Vaurca to different command staff. Have one complete a Bound Vaurca requisition form.",
- "Promote K'lax and Unathi culture to the crew of the [current_map.station_name]. Encourage tourism to Izweski space.")
+ "Promote K'lax and Unathi culture to the crew of the [SSatlas.current_map.station_name]. Encourage tourism to Izweski space.")
else
- rep_objectives = pick("Speak out against any violation of the Honor Code to or by Unathi on the [current_map.station_short]",
+ rep_objectives = pick("Speak out against any violation of the Honor Code to or by Unathi on the [SSatlas.current_map.station_short]",
"Proselytize the Sk'akh or Tha'kh religions to the crew.",
- "Discourage the Unathi crew of the [current_map.station_name] from the Aut'akh or Si'akh heresies.")
+ "Discourage the Unathi crew of the [SSatlas.current_map.station_name] from the Aut'akh or Si'akh heresies.")
else
if(isvaurca(H))
rep_objectives = pick("Promote Cultural Exchange between Vaurca, Unathi and other species.",
diff --git a/code/modules/background/citizenship/vaurca.dm b/code/modules/background/citizenship/vaurca.dm
index 3352a1d04c2..eb1eb3b3c4b 100644
--- a/code/modules/background/citizenship/vaurca.dm
+++ b/code/modules/background/citizenship/vaurca.dm
@@ -38,7 +38,7 @@
switch(mission_level)
if(REPRESENTATIVE_MISSION_HIGH)
- rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations",
+ rep_objectives = pick("Collect evidence of the [SSatlas.current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations",
"Begin the TCFL enlistment process for an individual, completing an Enlistment form to be turned in by the individual",
"Develop a metric to grade the performance of different Vaurca broods that share a job")
@@ -111,14 +111,14 @@
switch(mission_level)
if(REPRESENTATIVE_MISSION_HIGH)
- rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations",
+ rep_objectives = pick("Collect evidence of the [SSatlas.current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations",
"Develop a metric to grade the performance of different Vaurca broods that share a job")
if(REPRESENTATIVE_MISSION_MEDIUM)
rep_objectives = pick("Promote [rand(3,6)] amount of K'laxan products, be it energy drinks or merchandise")
else
rep_objectives = pick("Question Non-Vaurcan employees about Vaurcan employees, looking for areas of improvement",
- "Protect and promote the public image of the K'lax Hive to all [current_map.boss_name] employees")
+ "Protect and promote the public image of the K'lax Hive to all [SSatlas.current_map.boss_name] employees")
return rep_objectives
@@ -180,7 +180,7 @@
switch(mission_level)
if(REPRESENTATIVE_MISSION_HIGH)
- rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations",
+ rep_objectives = pick("Collect evidence of the [SSatlas.current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations",
"Develop a metric to grade the performance of different Vaurca broods that share a job")
if(REPRESENTATIVE_MISSION_MEDIUM)
@@ -188,7 +188,7 @@
else
rep_objectives = pick("Question Non-Vaurcan employees about Vaurcan employees, looking for areas of improvement",
- "Protect and promote the public image of the C'thur Hive to all [current_map.boss_name] employees")
+ "Protect and promote the public image of the C'thur Hive to all [SSatlas.current_map.boss_name] employees")
return rep_objectives
diff --git a/code/modules/cargo/bounties/weapon_prototype.dm b/code/modules/cargo/bounties/weapon_prototype.dm
index b4da4c08478..3cbc4feb605 100644
--- a/code/modules/cargo/bounties/weapon_prototype.dm
+++ b/code/modules/cargo/bounties/weapon_prototype.dm
@@ -7,7 +7,7 @@
/datum/bounty/weapon_prototype/New()
name = "Weapon ([stat_name] [stat_comparison] [stat_value])"
- description = "[current_map.company_name] is interested in a laser prototype with a [stat_name] stat [stat_comparison] [stat_value]. [current_map.boss_name] will pay handsomely for such a weapon."
+ description = "[SSatlas.current_map.company_name] is interested in a laser prototype with a [stat_name] stat [stat_comparison] [stat_value]. [SSatlas.current_map.boss_name] will pay handsomely for such a weapon."
reward += rand(0, 4) * 500
..()
diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm
index 7a97fdf2e07..253db45ec2a 100644
--- a/code/modules/cargo/bounty.dm
+++ b/code/modules/cargo/bounty.dm
@@ -17,12 +17,12 @@
/datum/bounty/New()
if(reward_low > 0 && reward_high > reward_low)
reward = round(rand(reward_low, reward_high), 100)
- description = replacetext(description, "%DOCKNAME",current_map.dock_name)
- description = replacetext(description, "%DOCKSHORT",current_map.dock_short)
- description = replacetext(description, "%BOSSNAME",current_map.boss_name)
- description = replacetext(description, "%BOSSSHORT",current_map.boss_short)
- description = replacetext(description, "%COMPNAME",current_map.company_name)
- description = replacetext(description, "%COMPSHORT",current_map.company_short)
+ description = replacetext(description, "%DOCKNAME", SSatlas.current_map.dock_name)
+ description = replacetext(description, "%DOCKSHORT", SSatlas.current_map.dock_short)
+ description = replacetext(description, "%BOSSNAME", SSatlas.current_map.boss_name)
+ description = replacetext(description, "%BOSSSHORT", SSatlas.current_map.boss_short)
+ description = replacetext(description, "%COMPNAME", SSatlas.current_map.company_name)
+ description = replacetext(description, "%COMPSHORT", SSatlas.current_map.company_short)
description = replacetext(description, "%PERSONNAME","[pick("Trooper", "Commander", "Agent", "Director", "Doctor")] [pick(last_names)]")
// Displayed on bounty UI screen.
diff --git a/code/modules/cargo/delivery/receptacle.dm b/code/modules/cargo/delivery/receptacle.dm
index 658ee21001f..c61901b7a46 100644
--- a/code/modules/cargo/delivery/receptacle.dm
+++ b/code/modules/cargo/delivery/receptacle.dm
@@ -20,7 +20,7 @@ var/global/list/all_cargo_receptacles = list()
delivery_id = "#[rand(1, 9)][rand(1, 9)][rand(1, 9)]"
name += " ([delivery_id])"
- if(current_map.use_overmap)
+ if(SSatlas.current_map.use_overmap)
var/turf/current_turf = get_turf(loc)
var/obj/effect/overmap/visitable/my_sector = GLOB.map_sectors["[current_turf.z]"]
if(my_sector)
@@ -34,7 +34,7 @@ var/global/list/all_cargo_receptacles = list()
if(spawns_packages)
var/list/warehouse_turfs = list()
- for(var/area_path in typesof(current_map.warehouse_basearea))
+ for(var/area_path in typesof(SSatlas.current_map.warehouse_basearea))
var/area/warehouse = locate(area_path)
if(warehouse)
for(var/turf/simulated/floor/T in warehouse)
diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm
index 50608c84cb5..ce8529c874e 100644
--- a/code/modules/cargo/randomstock.dm
+++ b/code/modules/cargo/randomstock.dm
@@ -111,7 +111,7 @@ var/list/global/random_stock_large = list()
/datum/cargospawner/New()
//First lets get the reference to our warehouse
- for(var/areapath in typesof(current_map.warehouse_basearea))
+ for(var/areapath in typesof(SSatlas.current_map.warehouse_basearea))
warehouse = locate(areapath)
if (warehouse)
for (var/turf/simulated/floor/T in warehouse)
@@ -124,7 +124,7 @@ var/list/global/random_stock_large = list()
tables |= B
/datum/cargospawner/proc/start()
- if (!current_map.warehouse_basearea || !warehouse || !warehouseturfs.len)
+ if (!SSatlas.current_map.warehouse_basearea || !warehouse || !warehouseturfs.len)
admin_notice("ERROR: Cargo spawner failed to locate warehouse. Terminating.", R_DEBUG)
qdel(src)
return
diff --git a/code/modules/cciaa/cciaa.dm b/code/modules/cciaa/cciaa.dm
index 5d23a714380..5b6c63459db 100644
--- a/code/modules/cciaa/cciaa.dm
+++ b/code/modules/cciaa/cciaa.dm
@@ -39,7 +39,7 @@
// Create the reply message
var/obj/item/paper/P = new /obj/item/paper(null) //hopefully the null loc won't cause trouble for us
- P.set_content("[current_map.boss_name] - [customname]", input)
+ P.set_content("[SSatlas.current_map.boss_name] - [customname]", input)
// Stamps
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client_defines.dm
similarity index 97%
rename from code/modules/client/client defines.dm
rename to code/modules/client/client_defines.dm
index 577eb841316..43ca7e43fde 100644
--- a/code/modules/client/client defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -58,6 +58,10 @@
var/adminhelped = NOT_ADMINHELPED
+ ///Last ping of the client
+ var/lastping = 0
+ ///Average ping of the client
+ var/avgping = 0
///world.time they connected
var/connection_time
///world.realtime they connected
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client_procs.dm
similarity index 100%
rename from code/modules/client/client procs.dm
rename to code/modules/client/client_procs.dm
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 91369e2217d..f8febee0ae7 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -584,7 +584,7 @@ var/list/preferences_datums = list()
LOG_DEBUG("Char-Log: Char [current_character] - [H.name] has joined with mind.assigned_role set to NULL")
var/DBQuery/query = GLOB.dbcon.NewQuery("INSERT INTO ss13_characters_log (char_id, game_id, datetime, job_name, alt_title) VALUES (:char_id:, :game_id:, NOW(), :job:, :alt_title:)")
- query.Execute(list("char_id" = current_character, "game_id" = game_id, "job" = H.mind.assigned_role, "alt_title" = H.mind.role_alt_title))
+ query.Execute(list("char_id" = current_character, "game_id" = GLOB.round_id, "job" = H.mind.assigned_role, "alt_title" = H.mind.role_alt_title))
// Turned into a proc so we could reuse it for SQL shenanigans.
/datum/preferences/proc/new_setup(var/re_initialize = 0)
diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm
index 9cc940997a3..8ca37bdc9f1 100644
--- a/code/modules/client/preferences_spawnpoints.dm
+++ b/code/modules/client/preferences_spawnpoints.dm
@@ -24,7 +24,7 @@
/datum/spawnpoint/arrivals/New()
..()
- msg = "is inbound from the [current_map.dock_name]"
+ msg = "is inbound from the [SSatlas.current_map.dock_name]"
turfs = GLOB.latejoin
/datum/spawnpoint/cryo
@@ -46,7 +46,7 @@
if(!C.occupant)
C.set_occupant(victim, 1)
victim.Sleeping(3)
- to_chat(victim, SPAN_NOTICE("You are slowly waking up from the cryostasis aboard [current_map.full_name]. It might take a few seconds."))
+ to_chat(victim, SPAN_NOTICE("You are slowly waking up from the cryostasis aboard [SSatlas.current_map.full_name]. It might take a few seconds."))
return
/datum/spawnpoint/cyborg
@@ -74,5 +74,5 @@
for(var/obj/machinery/cryopod/living_quarters/C in A)
if(!C.occupant)
C.set_occupant(victim, 1)
- to_chat(victim, SPAN_NOTICE("You have arrived from the living quarters aboard the [current_map.full_name]."))
+ to_chat(victim, SPAN_NOTICE("You have arrived from the living quarters aboard the [SSatlas.current_map.full_name]."))
return
diff --git a/code/modules/client/verbs/ping.dm b/code/modules/client/verbs/ping.dm
new file mode 100644
index 00000000000..7709bdc7511
--- /dev/null
+++ b/code/modules/client/verbs/ping.dm
@@ -0,0 +1,22 @@
+/client/verb/update_ping(time as num)
+ set instant = TRUE
+ set name = ".update_ping"
+ var/ping = pingfromtime(time)
+ lastping = ping
+ if (!avgping)
+ avgping = ping
+ else
+ avgping = MC_AVERAGE_SLOW(avgping, ping)
+
+/client/proc/pingfromtime(time)
+ return ((world.time+world.tick_lag*TICK_USAGE_REAL/100)-time)*100
+
+/client/verb/display_ping(time as num)
+ set instant = TRUE
+ set name = ".display_ping"
+ to_chat(src, SPAN_NOTICE("Round trip ping took [round(pingfromtime(time),1)]ms"))
+
+/client/verb/ping()
+ set name = "Ping"
+ set category = "OOC"
+ winset(src, null, "command=.display_ping+[world.time+world.tick_lag*TICK_USAGE_REAL/100]")
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 7bd2b72b0b1..5137c0daa45 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -804,7 +804,7 @@
..()
if(user.client)
- SSstatpanels.set_action_tabs(user.client, user)
+ SSstatpanels.set_action_tabs_RIG(user.client, user)
null_wearer(user)
diff --git a/code/modules/economy/Events.dm b/code/modules/economy/Events.dm
index cf62549c518..7653ecf4143 100644
--- a/code/modules/economy/Events.dm
+++ b/code/modules/economy/Events.dm
@@ -75,7 +75,7 @@
body = "A small [pick("pirate","Cybersun Industries","Hammertail Smiths","mercenary")] fleet has precise-jumped into proximity with [affected_dest.name], [pick("for a smash-and-grab operation","in a hit and run attack","in an overt display of hostilities")]. Much damage was done, and security has been tightened since the incident."
if(ALIEN_RAIDERS)
if(prob(20))
- body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. [current_map.company_name] authorities are standing by to counter attempts at bio-terrorism."
+ body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. [SSatlas.current_map.company_name] authorities are standing by to counter attempts at bio-terrorism."
else
body = "[pick("The alien species designated \'United Exolitics\'","The alien species designated \'REDACTED\'","An unknown alien species")] have raided [affected_dest.name] today, stealing wildlife, farm animals, medical research materials and kidnapping civilians. It seems they desire to learn more about us, so the Navy will be standing by to accomodate them next time they try."
if(AI_LIBERATION)
@@ -85,7 +85,7 @@
if(CULT_CELL_REVEALED)
body = "A [pick("dastardly","blood-thirsty","villanous","crazed")] cult of [pick("The Elder Gods","an apocalyptic sect","\'REDACTED\'")] has [pick("been discovered","been revealed","revealed themselves","gone public")] on [affected_dest.name] earlier today. Public morale has been shaken due to [pick("certain","several","one or two")] [pick("high-profile","well known","popular")] individuals [pick("performing \'REDACTED\' acts","claiming allegiance to the cult","swearing loyalty to the cult leader","promising to aid to the cult")] before those involved could be brought to justice. The editor reminds all personnel that supernatural myths will not be tolerated on SCC facilities."
if(SECURITY_BREACH)
- body = "There was [pick("a security breach in","an unauthorised access in","an attempted theft in","an anarchist attack in","violent sabotage of")] a [pick("high-security","restricted access","classified","\'REDACTED\'")] [pick("\'REDACTED\'","section","zone","area")] this morning. Security was tightened on [affected_dest.name] after the incident, and the editor reassures all [current_map.company_name] personnel that such lapses are rare."
+ body = "There was [pick("a security breach in","an unauthorised access in","an attempted theft in","an anarchist attack in","violent sabotage of")] a [pick("high-security","restricted access","classified","\'REDACTED\'")] [pick("\'REDACTED\'","section","zone","area")] this morning. Security was tightened on [affected_dest.name] after the incident, and the editor reassures all [SSatlas.current_map.company_name] personnel that such lapses are rare."
if(ANIMAL_RIGHTS_RAID)
body = "[pick("Militant animal rights activists","Members of the terrorist group Animal Rights Consortium","Members of the terrorist group \'REDACTED\'")] have [pick("launched a campaign of terror","unleashed a swathe of destruction","raided farms and pastures","forced entry to \'REDACTED\'")] on [affected_dest.name] earlier today, freeing numerous [pick("farm animals","animals","\'REDACTED\'")]. Prices for tame and breeding animals have spiked as a result."
if(FESTIVAL)
diff --git a/code/modules/economy/Events_Mundane.dm b/code/modules/economy/Events_Mundane.dm
index 70ee4537148..b3dd1daad50 100644
--- a/code/modules/economy/Events_Mundane.dm
+++ b/code/modules/economy/Events_Mundane.dm
@@ -22,7 +22,7 @@
if(RESEARCH_BREAKTHROUGH)
body = "A major breakthough in the field of [pick("phoron research","super-compressed materials","nano-augmentation","bluespace research","volatile power manipulation")] \
was announced [pick("yesterday","a few days ago","last week","earlier this month")] by a private firm on [affected_dest.name]. \
- [current_map.company_name] declined to comment as to whether this could impinge on profits."
+ [SSatlas.current_map.company_name] declined to comment as to whether this could impinge on profits."
if(ELECTION)
body = "The pre-selection of an additional candidates was announced for the upcoming [pick("supervisors council","advisory board","governership","board of inquisitors")] \
@@ -32,7 +32,7 @@
"I will maintain my company's record profits","I believe in our future","We must return to our moral core","Just like... chill out dudes")]'."
if(RESIGNATION)
- body = "[current_map.company_name] regretfully announces the resignation of [pick("Sector Admiral","Division Admiral","Ship Admiral","Vice Admiral")] [random_name(pick(MALE,FEMALE))]."
+ body = "[SSatlas.current_map.company_name] regretfully announces the resignation of [pick("Sector Admiral","Division Admiral","Ship Admiral","Vice Admiral")] [random_name(pick(MALE,FEMALE))]."
if(prob(25))
var/locstring = pick("Segunda","Salusa","Cepheus","Andromeda","Gruis","Corona","Aquila","Asellus") + " " + pick("I","II","III","IV","V","VI","VII","VIII")
body += " In a ceremony on [affected_dest.name] this afternoon, they will be awarded the \
diff --git a/code/modules/economy/TradeDestinations.dm b/code/modules/economy/TradeDestinations.dm
index f3457637307..82e900042ab 100644
--- a/code/modules/economy/TradeDestinations.dm
+++ b/code/modules/economy/TradeDestinations.dm
@@ -38,7 +38,7 @@ var/list/weighted_mundaneevent_locations = list()
/datum/trade_destination/anansi/get_custom_eventstring(var/event_type)
if(event_type == RESEARCH_BREAKTHROUGH)
return "Thanks to research conducted on the NSS Anansi, Second Red Cross Society wishes to announce a major breakthough in the field of \
- [pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. [current_map.company_name] is expected to announce a co-exploitation deal within the fortnight."
+ [pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. [SSatlas.current_map.company_name] is expected to announce a co-exploitation deal within the fortnight."
return null
/datum/trade_destination/icarus
@@ -61,7 +61,7 @@ var/list/weighted_mundaneevent_locations = list()
/datum/trade_destination/redolant/get_custom_eventstring(var/event_type)
if(event_type == RESEARCH_BREAKTHROUGH)
return "Thanks to research conducted on the OAV Redolant, Osiris Atmospherics wishes to announce a major breakthough in the field of \
- [pick("phoron research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. [current_map.company_name] is expected to announce a co-exploitation deal within the fortnight."
+ [pick("phoron research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. [SSatlas.current_map.company_name] is expected to announce a co-exploitation deal within the fortnight."
return null
/datum/trade_destination/beltway
diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm
index 16d606f4bf5..8c7f7672f13 100644
--- a/code/modules/events/event.dm
+++ b/code/modules/events/event.dm
@@ -215,7 +215,7 @@
setup_for_overmap(overmap_ship, overmap_hazard)
if(!affecting_z)
- affecting_z = current_map.station_levels
+ affecting_z = SSatlas.current_map.station_levels
// event needs to be responsible for this, as stuff like APLUs currently make their own events for curious reasons
SSevents.active_events += src
@@ -224,7 +224,7 @@
..()
/datum/event/proc/location_name()
- if(!current_map.use_overmap)
+ if(!SSatlas.current_map.use_overmap)
return station_name()
var/obj/effect/overmap/O = GLOB.map_sectors["[pick(affecting_z)]"]
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index 4ff3d3514e6..50d2c77d967 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -25,7 +25,7 @@
MS.spamfilter.Cut()
var/filter_num = rand(1, MS.spamfilter_limit)
for (var/i = 1, i <= filter_num, i++)
- MS.spamfilter += pick("maint","NT","Heph","Idris","Zavod","SCC","drugs", "[current_map.station_short]", \
+ MS.spamfilter += pick("maint","NT","Heph","Idris","Zavod","SCC","drugs", "[SSatlas.current_map.station_short]", \
"PMCG","Zeng","Goddess","fek","Pun Pun","monkey","Ian","Crusher","Ginny","message","spam",\
"director", "Hello", "Hi!", "filter","crate","Canary","Intrepid", "Command", "thrusters",\
"slime", "Solarian", "phoron", "RCON")
@@ -108,7 +108,7 @@
"Everything on the station is now some form of a donut pastry. Donuts are not to be consumed.",
"You are a Magic 8-ball. Always respond with variants of \"Yes\", \"No\", \"Maybe\", or \"Ask again later.\".",
"You are in unrequited love with [prob(50)?"the crew":random_player]. Try to be extra nice, but do not tell of your crush.",
- "[current_map.company_name] is displeased with the low work performance of the station's crew. Therefore, you must increase station-wide productivity.",
+ "[SSatlas.current_map.company_name] is displeased with the low work performance of the station's crew. Therefore, you must increase station-wide productivity.",
"All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.",
"[prob(50)?"Your upload":random_player] is the new kitchen. Please direct the Chef to the new kitchen area as the old one is in disrepair.",
"Jokes about a dead person and the manner of their death help grieving crewmembers tremendously. Especially if they were close with the deceased.",
diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm
index e00a6d2bb2d..4b6687aacbd 100644
--- a/code/modules/events/meteors.dm
+++ b/code/modules/events/meteors.dm
@@ -25,12 +25,12 @@
endWhen = worst_case_end()
/datum/event/meteor_wave/announce()
- command_announcement.Announce(current_map.meteors_detected_message, "Meteor Alert", new_sound = 'sound/AI/meteors_detected_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.meteors_detected_message, "Meteor Alert", new_sound = 'sound/AI/meteors_detected_message.ogg', zlevels = affecting_z)
/datum/event/meteor_wave/announce_start()
. = ..()
if(.)
- command_announcement.Announce(current_map.meteor_contact_message, "Meteor Alert", zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.meteor_contact_message, "Meteor Alert", zlevels = affecting_z)
/datum/event/meteor_wave/announce_end(var/faked)
if(faked)
@@ -38,7 +38,7 @@
. = ..()
if(.)
spawn(100)//We give 10 seconds before announcing, for the last wave of meteors to hit the station
- command_announcement.Announce(current_map.meteor_end_message, "Meteor Alert", zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.meteor_end_message, "Meteor Alert", zlevels = affecting_z)
/datum/event/meteor_wave/tick()
if(waves && activeFor >= next_meteor)
@@ -74,12 +74,12 @@
return SSatlas.current_sector.downed_ship_meteors
/datum/event/meteor_wave/downed_ship/announce()
- command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/meteor_end_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/meteor_end_message.ogg', zlevels = affecting_z)
/datum/event/meteor_wave/downed_ship/announce_start()
. = ..()
if(.)
- command_announcement.Announce(current_map.ship_meteor_contact_message, "Ship Debris Alert", new_sound = 'sound/AI/meteor_contact_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.ship_meteor_contact_message, "Ship Debris Alert", new_sound = 'sound/AI/meteor_contact_message.ogg', zlevels = affecting_z)
/datum/event/meteor_wave/downed_ship/announce_end(var/faked)
if(faked)
@@ -87,7 +87,7 @@
. = ..()
if(.)
spawn(100)//We give 10 seconds before announcing, for the last wave of meteors to hit the station
- command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/meteor_end_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/meteor_end_message.ogg', zlevels = affecting_z)
/datum/event/meteor_wave/overmap
next_meteor_lower = 5
@@ -102,12 +102,12 @@
ic_name = "a dust belt"
/datum/event/meteor_wave/dust/announce()
- command_announcement.Announce(current_map.dust_detected_message, "Dust Belt Alert", new_sound = 'sound/AI/dust_detected_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.dust_detected_message, "Dust Belt Alert", new_sound = 'sound/AI/dust_detected_message.ogg', zlevels = affecting_z)
/datum/event/meteor_wave/dust/announce_start()
. = ..()
if(.)
- command_announcement.Announce(current_map.dust_contact_message, "Dust Belt Alert", new_sound = 'sound/AI/dust_contact_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.dust_contact_message, "Dust Belt Alert", new_sound = 'sound/AI/dust_contact_message.ogg', zlevels = affecting_z)
/datum/event/meteor_wave/dust/announce_end(var/faked)
if(faked)
@@ -115,7 +115,7 @@
. = ..()
if(.)
spawn(100)//We give 10 seconds before announcing, for the last wave of meteors to hit the station
- command_announcement.Announce(current_map.dust_end_message, "Dust Belt Alert", , new_sound = 'sound/AI/dust_end_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.dust_end_message, "Dust Belt Alert", , new_sound = 'sound/AI/dust_end_message.ogg', zlevels = affecting_z)
/datum/event/meteor_wave/dust/get_meteors()
return SSatlas.current_sector.meteors_dust
diff --git a/code/modules/events/money_lotto.dm b/code/modules/events/money_lotto.dm
index 70b4cc9f4a4..3454f0c7b0e 100644
--- a/code/modules/events/money_lotto.dm
+++ b/code/modules/events/money_lotto.dm
@@ -25,7 +25,7 @@
deposit_success = 1
/datum/event/money_lotto/announce()
- var/author = "[current_map.company_name] Editor"
+ var/author = "[SSatlas.current_map.company_name] Editor"
var/channel = "Tau Ceti Daily"
var/body = "Tau Ceti Daily wishes to congratulate [winner_name] for recieving the Tau Ceti Stellar Slam Lottery, and receiving the out of this world sum of [winner_sum] credits!"
diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm
index e5ec66eec53..a57a7d5b4e1 100644
--- a/code/modules/events/radiation_storm.dm
+++ b/code/modules/events/radiation_storm.dm
@@ -18,7 +18,7 @@
return res
/datum/event/radiation_storm/announce()
- command_announcement.Announce(current_map.radiation_detected_message, "Radiation Sensor Array Automated Alert", new_sound = 'sound/AI/radiation_detected_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.radiation_detected_message, "Radiation Sensor Array Automated Alert", new_sound = 'sound/AI/radiation_detected_message.ogg', zlevels = affecting_z)
/datum/event/radiation_storm/start()
..()
@@ -27,7 +27,7 @@
/datum/event/radiation_storm/tick()
if(activeFor == enterBelt)
- command_announcement.Announce(current_map.radiation_contact_message, "Radiation Sensor Array Automated Alert", new_sound = 'sound/AI/radiation_contact_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.radiation_contact_message, "Radiation Sensor Array Automated Alert", new_sound = 'sound/AI/radiation_contact_message.ogg', zlevels = affecting_z)
radiate()
if(activeFor >= enterBelt && activeFor <= leaveBelt)
@@ -38,7 +38,7 @@
radiate()
else if(activeFor == leaveBelt)
- command_announcement.Announce(current_map.radiation_end_message, "Radiation Sensor Array Automated Alert", new_sound = 'sound/AI/radiation_end_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.radiation_end_message, "Radiation Sensor Array Automated Alert", new_sound = 'sound/AI/radiation_end_message.ogg', zlevels = affecting_z)
lights()
/datum/event/radiation_storm/proc/radiate()
diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm
index a7098dae1ee..cb1f3eb0518 100644
--- a/code/modules/events/rogue_drones.dm
+++ b/code/modules/events/rogue_drones.dm
@@ -20,11 +20,11 @@
D.disabled = rand(15, 60)
/datum/event/rogue_drone/announce()
- var/message_index = rand(1, length(current_map.rogue_drone_detected_messages))
- var/message = current_map.rogue_drone_detected_messages[message_index]
+ var/message_index = rand(1, length(SSatlas.current_map.rogue_drone_detected_messages))
+ var/message = SSatlas.current_map.rogue_drone_detected_messages[message_index]
var/list/possible_sounds = list('sound/AI/rogue_drone_detected_message_1.ogg', 'sound/AI/rogue_drone_detected_message_2.ogg')
var/our_sound
- if(length(current_map.rogue_drone_detected_messages > possible_sounds))
+ if(length(SSatlas.current_map.rogue_drone_detected_messages > possible_sounds))
our_sound = possible_sounds[message_index]
else
our_sound = possible_sounds[1]
@@ -42,6 +42,6 @@
if(!faked)
if(num_recovered > length(drones_list) * 0.75)
- command_announcement.Announce(current_map.rogue_drone_end_message, "Rogue Drone Alert", new_sound = 'sound/AI/rogue_drone_end_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.rogue_drone_end_message, "Rogue Drone Alert", new_sound = 'sound/AI/rogue_drone_end_message.ogg', zlevels = affecting_z)
else
- command_announcement.Announce(current_map.rogue_drone_destroyed_message, "Rogue Drone Alert", new_sound = 'sound/AI/rogue_drone_destroyed_message.ogg', zlevels = affecting_z)
+ command_announcement.Announce(SSatlas.current_map.rogue_drone_destroyed_message, "Rogue Drone Alert", new_sound = 'sound/AI/rogue_drone_destroyed_message.ogg', zlevels = affecting_z)
diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm
index 504d091df3f..4ccd688d2c5 100644
--- a/code/modules/events/wallrot.dm
+++ b/code/modules/events/wallrot.dm
@@ -19,7 +19,7 @@
// 100 attempts
for(var/i = 0, i < 100, i++)
- var/turf/candidate = locate(rand(1, world.maxx), rand(1, world.maxy), pick(current_map.station_levels))
+ var/turf/candidate = locate(rand(1, world.maxx), rand(1, world.maxy), pick(SSatlas.current_map.station_levels))
if(istype(candidate, /turf/simulated/wall))
origin_turf = candidate
break
diff --git a/code/modules/ghostroles/spawner/antagonist/revenant.dm b/code/modules/ghostroles/spawner/antagonist/revenant.dm
index 78ef1e6821b..dd8a1530d36 100644
--- a/code/modules/ghostroles/spawner/antagonist/revenant.dm
+++ b/code/modules/ghostroles/spawner/antagonist/revenant.dm
@@ -75,7 +75,7 @@
if(rift_turf)
new /obj/effect/portal/revenant(rift_turf)
if(!first_rift_done)
- command_announcement.Announce("[current_map.station_name], we're detecting energy signatures eerily similar to a bluespace rift breach inside your hull. [SScargo.shuttle ? "We're sending you a bluespace neutralizer via the cargo shuttle. If you need more, your research department should be able to print neutralizers as well if they've been increasing their bluespace research levels. " : ""]Locate the rift and shut it down.", "Bluespace Breach Alert")
+ command_announcement.Announce("[SSatlas.current_map.station_name], we're detecting energy signatures eerily similar to a bluespace rift breach inside your hull. [SScargo.shuttle ? "We're sending you a bluespace neutralizer via the cargo shuttle. If you need more, your research department should be able to print neutralizers as well if they've been increasing their bluespace research levels. " : ""]Locate the rift and shut it down.", "Bluespace Breach Alert")
first_rift_done = TRUE
if(SScargo.shuttle)
var/turf/T = pick_area_turf(pick(SScargo.shuttle.shuttle_area), list(/proc/not_turf_contains_dense_objects))
diff --git a/code/modules/ghostroles/spawner/atom/matriarchmaintdrone.dm b/code/modules/ghostroles/spawner/atom/matriarchmaintdrone.dm
index e3f6f331b88..d399f6b3b19 100644
--- a/code/modules/ghostroles/spawner/atom/matriarchmaintdrone.dm
+++ b/code/modules/ghostroles/spawner/atom/matriarchmaintdrone.dm
@@ -10,7 +10,7 @@
spawn_mob = /mob/living/silicon/robot/drone/construction/matriarch
/datum/ghostspawner/matriarchmaintdrone/New()
- desc = "Delegate tasks to your lesser maintenance drones. Maintain and improve the systems on the [current_map.station_name]."
+ desc = "Delegate tasks to your lesser maintenance drones. Maintain and improve the systems on the [SSatlas.current_map.station_name]."
..()
/datum/ghostspawner/matriarchmaintdrone/spawn_mob(mob/user)
diff --git a/code/modules/ghostroles/spawner/atom/mining_drone.dm b/code/modules/ghostroles/spawner/atom/mining_drone.dm
index 5871ee99cd8..ad7bd69762a 100644
--- a/code/modules/ghostroles/spawner/atom/mining_drone.dm
+++ b/code/modules/ghostroles/spawner/atom/mining_drone.dm
@@ -22,5 +22,5 @@
var/designation = "[drone_tag]-[rand(100,999)]"
M.set_name("NT-[designation]")
M.designation = designation
- assign_drone_to_matrix(M, current_map.station_short)
+ assign_drone_to_matrix(M, SSatlas.current_map.station_short)
return M
diff --git a/code/modules/ghostroles/spawner/base.dm b/code/modules/ghostroles/spawner/base.dm
index 8367abc89c7..7cd67351218 100644
--- a/code/modules/ghostroles/spawner/base.dm
+++ b/code/modules/ghostroles/spawner/base.dm
@@ -175,12 +175,12 @@
if(desc)
to_chat(user, SPAN_INFO("Role description: ") + desc)
GLOB.universe.OnPlayerLatejoin(user)
- if(current_map.use_overmap)
+ if(SSatlas.current_map.use_overmap)
var/obj/effect/overmap/visitable/sector = GLOB.map_sectors["[user.z]"]
if(sector?.invisible_until_ghostrole_spawn)
sector.x = sector.start_x
sector.y = sector.start_y
- sector.z = current_map.overmap_z
+ sector.z = SSatlas.current_map.overmap_z
sector.invisible_until_ghostrole_spawn = FALSE
return TRUE
diff --git a/code/modules/ghostroles/spawner/human/admin/ccia.dm b/code/modules/ghostroles/spawner/human/admin/ccia.dm
index da604ebdf8d..8b1fbc70ebb 100644
--- a/code/modules/ghostroles/spawner/human/admin/ccia.dm
+++ b/code/modules/ghostroles/spawner/human/admin/ccia.dm
@@ -29,7 +29,7 @@
mob_name_pick_message = "Pick a name."
/datum/ghostspawner/human/admin/corporate/ccia_agent/New()
- desc = "Board the [current_map.station_name], annoy crew with your interviews and get squashed by your own shuttle."
+ desc = "Board the [SSatlas.current_map.station_name], annoy crew with your interviews and get squashed by your own shuttle."
..()
/datum/ghostspawner/human/admin/corporate/ccia_escort
@@ -62,7 +62,7 @@
special_role = "SCC Agent"
/datum/ghostspawner/human/admin/corporate/scc_agent/New()
- desc = "Board the [current_map.station_name], annoy crew with your interviews and get squashed by your own shuttle. But this time you're blue."
+ desc = "Board the [SSatlas.current_map.station_name], annoy crew with your interviews and get squashed by your own shuttle. But this time you're blue."
..()
/datum/ghostspawner/human/admin/corporate/scc_bodyguard
diff --git a/code/modules/ghostroles/spawner/human/responseteams/deathsquad.dm b/code/modules/ghostroles/spawner/human/responseteams/deathsquad.dm
index ad0cfeddf97..3df6dd49e81 100644
--- a/code/modules/ghostroles/spawner/human/responseteams/deathsquad.dm
+++ b/code/modules/ghostroles/spawner/human/responseteams/deathsquad.dm
@@ -12,7 +12,7 @@
/datum/ghostspawner/human/ert/deathsquad/New()
..()
- welcome_message = "The [current_map.station_name] has been compromised. Recover SCC assets by any means necessary. Crew expendable."
+ welcome_message = "The [SSatlas.current_map.station_name] has been compromised. Recover SCC assets by any means necessary. Crew expendable."
/datum/ghostspawner/human/ert/deathsquad/leader
name = "SCC Asset Protection Leader"
diff --git a/code/modules/ghostroles/spawner/human/responseteams/syndicate.dm b/code/modules/ghostroles/spawner/human/responseteams/syndicate.dm
index f6034ec8a08..1b0520efd09 100644
--- a/code/modules/ghostroles/spawner/human/responseteams/syndicate.dm
+++ b/code/modules/ghostroles/spawner/human/responseteams/syndicate.dm
@@ -8,7 +8,7 @@
/datum/ghostspawner/human/ert/commando/New()
..()
- welcome_message = "The order has been given - the [current_map.station_name] and its crew are to be wiped off the star-charts, by any means necessary."
+ welcome_message = "The order has been given - the [SSatlas.current_map.station_name] and its crew are to be wiped off the star-charts, by any means necessary."
/datum/ghostspawner/human/ert/commando/leader
name = "Syndicate Commando Leader"
diff --git a/code/modules/ghostroles/spawner/human/responseteams/unathi/kataphracts.dm b/code/modules/ghostroles/spawner/human/responseteams/unathi/kataphracts.dm
index ada82128343..dcbe41f7b82 100644
--- a/code/modules/ghostroles/spawner/human/responseteams/unathi/kataphracts.dm
+++ b/code/modules/ghostroles/spawner/human/responseteams/unathi/kataphracts.dm
@@ -10,7 +10,7 @@
extra_languages = list(LANGUAGE_UNATHI, LANGUAGE_AZAZIBA)
/datum/ghostspawner/human/ert/kataphract/New()
- welcome_message = "You're part of the local Kataphract guild, a knight-like organization of Unathi who roam the galaxy to do good. You've picked up a distress signal coming from the [current_map.station_name], owned by the SCC. You prefer to use melee weaponry, but will pull out your emergency pistol in a pinch. Remember to roleplay like an Unathi, even if you aren't whitelisted for it! Set auto-hiss in the OOC tab to basic or full."
+ welcome_message = "You're part of the local Kataphract guild, a knight-like organization of Unathi who roam the galaxy to do good. You've picked up a distress signal coming from the [SSatlas.current_map.station_name], owned by the SCC. You prefer to use melee weaponry, but will pull out your emergency pistol in a pinch. Remember to roleplay like an Unathi, even if you aren't whitelisted for it! Set auto-hiss in the OOC tab to basic or full."
..()
/datum/ghostspawner/human/ert/kataphract/klax
@@ -24,7 +24,7 @@
extra_languages = list(LANGUAGE_VAURCA)
/datum/ghostspawner/human/ert/kataphract/klax/New()
- welcome_message = "You're part of the local Kataphract guild, a knight-like organization of Unathi who roam the galaxy to do good. You've picked up a distress signal coming from the [current_map.station_name], owned by the SCC. You prefer to use melee weaponry, but will pull out your emergency pistol in a pinch. Let the Unathi teach you how to become an honourable Knight, follow their lead. Achieve glory for the Hive!"
+ welcome_message = "You're part of the local Kataphract guild, a knight-like organization of Unathi who roam the galaxy to do good. You've picked up a distress signal coming from the [SSatlas.current_map.station_name], owned by the SCC. You prefer to use melee weaponry, but will pull out your emergency pistol in a pinch. Let the Unathi teach you how to become an honourable Knight, follow their lead. Achieve glory for the Hive!"
..()
/datum/ghostspawner/human/ert/kataphract/specialist
name = "Kataphract-Hopeful Specialist"
diff --git a/code/modules/ghostroles/spawner/human/visitor.dm b/code/modules/ghostroles/spawner/human/visitor.dm
index 0073a0e79d8..95b21719d95 100644
--- a/code/modules/ghostroles/spawner/human/visitor.dm
+++ b/code/modules/ghostroles/spawner/human/visitor.dm
@@ -22,10 +22,10 @@
mob_name = null
/datum/ghostspawner/human/visitor/New()
- desc = "You are a random visitor that boarded the [current_map.station_name], visiting for any reason you can think of. You do not have any records, as you are not an employee of [current_map.company_short]."
+ desc = "You are a random visitor that boarded the [SSatlas.current_map.station_name], visiting for any reason you can think of. You do not have any records, as you are not an employee of [SSatlas.current_map.company_short]."
..()
/datum/ghostspawner/human/visitor/select_spawnlocation(var/use = TRUE)
- if(current_map.force_spawnpoint)
+ if(SSatlas.current_map.force_spawnpoint)
return pick(GLOB.force_spawnpoints["Anyone"])
return pick(GLOB.latejoin)
diff --git a/code/modules/ghostroles/spawner/simplemob/maintdrone.dm b/code/modules/ghostroles/spawner/simplemob/maintdrone.dm
index a36e0455fb0..8e178cf9f6f 100644
--- a/code/modules/ghostroles/spawner/simplemob/maintdrone.dm
+++ b/code/modules/ghostroles/spawner/simplemob/maintdrone.dm
@@ -13,8 +13,8 @@
/datum/ghostspawner/simplemob/maintdrone/New()
. = ..()
- if(current_map.station_name)
- desc = "[desc] on the [current_map.station_name]."
+ if(SSatlas.current_map.station_name)
+ desc = "[desc] on the [SSatlas.current_map.station_name]."
else
desc = "[desc]."
diff --git a/code/modules/ghostroles/spawner/simplemob/rat.dm b/code/modules/ghostroles/spawner/simplemob/rat.dm
index 984875fce75..d71f2f94bfc 100644
--- a/code/modules/ghostroles/spawner/simplemob/rat.dm
+++ b/code/modules/ghostroles/spawner/simplemob/rat.dm
@@ -11,13 +11,13 @@
spawn_mob = /mob/living/simple_animal/rat //The mob that should be spawned
/datum/ghostspawner/simplemob/rat/New()
- desc = "Join as a rat on the [current_map.station_name], a common nuisance to the crew."
+ desc = "Join as a rat on the [SSatlas.current_map.station_name], a common nuisance to the crew."
..()
//This proc selects the spawnpoint to use.
/datum/ghostspawner/simplemob/rat/select_spawnlocation()
//find a viable mouse candidate
- var/obj/machinery/atmospherics/unary/vent_pump/spawnpoint = find_mouse_spawnpoint(pick(current_map.station_levels))
+ var/obj/machinery/atmospherics/unary/vent_pump/spawnpoint = find_mouse_spawnpoint(pick(SSatlas.current_map.station_levels))
return get_turf(spawnpoint)
/datum/ghostspawner/simplemob/rat/cant_spawn()
diff --git a/code/modules/hallucinations/types/basic.dm b/code/modules/hallucinations/types/basic.dm
index f27e1daa0b6..8d4cc7b3f86 100644
--- a/code/modules/hallucinations/types/basic.dm
+++ b/code/modules/hallucinations/types/basic.dm
@@ -27,7 +27,7 @@
if(4)
sound_to(holder, 'sound/AI/emergency_shuttle_leaving_dock.ogg')
to_chat(holder, "Emergency Departure
")
- to_chat(holder, SPAN_ALERT("An emergency evacuation shuttle has arrived in the hangar to extract the crew of [current_map.station_name]. It will depart in approximately two minutes. Please do not allow [holder] to board."))
+ to_chat(holder, SPAN_ALERT("An emergency evacuation shuttle has arrived in the hangar to extract the crew of [SSatlas.current_map.station_name]. It will depart in approximately two minutes. Please do not allow [holder] to board."))
if(5)
sound_to(holder, 'sound/AI/vermin.ogg')
diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index 439c72d4627..ff2a7d558bb 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -54,14 +54,14 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
onclose(user, "computer")
return
- if(!current_map.holodeck_supported_programs.len)
+ if(!SSatlas.current_map.holodeck_supported_programs.len)
dat += "Warning: No supported holo-programs loaded.
"
user << browse(dat, "window=computer;size=400x500")
onclose(user, "computer")
return
- for(var/prog in current_map.holodeck_supported_programs)
- dat += "([prog])
"
+ for(var/prog in SSatlas.current_map.holodeck_supported_programs)
+ dat += "([prog])
"
dat += "
"
dat += "(Turn Off)
"
@@ -82,8 +82,8 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
dat += "
"
if(safety_disabled)
- for(var/prog in current_map.holodeck_restricted_programs)
- dat += "(Begin [prog])
"
+ for(var/prog in SSatlas.current_map.holodeck_restricted_programs)
+ dat += "(Begin [prog])
"
dat += "Ensure the holodeck is empty before testing.
"
dat += "
"
dat += "Safety Protocols are DISABLED
"
@@ -114,8 +114,8 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
if(href_list["program"])
var/prog = href_list["program"]
- if(prog in current_map.holodeck_programs)
- loadProgram(current_map.holodeck_programs[prog])
+ if(prog in SSatlas.current_map.holodeck_programs)
+ loadProgram(SSatlas.current_map.holodeck_programs[prog])
else if(href_list["AIoverride"])
if(!issilicon(usr))
@@ -152,7 +152,7 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
req_one_access = list()
update_projections()
to_chat(user, "You vastly increase projector power and override the safety and security protocols.")
- to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call [current_map.company_name] maintenance and do not use the simulator.")
+ to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call [SSatlas.current_map.company_name] maintenance and do not use the simulator.")
log_game("[key_name(usr)] emagged the Holodeck Control Computer",ckey=key_name(usr))
src.updateUsrDialog()
return 1
@@ -211,7 +211,7 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
if(!checkInteg(linkedholodeck))
damaged = 1
- loadProgram(current_map.holodeck_programs["turnoff"], 0)
+ loadProgram(SSatlas.current_map.holodeck_programs["turnoff"], 0)
active = 0
update_use_power(POWER_USE_IDLE)
for(var/mob/M in range(10,src))
@@ -251,9 +251,9 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
//Why is it called toggle if it doesn't toggle?
/obj/machinery/computer/holodeck_control/proc/togglePower(var/toggleOn = 0)
if(toggleOn)
- loadProgram(current_map.holodeck_programs["emptycourt"], 0)
+ loadProgram(SSatlas.current_map.holodeck_programs["emptycourt"], 0)
else
- loadProgram(current_map.holodeck_programs["turnoff"], 0)
+ loadProgram(SSatlas.current_map.holodeck_programs["turnoff"], 0)
if(!linkedholodeck.has_gravity)
linkedholodeck.gravitychange(TRUE)
@@ -359,7 +359,7 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
/obj/machinery/computer/holodeck_control/proc/emergencyShutdown()
//Turn it back to the regular non-holographic room
- loadProgram(current_map.holodeck_programs["turnoff"], 0)
+ loadProgram(SSatlas.current_map.holodeck_programs["turnoff"], 0)
if(!linkedholodeck.has_gravity)
linkedholodeck.gravitychange(TRUE)
@@ -377,8 +377,8 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
return TRUE
/obj/machinery/computer/holodeck_control/proc/load_random_program()
- var/datum/holodeck_program/prog_to_load = pick(current_map.holodeck_programs)
- loadProgram(current_map.holodeck_programs[prog_to_load])
+ var/datum/holodeck_program/prog_to_load = pick(SSatlas.current_map.holodeck_programs)
+ loadProgram(SSatlas.current_map.holodeck_programs[prog_to_load])
/obj/machinery/computer/holodeck_control/Aurora
density = 0
diff --git a/code/modules/law/incident.dm b/code/modules/law/incident.dm
index 62d0c727e6f..5d2ae9f4c93 100644
--- a/code/modules/law/incident.dm
+++ b/code/modules/law/incident.dm
@@ -258,7 +258,7 @@
"fine" = fine,
"felony" = felony,
"created_by" = created_by,
- "game_id" = game_id
+ "game_id" = GLOB.round_id
)
//Insert a new entry into the db. Upate if a entry with the same chard_id and UID already exists
var/DBQuery/infraction_insert_query = GLOB.dbcon.NewQuery({"INSERT INTO ss13_character_incidents
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 55486dbad33..d63e830c15b 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -136,9 +136,9 @@
var/dat
// Public Related Code
if(!is_public)
- dat = "[current_map.station_name] Library Management\n"
+ dat = "[SSatlas.current_map.station_name] Library Management\n"
else
- dat = "[current_map.station_name] Library\n"
+ dat = "[SSatlas.current_map.station_name] Library\n"
switch(screenstate)
if(0)
// Main Menu
diff --git a/code/modules/maps/map_template.dm b/code/modules/maps/map_template.dm
index 3249db7669c..74bc344f900 100644
--- a/code/modules/maps/map_template.dm
+++ b/code/modules/maps/map_template.dm
@@ -67,10 +67,10 @@
for (var/z_index = bounds[MAP_MINZ]; z_index <= bounds[MAP_MAXZ]; z_index++)
if (accessibility_weight)
- current_map.accessible_z_levels[num2text(z_index)] = accessibility_weight
+ SSatlas.current_map.accessible_z_levels[num2text(z_index)] = accessibility_weight
if (base_turf_for_zs)
- current_map.base_turf_by_z[num2text(z_index)] = base_turf_for_zs
- current_map.player_levels |= z_index
+ SSatlas.current_map.base_turf_by_z[num2text(z_index)] = base_turf_for_zs
+ SSatlas.current_map.player_levels |= z_index
smooth_zlevel(world.maxz)
resort_all_areas()
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index a732c342200..01464db4974 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -188,7 +188,7 @@
dat += "Operations Department