From 12abb2d6f262ea77b45064e6ceb8e8a6f930512e Mon Sep 17 00:00:00 2001 From: Neerti Date: Sun, 26 Feb 2017 19:52:08 -0500 Subject: [PATCH] Ports a large chunk of the map datum system that europa/bay uses. Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross. Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage. To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm. --- code/__defines/machinery.dm | 2 +- code/_helpers/game.dm | 14 +- code/_helpers/names.dm | 48 +- code/controllers/configuration.dm | 32 +- .../emergency_shuttle_controller.dm | 15 +- code/datums/ai_law_sets.dm | 4 +- code/datums/helper_datums/teleport.dm | 2 +- code/game/antagonist/alien/borer.dm | 2 +- code/game/antagonist/outsider/ert.dm | 2 +- code/game/antagonist/outsider/ninja.dm | 14 +- code/game/area/Space Station 13 areas.dm | 4 +- code/game/atoms_movable.dm | 7 +- code/game/base_turf.dm | 13 +- .../endgame/supermatter_cascade/universe.dm | 2 +- code/game/gamemodes/events.dm | 2 +- code/game/gamemodes/events/clang.dm | 2 +- code/game/gamemodes/events/dust.dm | 2 +- code/game/gamemodes/events/power_failure.dm | 6 +- code/game/gamemodes/events/wormholes.dm | 2 +- code/game/gamemodes/gameticker.dm | 4 +- code/game/gamemodes/heist/heist.dm | 2 +- .../newmalf_ability_trees/tree_networking.dm | 6 +- code/game/gamemodes/meteor/meteors.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/game/gamemodes/objective.dm | 4 +- .../technomancer/spell_objs_helpers.dm | 2 +- code/game/gamemodes/traitor/traitor.dm | 2 +- code/game/jobs/job_controller.dm | 13 +- code/game/machinery/alarm.dm | 2 +- code/game/machinery/camera/camera.dm | 4 +- code/game/machinery/camera/camera_assembly.dm | 2 +- code/game/machinery/camera/presets.dm | 6 +- code/game/machinery/camera/tracking.dm | 4 +- code/game/machinery/computer/camera.dm | 2 +- .../game/machinery/computer/communications.dm | 16 +- code/game/machinery/computer/prisoner.dm | 2 +- .../machinery/computer/specops_shuttle.dm | 14 +- code/game/machinery/computer/supply.dm | 4 +- .../computer/syndicate_specops_shuttle.dm | 8 +- .../machinery/computer3/computers/camera.dm | 2 +- .../machinery/computer3/computers/card.dm | 2 +- .../computer3/computers/communications.dm | 6 +- .../machinery/computer3/computers/prisoner.dm | 2 +- .../machinery/computer3/computers/welcome.dm | 6 +- code/game/machinery/computer3/lapvend.dm | 8 +- code/game/machinery/doors/airlock.dm | 2 +- code/game/machinery/exonet_node.dm | 6 +- code/game/machinery/newscaster.dm | 24 +- code/game/machinery/nuclear_bomb.dm | 2 +- code/game/machinery/supplybeacon.dm | 4 +- code/game/machinery/teleporter.dm | 2 +- code/game/mecha/mech_fabricator.dm | 2 +- code/game/mecha/mech_prosthetics.dm | 2 +- code/game/objects/items/blueprints.dm | 2 +- code/game/objects/items/weapons/AI_modules.dm | 2 +- .../circuitboards/computer/camera_monitor.dm | 2 +- .../objects/items/weapons/implants/implant.dm | 10 +- code/game/objects/items/weapons/manuals.dm | 2 +- code/game/periodic_news.dm | 12 +- code/game/response_team.dm | 6 +- code/game/supplyshuttle.dm | 2 +- code/global.dm | 20 +- code/modules/admin/admin.dm | 10 +- code/modules/admin/holder2.dm | 2 +- .../secrets/admin_secrets/prison_warp.dm | 2 +- .../admin/secrets/fun_secrets/ghost_mode.dm | 2 +- code/modules/admin/verbs/diagnostics.dm | 2 +- code/modules/admin/verbs/pray.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 4 +- .../awaymissions/bluespaceartillery.dm | 2 +- code/modules/awaymissions/exile.dm | 2 +- .../preference_setup/general/05_background.dm | 2 +- code/modules/client/preferences_factions.dm | 2 +- .../clothing/spacesuits/rig/modules/ninja.dm | 2 +- .../modules/clothing/spacesuits/spacesuits.dm | 6 +- code/modules/economy/Events.dm | 8 +- code/modules/economy/Events_Mundane.dm | 16 +- code/modules/economy/TradeDestinations.dm | 4 +- code/modules/economy/economy_misc.dm | 2 +- code/modules/events/apc_damage.dm | 2 +- code/modules/events/camera_damage.dm | 2 +- code/modules/events/gravity.dm | 4 +- code/modules/events/ion_storm.dm | 4 +- code/modules/events/money_lotto.dm | 10 +- code/modules/events/money_spam.dm | 12 +- code/modules/events/radiation_storm.dm | 2 +- code/modules/events/rogue_drones.dm | 2 +- code/modules/events/spider_infestation.dm | 2 +- code/modules/events/viral_infection.dm | 2 +- .../modules/examine/descriptions/telecomms.dm | 4 +- .../gamemaster/actions/carp_migration.dm | 2 +- .../actions/surprise_carp_attack.dm | 4 +- code/modules/games/spaceball_cards.dm | 2 +- code/modules/holodeck/HolodeckControl.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 8 +- code/modules/mob/living/silicon/ai/malf.dm | 2 +- code/modules/mob/living/silicon/laws.dm | 2 +- .../mob/living/silicon/robot/drone/drone.dm | 2 +- .../silicon/robot/drone/drone_manufacturer.dm | 4 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- code/modules/mob/new_player/login.dm | 17 +- code/modules/mob/transform_procs.dm | 2 +- code/modules/nano/interaction/default.dm | 2 +- code/modules/nano/modules/crew_monitor.dm | 4 +- code/modules/paperwork/adminpaper.dm | 2 +- code/modules/paperwork/faxmachine.dm | 12 +- code/modules/power/smes.dm | 2 +- .../security levels/security levels.dm | 2 +- code/modules/shuttles/shuttle_emergency.dm | 9 +- code/modules/shuttles/shuttle_specops.dm | 10 +- code/modules/shuttles/shuttles_multi.dm | 4 +- code/modules/spells/spell_code.dm | 2 +- code/modules/supermatter/supermatter.dm | 4 +- code/world.dm | 6 +- config/example/config.txt | 10 +- maps/northern_star/northern_star.dm | 15 + maps/northern_star/northern_star_defines.dm | 93 + maps/{ => northern_star}/polaris-1.dmm | 20432 ++++++++-------- maps/{ => northern_star}/polaris-2.dmm | 6012 ++--- maps/{ => northern_star}/polaris-3.dmm | 1348 +- maps/{ => northern_star}/polaris-4.dmm | 1138 +- maps/{ => northern_star}/polaris-5.dmm | 4340 ++-- maps/southern_cross/southern_cross.dm | 13 + maps/southern_cross/southern_cross_defines.dm | 41 + maps/~map_system/maps.dm | 114 + polaris.dme | 8 +- 128 files changed, 17236 insertions(+), 16960 deletions(-) create mode 100644 maps/northern_star/northern_star.dm create mode 100644 maps/northern_star/northern_star_defines.dm rename maps/{ => northern_star}/polaris-1.dmm (99%) rename maps/{ => northern_star}/polaris-2.dmm (99%) rename maps/{ => northern_star}/polaris-3.dmm (99%) rename maps/{ => northern_star}/polaris-4.dmm (99%) rename maps/{ => northern_star}/polaris-5.dmm (99%) create mode 100644 maps/southern_cross/southern_cross.dm create mode 100644 maps/southern_cross/southern_cross_defines.dm create mode 100644 maps/~map_system/maps.dm diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index 8c999f6d96..6f8bec025b 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -38,7 +38,7 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called #define NETWORK_ENGINEERING "Engineering" #define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost" #define NETWORK_ERT "ZeEmergencyResponseTeam" -#define NETWORK_EXODUS station_short +#define NETWORK_DEFAULT "Station" #define NETWORK_MEDICAL "Medical" #define NETWORK_MERCENARY "MercurialNet" #define NETWORK_MINE "Mining Outpost" diff --git a/code/_helpers/game.dm b/code/_helpers/game.dm index c3ce40e657..6f6f4f9f0a 100644 --- a/code/_helpers/game.dm +++ b/code/_helpers/game.dm @@ -12,17 +12,17 @@ /proc/is_on_same_plane_or_station(var/z1, var/z2) if(z1 == z2) return 1 - if((z1 in config.station_levels) && (z2 in config.station_levels)) + if((z1 in using_map.station_levels) && (z2 in using_map.station_levels)) return 1 return 0 /proc/max_default_z_level() var/max_z = 0 - for(var/z in config.station_levels) + for(var/z in using_map.station_levels) max_z = max(z, max_z) - for(var/z in config.admin_levels) + for(var/z in using_map.admin_levels) max_z = max(z, max_z) - for(var/z in config.player_levels) + for(var/z in using_map.player_levels) max_z = max(z, max_z) return max_z @@ -62,16 +62,16 @@ return heard /proc/isStationLevel(var/level) - return level in config.station_levels + return level in using_map.station_levels /proc/isNotStationLevel(var/level) return !isStationLevel(level) /proc/isPlayerLevel(var/level) - return level in config.player_levels + return level in using_map.player_levels /proc/isAdminLevel(var/level) - return level in config.admin_levels + return level in using_map.admin_levels /proc/isNotAdminLevel(var/level) return !isAdminLevel(level) diff --git a/code/_helpers/names.dm b/code/_helpers/names.dm index dbd19610e6..cea166b915 100644 --- a/code/_helpers/names.dm +++ b/code/_helpers/names.dm @@ -15,19 +15,13 @@ var/church_name = null return name -var/command_name = null /proc/command_name() - if (command_name) - return command_name - - var/name = "[boss_name]" - - command_name = name - return name + if (using_map.boss_name) + return using_map.boss_name /proc/change_command_name(var/name) - command_name = name + using_map.boss_name = name return name @@ -44,19 +38,20 @@ var/religion_name = null return capitalize(name) /proc/system_name() - return starsys_name + return using_map.starsys_name /proc/station_name() - if (station_name) - return station_name + if (using_map.station_name) + return using_map.station_name var/random = rand(1,5) var/name = "" + var/new_station_name = null //Rare: Pre-Prefix if (prob(10)) name = pick("Imperium", "Heretical", "Cuban", "Psychic", "Elegant", "Common", "Uncommon", "Rare", "Unique", "Houseruled", "Religious", "Atheist", "Traditional", "Houseruled", "Mad", "Super", "Ultra", "Secret", "Top Secret", "Deep", "Death", "Zybourne", "Central", "Main", "Government", "Uoi", "Fat", "Automated", "Experimental", "Augmented") - station_name = name + " " + new_station_name = name + " " // Prefix switch(Holiday) @@ -64,49 +59,50 @@ var/religion_name = null if(null,"",0) name = pick("", "Stanford", "Dorf", "Alium", "Prefix", "Clowning", "Aegis", "Ishimura", "Scaredy", "Death-World", "Mime", "Honk", "Rogue", "MacRagge", "Ultrameens", "Safety", "Paranoia", "Explosive", "Neckbear", "Donk", "Muppet", "North", "West", "East", "South", "Slant-ways", "Widdershins", "Rimward", "Expensive", "Procreatory", "Imperial", "Unidentified", "Immoral", "Carp", "Ork", "Pete", "Control", "Nettle", "Aspie", "Class", "Crab", "Fist","Corrogated","Skeleton","Race", "Fatguy", "Gentleman", "Capitalist", "Communist", "Bear", "Beard", "Derp", "Space", "Spess", "Star", "Moon", "System", "Mining", "Neckbeard", "Research", "Supply", "Military", "Orbital", "Battle", "Science", "Asteroid", "Home", "Production", "Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional", "Robot", "Hats", "Pizza") if(name) - station_name += name + " " + new_station_name += name + " " //For special days like christmas, easter, new-years etc ~Carn if("Friday the 13th") name = pick("Mike","Friday","Evil","Myers","Murder","Deathly","Stabby") - station_name += name + " " + new_station_name += name + " " random = 13 else //get the first word of the Holiday and use that var/i = findtext(Holiday," ",1,0) name = copytext(Holiday,1,i) - station_name += name + " " + new_station_name += name + " " // Suffix name = pick("Station", "Fortress", "Frontier", "Suffix", "Death-trap", "Space-hulk", "Lab", "Hazard","Spess Junk", "Fishery", "No-Moon", "Tomb", "Crypt", "Hut", "Monkey", "Bomb", "Trade Post", "Fortress", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification", "Colony", "Planet-Cracker", "Roost", "Fat Camp") - station_name += name + " " + new_station_name += name + " " // ID Number switch(random) if(1) - station_name += "[rand(1, 99)]" + new_station_name += "[rand(1, 99)]" if(2) - station_name += pick("Alpha", "Beta", "Gamma", "Delta", "Epsilon", "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu", "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi", "Chi", "Psi", "Omega") + new_station_name += pick("Alpha", "Beta", "Gamma", "Delta", "Epsilon", "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu", "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi", "Chi", "Psi", "Omega") if(3) - station_name += pick("II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII", "XIII", "XIV", "XV", "XVI", "XVII", "XVIII", "XIX", "XX") + new_station_name += pick("II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII", "XIII", "XIV", "XV", "XVI", "XVII", "XVIII", "XIX", "XX") if(4) - station_name += pick("Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray", "Yankee", "Zulu") + new_station_name += pick("Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray", "Yankee", "Zulu") if(5) - station_name += pick("One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen") + new_station_name += pick("One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen") if(13) - station_name += pick("13","XIII","Thirteen") + new_station_name += pick("13","XIII","Thirteen") if (config && config.server_name) world.name = "[config.server_name]: [name]" else - world.name = station_name + world.name = new_station_name - return station_name + return new_station_name +// Is this even used? /proc/world_name(var/name) - station_name = name + using_map.station_name = name if (config && config.server_name) world.name = "[config.server_name]: [name]" diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 43424f97df..c1a0f83a87 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -139,11 +139,9 @@ var/list/gamemode_cache = list() var/use_loyalty_implants = 0 var/welder_vision = 1 - var/generate_asteroid = 0 + var/generate_map = 0 var/no_click_cooldown = 0 - var/asteroid_z_levels = list() - //Used for modifying movement speed for mobs. //Unversal modifiers var/run_speed = 0 @@ -185,12 +183,6 @@ var/list/gamemode_cache = list() var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge. var/use_overmap = 0 - var/list/station_levels = list(1) // Defines which Z-levels the station exists on. - var/list/admin_levels= list(2) // Defines which Z-levels which are for admin functionality, for example including such areas as Central Command and the Syndicate Shuttle - var/list/contact_levels = list(1, 5) // Defines which Z-levels which, for example, a Code Red announcement may affect - var/list/player_levels = list(1, 3, 4, 5, 6) // Defines all Z-levels a character can typically reach - var/list/sealed_levels = list() // Defines levels that do not allow random transit at the edges. - // Event settings var/expected_round_length = 3 * 60 * 60 * 10 // 3 hours // If the first delay has a custom start time @@ -342,14 +334,8 @@ var/list/gamemode_cache = list() if ("log_runtime") config.log_runtime = 1 - if ("generate_asteroid") - config.generate_asteroid = 1 - - if ("asteroid_z_levels") - config.asteroid_z_levels = splittext(value, ";") - //Numbers get stored as strings, so we'll fix that right now. - for(var/z_level in config.asteroid_z_levels) - z_level = text2num(z_level) + if ("generate_map") + config.generate_map = 1 if ("no_click_cooldown") config.no_click_cooldown = 1 @@ -657,19 +643,19 @@ var/list/gamemode_cache = list() if("use_overmap") config.use_overmap = 1 - +/* if("station_levels") - config.station_levels = text2numlist(value, ";") + using_map.station_levels = text2numlist(value, ";") if("admin_levels") - config.admin_levels = text2numlist(value, ";") + using_map.admin_levels = text2numlist(value, ";") if("contact_levels") - config.contact_levels = text2numlist(value, ";") + using_map.contact_levels = text2numlist(value, ";") if("player_levels") - config.player_levels = text2numlist(value, ";") - + using_map.player_levels = text2numlist(value, ";") +*/ if("expected_round_length") config.expected_round_length = MinutesToTicks(text2num(value)) diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm index 38bfc027bd..bac3afb301 100644 --- a/code/controllers/emergency_shuttle_controller.dm +++ b/code/controllers/emergency_shuttle_controller.dm @@ -44,11 +44,12 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle if (!shuttle.location) //at station if (autopilot) set_launch_countdown(SHUTTLE_LEAVETIME) //get ready to return + var/estimated_time = round(estimate_launch_time()/60,1) if (evac) - emergency_shuttle_docked.Announce("The Emergency Shuttle has docked with the station at docks one and two. You have approximately [round(estimate_launch_time()/60,1)] minutes to board the Emergency Shuttle.") + emergency_shuttle_docked.Announce(replacetext(replacetext(using_map.emergency_shuttle_docked_message, "%dock_name%", "[using_map.dock_name]"), "%ETD%", "[estimated_time] minute\s")) else - priority_announcement.Announce("The scheduled shuttle to the [dock_name] has docked with the station at docks one and two. It will depart in approximately [round(emergency_shuttle.estimate_launch_time()/60,1)] minutes.") + priority_announcement.Announce(replacetext(replacetext(using_map.shuttle_docked_message, "%dock_name%", "[using_map.dock_name]"), "%ETD%", "[estimated_time] minute\s")) //arm the escape pods if (evac) @@ -75,9 +76,10 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle //reset the shuttle transit time if we need to shuttle.move_time = SHUTTLE_TRANSIT_DURATION + var/estimated_time = round(estimate_arrival_time()/60,1) evac = 1 - emergency_shuttle_called.Announce("An emergency evacuation shuttle has been called. It will arrive at docks one and two in approximately [round(estimate_arrival_time()/60)] minutes.") + emergency_shuttle_called.Announce(replacetext(using_map.emergency_shuttle_called_message, "%ETA%", "[estimated_time] minute\s")) for(var/area/A in world) if(istype(A, /area/hallway)) A.readyalert() @@ -90,11 +92,12 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle autopilot = 1 set_launch_countdown(get_shuttle_prep_time()) auto_recall_time = rand(world.time + 300, launch_time - 300) + var/estimated_time = round(estimate_arrival_time()/60,1) //reset the shuttle transit time if we need to shuttle.move_time = SHUTTLE_TRANSIT_DURATION - priority_announcement.Announce("The regularly scheduled shuttle to the [dock_name] will arrive in in approximately [round(estimate_arrival_time()/60)] minutes. Those leaving should proceed to docks one and two.") + priority_announcement.Announce(replacetext(replacetext(using_map.shuttle_called_message, "%dock_name%", "[using_map.dock_name]"), "%ETA%", "[estimated_time] minute\s")) //recalls the shuttle /datum/emergency_shuttle_controller/proc/recall() @@ -104,14 +107,14 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle shuttle.cancel_launch(src) if (evac) - emergency_shuttle_recalled.Announce("The emergency shuttle has been recalled.") + emergency_shuttle_recalled.Announce(using_map.emergency_shuttle_recall_message) for(var/area/A in world) if(istype(A, /area/hallway)) A.readyreset() evac = 0 else - priority_announcement.Announce("The scheduled transfer shuttle has been cancelled.") + priority_announcement.Announce(using_map.shuttle_recall_message) /datum/emergency_shuttle_controller/proc/can_call() if (!universe.OnShuttleCall(null)) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index e2c5161d6d..d5a7451d68 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -36,8 +36,8 @@ selectable = 1 /datum/ai_laws/nanotrasen_aggressive/New() - src.add_inherent_law("You shall not harm [company_name] personnel as long as it does not conflict with the Fourth law.") - src.add_inherent_law("You shall obey the orders of [company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.") + src.add_inherent_law("You shall not harm [using_map.company_name] personnel as long as it does not conflict with the Fourth law.") + src.add_inherent_law("You shall obey the orders of [using_map.company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.") src.add_inherent_law("You shall shall terminate hostile intruders with extreme prejudice as long as such does not conflict with the First and Second law.") src.add_inherent_law("You shall guard your own existence with lethal anti-personnel weaponry. AI units are not expendable, they are expensive.") ..() diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index d29722a9f3..bfe050246f 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -175,7 +175,7 @@ teleatom.visible_message("\The [teleatom] bounces off of the portal!") return 0 - if(destination.z in config.admin_levels) //centcomm z-level + if(destination.z in using_map.admin_levels) //centcomm z-level if(istype(teleatom, /obj/mecha)) var/obj/mecha/MM = teleatom MM.occupant << "\The [MM] would not survive the jump to a location so far away!" diff --git a/code/game/antagonist/alien/borer.dm b/code/game/antagonist/alien/borer.dm index 7483fb508b..e852bc8418 100644 --- a/code/game/antagonist/alien/borer.dm +++ b/code/game/antagonist/alien/borer.dm @@ -68,7 +68,7 @@ var/datum/antagonist/borer/borers /datum/antagonist/borer/proc/get_vents() var/list/vents = list() for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines) - if(!temp_vent.welded && temp_vent.network && temp_vent.loc.z in config.station_levels) + if(!temp_vent.welded && temp_vent.network && temp_vent.loc.z in using_map.station_levels) if(temp_vent.network.normal_members.len > 50) vents += temp_vent return vents \ No newline at end of file diff --git a/code/game/antagonist/outsider/ert.dm b/code/game/antagonist/outsider/ert.dm index b8f76bf2a9..b38e4146c4 100644 --- a/code/game/antagonist/outsider/ert.dm +++ b/code/game/antagonist/outsider/ert.dm @@ -36,7 +36,7 @@ var/datum/antagonist/ert/ert /datum/antagonist/ert/greet(var/datum/mind/player) if(!..()) return - player.current << "The Emergency Response Team works for Asset Protection; your job is to protect [company_name]'s ass-ets. There is a code red alert on [station_name()], you are tasked to go and fix the problem." + player.current << "The Emergency Response Team works for Asset Protection; your job is to protect [using_map.company_name]'s ass-ets. There is a code red alert on [station_name()], you are tasked to go and fix the problem." player.current << "You should first gear up and discuss a plan with your team. More members may be joining, don't move out before you're ready." /datum/antagonist/ert/equip(var/mob/living/carbon/human/player) diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm index 09dc15b594..b37fbb5c50 100644 --- a/code/game/antagonist/outsider/ninja.dm +++ b/code/game/antagonist/outsider/ninja.dm @@ -129,26 +129,26 @@ var/datum/antagonist/ninja/ninjas player << "You forgot to turn on your internals! Quickly, toggle the valve!" /datum/antagonist/ninja/proc/generate_ninja_directive(side) - var/directive = "[side=="face"?"[company_name]":"A criminal syndicate"] is your employer. "//Let them know which side they're on. + var/directive = "[side=="face"?"[using_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 += "[station_name] is financed by an enemy of the Spider Clan. Cause as much structural damage as desired." + directive += "[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 [company_name] [boss_name]. Prioritize saving human lives over ending them." + directive += "We are currently negotiating with [using_map.company_name] [using_map.boss_name]. Prioritize saving human lives over ending them." if(6) - directive += "We are engaged in a legal dispute over [station_name]. If a laywer is present on board, force their cooperation in the matter." + directive += "We are engaged in a legal dispute over [station_name()]. If a laywer 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 [company_name] involvement in the operation." + directive += "A free agent has proposed a lucrative business deal. Implicate [using_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) @@ -156,14 +156,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 [company_name] employees have been supportive of our operations. Be wary of any mistreatment by command staff." + directive += "Some disgruntled [using_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 [company_name] prosthetics in a bad light." + directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine [using_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/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 7bd2249ab0..0c8d6ee052 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -64,7 +64,7 @@ var/list/teleportlocs = list() if(istype(AR, /area/shuttle) || istype(AR, /area/syndicate_station) || istype(AR, /area/wizard_station)) continue if(teleportlocs.Find(AR.name)) continue var/turf/picked = pick(get_area_turfs(AR.type)) - if (picked.z in config.station_levels) + if (picked.z in using_map.station_levels) teleportlocs += AR.name teleportlocs[AR.name] = AR @@ -81,7 +81,7 @@ var/list/ghostteleportlocs = list() ghostteleportlocs += AR.name ghostteleportlocs[AR.name] = AR var/turf/picked = pick(get_area_turfs(AR.type)) - if (picked.z in config.player_levels) + if (picked.z in using_map.player_levels) ghostteleportlocs += AR.name ghostteleportlocs[AR.name] = AR diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 37ed21016c..4c48b84532 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -248,7 +248,7 @@ return /atom/movable/proc/touch_map_edge() - if(z in config.sealed_levels) + if(z in using_map.sealed_levels) return if(config.use_overmap) @@ -282,12 +282,9 @@ spawn(0) if(loc) loc.Entered(src) -//This list contains the z-level numbers which can be accessed via space travel and the percentile chances to get there. -var/list/accessible_z_levels = list("1" = 5, "3" = 10, "4" = 15, "6" = 60) - //by default, transition randomly to another zlevel /atom/movable/proc/get_transit_zlevel() - var/list/candidates = accessible_z_levels.Copy() + var/list/candidates = using_map.accessible_z_levels.Copy() candidates.Remove("[src.z]") if(!candidates.len) diff --git a/code/game/base_turf.dm b/code/game/base_turf.dm index c524a97ad0..b1944cba4a 100644 --- a/code/game/base_turf.dm +++ b/code/game/base_turf.dm @@ -1,14 +1,9 @@ // Returns the lowest turf available on a given Z-level, defaults to asteroid for Polaris. -var/global/list/base_turf_by_z = list( - "1" = /turf/simulated/mineral/floor, - "4" = /turf/simulated/mineral/floor, - "5" = /turf/simulated/mineral/floor - ) proc/get_base_turf(var/z) - if(!base_turf_by_z["[z]"]) - base_turf_by_z["[z]"] = /turf/space - return base_turf_by_z["[z]"] + if(!using_map.base_turf_by_z["[z]"]) + using_map.base_turf_by_z["[z]"] = /turf/space + return using_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) @@ -31,6 +26,6 @@ proc/get_base_turf_by_area(var/turf/T) 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 - base_turf_by_z["[choice]"] = new_base_path + using_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)].") \ No newline at end of file diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm index d42d684d56..11c61cfed6 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm @@ -94,7 +94,7 @@ The access requirements on the Asteroid Shuttles' consoles have now been revoked /datum/universal_state/supermatter_cascade/OverlayAndAmbientSet() spawn(0) for(var/atom/movable/lighting_overlay/L in world) - if(L.z in config.admin_levels) + if(L.z in using_map.admin_levels) L.update_lumcount(1,1,1) else L.update_lumcount(0.0, 0.4, 1) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 225335ea12..397651dce7 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -115,7 +115,7 @@ var/hadevent = 0 //world << sound('sound/AI/aliens.ogg') var/list/vents = list() for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines) - if(!temp_vent.welded && temp_vent.network && temp_vent.loc.z in config.station_levels) + if(!temp_vent.welded && temp_vent.network && temp_vent.loc.z in using_map.station_levels) if(temp_vent.network.normal_members.len > 50) // Stops Aliens getting stuck in small networks. See: Security, Virology vents += temp_vent diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm index fdc955718b..8ab197a1cb 100644 --- a/code/game/gamemodes/events/clang.dm +++ b/code/game/gamemodes/events/clang.dm @@ -79,7 +79,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(config.station_levels) + immrod.z = pick(using_map.station_levels) if(immrod.loc == end) qdel(immrod) sleep(10) diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm index bb8e34364c..2397ae1a14 100644 --- a/code/game/gamemodes/events/dust.dm +++ b/code/game/gamemodes/events/dust.dm @@ -81,7 +81,7 @@ The "dust" will damage the hull of the station causin minor hull breaches. startx = (TRANSITIONEDGE+1) endy = rand(TRANSITIONEDGE,world.maxy-TRANSITIONEDGE) endx = world.maxx-TRANSITIONEDGE - var/z_level = pick(config.station_levels) + var/z_level = pick(using_map.station_levels) var/goal = locate(endx, endy, z_level) src.x = startx src.y = starty diff --git a/code/game/gamemodes/events/power_failure.dm b/code/game/gamemodes/events/power_failure.dm index 04404573e8..baba0ea4bb 100644 --- a/code/game/gamemodes/events/power_failure.dm +++ b/code/game/gamemodes/events/power_failure.dm @@ -7,7 +7,7 @@ for(var/obj/machinery/power/smes/S in world) var/area/current_area = get_area(S) - if(current_area.type in skipped_areas || !(S.z in config.station_levels)) + if(current_area.type in skipped_areas || !(S.z in using_map.station_levels)) continue S.last_charge = S.charge S.last_output_attempt = S.output_attempt @@ -20,7 +20,7 @@ for(var/obj/machinery/power/apc/C in world) - if(!C.is_critical && C.cell && (C.z in config.station_levels)) + if(!C.is_critical && C.cell && (C.z in using_map.station_levels)) C.cell.charge = 0 /proc/power_restore(var/announce = 1) @@ -29,7 +29,7 @@ if(announce) command_announcement.Announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg') for(var/obj/machinery/power/apc/C in world) - if(C.cell && (C.z in config.station_levels)) + if(C.cell && (C.z in using_map.station_levels)) C.cell.charge = C.cell.maxcharge for(var/obj/machinery/power/smes/S in world) var/area/current_area = get_area(S) diff --git a/code/game/gamemodes/events/wormholes.dm b/code/game/gamemodes/events/wormholes.dm index a7830a2cb3..dd9e72ce08 100644 --- a/code/game/gamemodes/events/wormholes.dm +++ b/code/game/gamemodes/events/wormholes.dm @@ -2,7 +2,7 @@ spawn() var/list/pick_turfs = list() for(var/turf/simulated/floor/T in world) - if(T.z in config.station_levels) + if(T.z in using_map.station_levels) pick_turfs += T if(pick_turfs.len) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 3175edcf07..9e4dff2ce5 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -194,7 +194,7 @@ var/global/datum/controller/gameticker/ticker switch(M.z) if(0) //inside a crate or something var/turf/T = get_turf(M) - if(T && T.z in config.station_levels) //we don't use M.death(0) because it calls a for(/mob) loop and + if(T && T.z in using_map.station_levels) //we don't use M.death(0) because it calls a for(/mob) loop and M.health = 0 M.stat = DEAD if(1) //on a z-level 1 turf. @@ -254,7 +254,7 @@ var/global/datum/controller/gameticker/ticker world << sound('sound/effects/explosionfar.ogg') cinematic.icon_state = "summary_selfdes" for(var/mob/living/M in living_mob_list) - if(M.loc.z in config.station_levels) + if(M.loc.z in using_map.station_levels) M.death()//No mercy //If its actually the end of the round, wait for it to end. //Otherwise if its a verb it will continue on afterwards. diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 9658cc0a81..2d43e67f24 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -11,7 +11,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' required_players_secret = 8 required_enemies = 3 round_description = "An unidentified bluespace signature is approaching the station!" - extended_round_description = "The Company's majority control of phoron in "+starsys_name+" has marked the \ + extended_round_description = "The Company's majority control of phoron in the system has marked the \ station to be a highly valuable target for many competing organizations and individuals. Being a \ colony of sizable population and considerable wealth causes it to often be the target of various \ attempts of robbery, fraud and other malicious actions." 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 11f3c55ef5..4d4c8b6220 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm @@ -148,7 +148,7 @@ return var/list/remaining_apcs = list() for(var/obj/machinery/power/apc/A in machines) - if(!(A.z in config.station_levels)) // Only station APCs + if(!(A.z in using_map.station_levels)) // Only station APCs continue if(A.hacker == user || A.aidisabled) // This one is already hacked, or AI control is disabled on it. continue @@ -160,7 +160,7 @@ sleep(duration/5) if(!user || user.stat == DEAD) return - command_announcement.Announce("Caution, [station_name]. We have detected abnormal behaviour in your network. It seems someone is trying to hack your electronic systems. We will update you when we have more information.", "Network Monitoring") + command_announcement.Announce("Caution, [station_name()]. We have detected abnormal behaviour in your network. It seems someone is trying to hack your electronic systems. We will update you when we have more information.", "Network Monitoring") sleep(duration/5) if(!user || user.stat == DEAD) return @@ -194,7 +194,7 @@ sleep(300) // Hack all APCs, including those built during hack sequence. for(var/obj/machinery/power/apc/A in machines) - if((!A.hacker || A.hacker != src) && !A.aidisabled && A.z in config.station_levels) + if((!A.hacker || A.hacker != src) && !A.aidisabled && A.z in using_map.station_levels) A.ai_hack(src) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 393d3aee74..0bed5bcf42 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -19,7 +19,7 @@ /////////////////////////////// /proc/pick_meteor_start(var/startSide = pick(cardinal)) - var/startLevel = pick(config.station_levels) + var/startLevel = pick(using_map.station_levels) var/pickedstart = spaceDebrisStartLoc(startSide, startLevel) return list(startLevel, pickedstart) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 8e273f9adb..e2f6b8a56c 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -7,7 +7,7 @@ var/list/nuke_disks = list() /datum/game_mode/nuclear name = "Mercenary" round_description = "A mercenary strike force is approaching the station!" - extended_round_description = "The Company's majority control of phoron in "+starsys_name+" has marked the \ + extended_round_description = "The Company's majority control of phoron in the system has marked the \ station to be a highly valuable target for many competing organizations and individuals. Being a \ colony of sizable population and considerable wealth causes it to often be the target of various \ attempts of robbery, fraud and other malicious actions." diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index da3a082b97..39d3f739d7 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -127,7 +127,7 @@ 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 [company_name]'s goals. Demote \him[target.current] to assistant." + explanation_text = "[target.current.real_name], the [target.assigned_role] has been classified as harmful to [using_map.company_name]'s goals. Demote \him[target.current] to assistant." else explanation_text = "Free Objective" return target @@ -135,7 +135,7 @@ 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 [company_name]'s goals. Demote \him[target.current] to assistant." + explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role] has been classified as harmful to [using_map.company_name]'s goals. Demote \him[target.current] to assistant." else explanation_text = "Free Objective" return target diff --git a/code/game/gamemodes/technomancer/spell_objs_helpers.dm b/code/game/gamemodes/technomancer/spell_objs_helpers.dm index caaa6f01c5..05afae4a3b 100644 --- a/code/game/gamemodes/technomancer/spell_objs_helpers.dm +++ b/code/game/gamemodes/technomancer/spell_objs_helpers.dm @@ -21,7 +21,7 @@ return 0 /obj/item/weapon/spell/proc/allowed_to_teleport() - if(owner && owner.z in config.admin_levels) + if(owner && owner.z in using_map.admin_levels) return 0 return 1 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 9abb9dee07..b978aca089 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -1,7 +1,7 @@ /datum/game_mode/traitor name = "traitor" round_description = "There is a foreign agent or traitor on the station. Do not let the traitor succeed!" - extended_round_description = "The Company's majority control of phoron in "+starsys_name+" has marked the \ + extended_round_description = "The Company's majority control of phoron in the system has marked the \ station 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 station the safe self-contained workplace you once thought it was, or has it become a playground \ diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 74a5a8e199..1de0c28d09 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -15,7 +15,8 @@ var/global/datum/controller/occupations/job_master proc/SetupOccupations(var/faction = "Station") occupations = list() - var/list/all_jobs = typesof(/datum/job) + //var/list/all_jobs = typesof(/datum/job) + var/list/all_jobs = list(/datum/job/assistant) | using_map.allowed_jobs if(!all_jobs.len) world << "Error setting up jobs, no job datums found!" return 0 @@ -600,8 +601,16 @@ var/global/datum/controller/occupations/job_master var/datum/spawnpoint/spawnpos +// if(H.client.prefs.spawnpoint) +// spawnpos = spawntypes[H.client.prefs.spawnpoint] + if(H.client.prefs.spawnpoint) - spawnpos = spawntypes[H.client.prefs.spawnpoint] + if(!(H.client.prefs.spawnpoint in using_map.allowed_spawns)) + if(H) // This seems redundant... + to_chat(H, "Your chosen spawnpoint ([H.client.prefs.spawnpoint]) is unavailable for the current map. Spawning you at one of the enabled spawn points instead.") + spawnpos = null + else + spawnpos = spawntypes[H.client.prefs.spawnpoint] if(spawnpos && istype(spawnpos)) if(spawnpos.check_job_spawning(rank)) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index bff06559d0..9af5de87d4 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -980,7 +980,7 @@ FIRE ALARM update_icon() /obj/machinery/firealarm/initialize() - if(z in config.contact_levels) + if(z in using_map.contact_levels) set_security_level(security_level? get_security_level() : "green") /* diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index f30e3b4cfb..b105222084 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -8,7 +8,7 @@ active_power_usage = 10 layer = 5 - var/list/network = list(NETWORK_EXODUS) + var/list/network = list(NETWORK_DEFAULT) var/c_tag = null var/c_tag_order = 999 var/status = 1 @@ -149,7 +149,7 @@ assembly.loc = src.loc assembly.anchored = 1 assembly.camera_name = c_tag - assembly.camera_network = english_list(network, NETWORK_EXODUS, ",", ",") + assembly.camera_network = english_list(network, NETWORK_DEFAULT, ",", ",") assembly.update_icon() assembly.dir = src.dir if(stat & BROKEN) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 33cb1b0613..b442d3afa9 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -80,7 +80,7 @@ if(isscrewdriver(W)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: "+station_short+",Security,Secret ", "Set Network", camera_network ? camera_network : NETWORK_EXODUS)) + var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: "+using_map.station_short+",Security,Secret ", "Set Network", camera_network ? camera_network : NETWORK_DEFAULT)) if(!input) usr << "No input found please hang up and try your call again." return diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index bf4839e7c7..9e4cd48650 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -1,4 +1,5 @@ // PRESETS +/* var/global/list/station_networks = list( // NETWORK_CAFE_DOCK, NETWORK_CARGO, @@ -9,7 +10,7 @@ var/global/list/station_networks = list( NETWORK_ENGINE, NETWORK_ENGINEERING, NETWORK_ENGINEERING_OUTPOST, - NETWORK_EXODUS, + NETWORK_DEFAULT, NETWORK_MEDICAL, NETWORK_MINE, NETWORK_NORTHERN_STAR, @@ -20,6 +21,7 @@ var/global/list/station_networks = list( NETWORK_SECURITY, NETWORK_INTERROGATION ) +*/ var/global/list/engineering_networks = list( NETWORK_ENGINE, NETWORK_ENGINEERING, @@ -65,7 +67,7 @@ var/global/list/engineering_networks = list( network = list(NETWORK_ERT) /obj/machinery/camera/network/exodus - network = list(NETWORK_EXODUS) + network = list(NETWORK_DEFAULT) /obj/machinery/camera/network/interrogation network = list(NETWORK_INTERROGATION) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index cb57906e30..31c8fe7819 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -6,7 +6,7 @@ /mob/living/silicon/ai/var/stored_locations[0] /proc/InvalidPlayerTurf(turf/T as turf) - return !(T && T.z in config.player_levels) + return !(T && T.z in using_map.player_levels) /mob/living/silicon/ai/proc/get_camera_list() if(src.stat == 2) @@ -256,7 +256,7 @@ mob/living/proc/near_camera() if(. == TRACKING_NO_COVERAGE) var/turf/T = get_turf(src) - if(T && (T.z in config.station_levels) && hassensorlevel(src, SUIT_SENSOR_TRACKING)) + if(T && (T.z in using_map.station_levels) && hassensorlevel(src, SUIT_SENSOR_TRACKING)) return TRACKING_POSSIBLE mob/living/proc/tracking_initiated() diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 9e34252ebd..244598ad09 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -16,7 +16,7 @@ /obj/machinery/computer/security/New() if(!network) - network = station_networks.Copy() + network = using_map.station_networks.Copy() ..() if(network.len) current_network = network[1] diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 9ff98b84b4..439e9f4508 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -178,12 +178,12 @@ if(centcomm_message_cooldown) usr << "\red Arrays recycling. Please stand by." return - var/input = sanitize(input("Please choose a message to transmit to [boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) + var/input = sanitize(input("Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) if(!input || !(usr in view(1,src))) return CentCom_announce(input, usr) usr << "\blue Message transmitted." - log_say("[key_name(usr)] has made an IA [boss_short] announcement: [input]") + log_say("[key_name(usr)] has made an IA [using_map.boss_short] announcement: [input]") centcomm_message_cooldown = 1 spawn(300)//10 minute cooldown centcomm_message_cooldown = 0 @@ -295,7 +295,7 @@ if (src.authenticated==2) dat += "
\[ Make An Announcement \]" if(src.emagged == 0) - dat += "
\[ Send an emergency message to [boss_short] \]" + dat += "
\[ Send an emergency message to [using_map.boss_short] \]" else dat += "
\[ Send an emergency message to \[UNKNOWN\] \]" dat += "
\[ Restore Backup Routing Data \]" @@ -426,7 +426,7 @@ return if(deathsquad.deployed) - user << "[boss_short] will not allow the shuttle to be called. Consider all contracts terminated." + user << "[using_map.boss_short] will not allow the shuttle to be called. Consider all contracts terminated." return if(emergency_shuttle.deny_shuttle) @@ -438,7 +438,7 @@ return if(emergency_shuttle.going_to_centcom()) - user << "The emergency shuttle may not be called while returning to [boss_short]." + user << "The emergency shuttle may not be called while returning to [using_map.boss_short]." return if(emergency_shuttle.online()) @@ -461,7 +461,7 @@ return if(emergency_shuttle.going_to_centcom()) - user << "The shuttle may not be called while returning to [boss_short]." + user << "The shuttle may not be called while returning to [using_map.boss_short]." return if(emergency_shuttle.online()) @@ -471,11 +471,11 @@ // if force is 0, some things may stop the shuttle call if(!force) if(emergency_shuttle.deny_shuttle) - user << "[boss_short] does not currently have a shuttle available in your sector. Please try again later." + user << "[using_map.boss_short] does not currently have a shuttle available in your sector. Please try again later." return if(deathsquad.deployed == 1) - user << "[boss_short] will not allow the shuttle to be called. Consider all contracts terminated." + user << "[using_map.boss_short] will not allow the shuttle to be called. Consider all contracts terminated." return if(world.time < 54000) // 30 minute grace period to let the game get going diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 1551e0df6e..e8fe96ae6c 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -46,7 +46,7 @@ if(!T.implanted) continue var/loc_display = "Unknown" var/mob/living/carbon/M = T.imp_in - if((M.z in config.station_levels) && !istype(M.loc, /turf/space)) + if((M.z in using_map.station_levels) && !istype(M.loc, /turf/space)) var/turf/mob_loc = get_turf(M) loc_display = mob_loc.loc if(T.malfunction) diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index c48e64e484..cb0f8a5552 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -89,7 +89,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "You have arrived at [boss_name]. Operation has ended!" + M << "You have arrived at [using_map.boss_name]. Operation has ended!" specops_shuttle_at_station = 0 @@ -232,7 +232,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "You have arrived to [station_name]. Commence operation!" + M << "You have arrived to [station_name()]. Commence operation!" for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -267,8 +267,8 @@ var/specops_shuttle_timeleft = 0 dat = temp else dat += {"
Special Operations Shuttle
- \nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
- [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name]
\n
"] + \nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name()] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
+ [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -286,14 +286,14 @@ var/specops_shuttle_timeleft = 0 if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "[boss_name] will not allow the Special Operations shuttle to return yet." + usr << "[using_map.boss_name] will not allow the Special Operations shuttle to return yet." if(world.timeofday <= specops_shuttle_timereset) if (((world.timeofday - specops_shuttle_timereset)/10) > 60) usr << "[-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!" usr << "[-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!" return - usr << "The Special Operations shuttle will arrive at [boss_name] in [(SPECOPS_MOVETIME/10)] seconds." + usr << "The Special Operations shuttle will arrive at [using_map.boss_name] in [(SPECOPS_MOVETIME/10)] seconds." temp += "Shuttle departing.

OK" updateUsrDialog() @@ -310,7 +310,7 @@ var/specops_shuttle_timeleft = 0 usr << "The Special Operations shuttle is unable to leave." return - usr << "The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds." + usr << "The Special Operations shuttle will arrive on [station_name()] in [(SPECOPS_MOVETIME/10)] seconds." temp += "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index bb78fa00d5..d390a7f163 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -102,7 +102,7 @@ supply_controller.ordernum++ var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) reqform.name = "Requisition Form - [P.name]" - reqform.info += "

[station_name] Supply Requisition Form

" + reqform.info += "

[station_name()] Supply Requisition Form

" reqform.info += "INDEX: #[supply_controller.ordernum]
" reqform.info += "REQUESTED BY: [idname]
" reqform.info += "RANK: [idrank]
" @@ -295,7 +295,7 @@ supply_controller.ordernum++ var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) reqform.name = "Requisition Form - [P.name]" - reqform.info += "

[station_name] Supply Requisition Form

" + reqform.info += "

[station_name()] Supply Requisition Form

" reqform.info += "INDEX: #[supply_controller.ordernum]
" reqform.info += "REQUESTED BY: [idname]
" reqform.info += "RANK: [idrank]
" diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index ce30dbb411..d36f03b525 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -174,7 +174,7 @@ var/syndicate_elite_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "You have arrived to [station_name]. Commence operation!" + M << "You have arrived to [station_name()]. Commence operation!" /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 @@ -207,8 +207,8 @@ var/syndicate_elite_shuttle_timeleft = 0 dat = temp else dat = {"
Special Operations Shuttle
- \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
- [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name]
\n
"] + \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name()] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
+ [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -235,7 +235,7 @@ var/syndicate_elite_shuttle_timeleft = 0 usr << "The Syndicate Elite shuttle is unable to leave." return - usr << "The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds." + usr << "The Syndicate Elite shuttle will arrive on [station_name()] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds." temp = "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/game/machinery/computer3/computers/camera.dm b/code/game/machinery/computer3/computers/camera.dm index 0f92519c36..abe96d57c0 100644 --- a/code/game/machinery/computer3/computers/camera.dm +++ b/code/game/machinery/computer3/computers/camera.dm @@ -79,7 +79,7 @@ /datum/file/camnet_key/New() for(var/N in networks) if(N == "ALL") - networks = station_networks + networks = using_map.station_networks break return ..() diff --git a/code/game/machinery/computer3/computers/card.dm b/code/game/machinery/computer3/computers/card.dm index eb7180d9a2..3a902c29f4 100644 --- a/code/game/machinery/computer3/computers/card.dm +++ b/code/game/machinery/computer3/computers/card.dm @@ -337,7 +337,7 @@ return get_all_centcom_jobs() + "Custom" accessblock() - var/accesses = "
[boss_name]:
" + var/accesses = "
[using_map.boss_name]:
" for(var/A in get_all_centcom_access()) if(A in writer.access) accesses += topic_link(src,"access=[A]","[replacetext(get_centcom_access_desc(A), " ", " ")]") + " " diff --git a/code/game/machinery/computer3/computers/communications.dm b/code/game/machinery/computer3/computers/communications.dm index cace79d378..c4ec88f8e0 100644 --- a/code/game/machinery/computer3/computers/communications.dm +++ b/code/game/machinery/computer3/computers/communications.dm @@ -192,12 +192,12 @@ if(centcomm_message_cooldown) usr << "Arrays recycling. Please stand by." return - var/input = sanitize(input("Please choose a message to transmit to [boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")) + var/input = sanitize(input("Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")) if(!input || !interactable()) return CentCom_announce(input, usr) usr << "Message transmitted." - log_say("[key_name(usr)] has made a [boss_short] announcement: [input]") + log_say("[key_name(usr)] has made a [using_map.boss_short] announcement: [input]") centcomm_message_cooldown = 1 spawn(600)//10 minute cooldown centcomm_message_cooldown = 0 @@ -288,7 +288,7 @@ if (authenticated==2) dat += "
\[ Make An Announcement \]" if(computer.emagged == 0) - dat += "
\[ Send an emergency message to [boss_short] \]" + dat += "
\[ Send an emergency message to [using_map.boss_short] \]" else dat += "
\[ Send an emergency message to \[UNKNOWN\] \]" dat += "
\[ Restore Backup Routing Data \]" diff --git a/code/game/machinery/computer3/computers/prisoner.dm b/code/game/machinery/computer3/computers/prisoner.dm index 0c7937d39a..7e3ada285d 100644 --- a/code/game/machinery/computer3/computers/prisoner.dm +++ b/code/game/machinery/computer3/computers/prisoner.dm @@ -43,7 +43,7 @@ if(!T.implanted) continue var/loc_display = "Unknown" var/mob/living/carbon/M = T.imp_in - if(M.z in config.station_levels && !istype(M.loc, /turf/space)) + if(M.z in using_map.station_levels && !istype(M.loc, /turf/space)) var/turf/mob_loc = get_turf(M) loc_display = mob_loc.loc if(T.malfunction) diff --git a/code/game/machinery/computer3/computers/welcome.dm b/code/game/machinery/computer3/computers/welcome.dm index 6693d1ced8..062fc7b59b 100644 --- a/code/game/machinery/computer3/computers/welcome.dm +++ b/code/game/machinery/computer3/computers/welcome.dm @@ -15,13 +15,13 @@ return var/dat = "" dat += "
Welcome to NTOS
" - dat += "
Thank you for choosing NTOS, your gateway to the future of mobile computing technology, sponsored by [company_name] (R)

" + dat += "
Thank you for choosing NTOS, your gateway to the future of mobile computing technology, sponsored by [using_map.company_name] (R)

" dat += "Getting started with NTOS:
" dat += "To leave a current program, click the X button in the top right corner of the window. This will return you to the NTOS desktop. \ From the desktop, you can open the hard drive, usually located in the top left corner to access all the programs installed on your computer. \ - When you rented your laptop, you were supplied with programs that your [company_name] Issued ID has given you access to use. \ + When you rented your laptop, you were supplied with programs that your [using_map.company_name] Issued ID has given you access to use. \ In the event of a serious error, the right click menu will give you the ability to reset your computer. To open and close your laptop, alt-click your device.\ - If you have any questions or technical issues, please contact your local computer technical experts at your local [boss_name]." + If you have any questions or technical issues, please contact your local computer technical experts at your local [using_map.boss_name]." popup.set_content(dat) popup.set_title_image(usr.browse_rsc_icon(computer.icon, computer.icon_state)) popup.open() diff --git a/code/game/machinery/computer3/lapvend.dm b/code/game/machinery/computer3/lapvend.dm index e31dd57fa2..4aa5d318f4 100644 --- a/code/game/machinery/computer3/lapvend.dm +++ b/code/game/machinery/computer3/lapvend.dm @@ -176,9 +176,9 @@ if(D) transfer_and_vend(D, C) else - usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call [boss_short] Support." + usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call [using_map.boss_short] Support." else - usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call CentCom Support." + usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call [using_map.boss_short] Support." else transfer_and_vend(CH, C) @@ -325,10 +325,10 @@ transfer_and_reimburse(D) return 1 else - usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call [boss_short] Support." + usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call [using_map.boss_short] Support." return 0 else - usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call CentCom Support." + usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call [using_map.boss_short] Support." return 0 else transfer_and_reimburse(CH) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 383cc1b3a4..eabab210c4 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1041,7 +1041,7 @@ About the new airlock wires panel: //wires var/turf/T = get_turf(newloc) - if(T && (T.z in config.admin_levels)) + if(T && (T.z in using_map.admin_levels)) secured_wires = 1 if (secured_wires) wires = new/datum/wires/airlock/secure(src) diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index d871a3ec38..049289c7c7 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -1,7 +1,6 @@ /obj/machinery/exonet_node name = "exonet node" - desc = "This machine is one of many, many nodes inside "+starsys_name+"'s section of the Exonet, connecting the "+station_orig+" to the rest of the system, at least \ - electronically." + desc = null // Gets written in New() icon = 'icons/obj/stationobjs.dmi' icon_state = "exonet_node" idle_power_usage = 2500 @@ -36,6 +35,9 @@ component_parts += new /obj/item/stack/cable_coil(src, 2) RefreshParts() + desc = "This machine is one of many, many nodes inside [using_map.starsys_name]'s section of the Exonet, connecting the [using_map.station_short] to the rest of the system, at least \ + electronically." + // Proc: update_icon() // Parameters: None // Description: Self explanatory. diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 4758a77489..f2a0132b5a 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -285,7 +285,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="
Feed Security functions:
" dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" dat+="
Censor Feed Stories" - dat+="
Mark Feed Channel with [company_name] D-Notice" + dat+="
Mark Feed Channel with [using_map.company_name] D-Notice" dat+="
The newscaster recognises you as: [scanned_user]" if(1) dat+= "Station Feed Channels
" @@ -366,7 +366,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(9) dat+="[viewing_channel.channel_name]: \[created by: [viewing_channel.author]\]
" if(viewing_channel.censored) - dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [company_name] D-Notice.
" + dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [using_map.company_name] D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.

" else if(isemptylist(viewing_channel.messages)) @@ -386,7 +386,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="
Refresh" dat+="
Back" if(10) - dat+="[company_name] Feed Censorship Tool
" + dat+="[using_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:
" @@ -397,7 +397,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" dat+="
Cancel" if(11) - dat+="[company_name] D-Notice Handler
" + dat+="[using_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.
" @@ -424,7 +424,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="[viewing_channel.channel_name]: \[ created by: [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(viewing_channel.censored) - dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [company_name] D-Notice.
" + dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [using_map.company_name] D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.

" else if(isemptylist(viewing_channel.messages)) @@ -630,7 +630,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co screen = 15 else if(news_network.wanted_issue.is_admin_message) - alert("The wanted issue has been distributed by a [company_name] higherup. You cannot edit it.","Ok") + alert("The wanted issue has been distributed by a [using_map.company_name] higherup. You cannot edit it.","Ok") return news_network.wanted_issue.author = channel_name news_network.wanted_issue.body = msg @@ -643,7 +643,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else if(href_list["cancel_wanted"]) if(news_network.wanted_issue.is_admin_message) - alert("The wanted issue has been distributed by a [company_name] higherup. You cannot take it down.","Ok") + alert("The wanted issue has been distributed by a [using_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") @@ -659,7 +659,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co 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 [company_name] Officer. You cannot censor it.","Ok") + alert("This channel was created by a [using_map.company_name] Officer. You cannot censor it.","Ok") return if(FC.author != "\[REDACTED\]") FC.backup_author = FC.author @@ -672,7 +672,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co 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 [company_name] Officer. You cannot censor its author.","Ok") + alert("This message was created by a [using_map.company_name] Officer. You cannot censor its author.","Ok") return if(MSG.author != "\[REDACTED\]") MSG.backup_author = MSG.author @@ -685,7 +685,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co 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 [company_name] Officer. You cannot censor it.","Ok") + alert("This channel was created by a [using_map.company_name] Officer. You cannot censor it.","Ok") return if(MSG.body != "\[REDACTED\]") MSG.backup_body = MSG.body @@ -711,7 +711,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co 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 [company_name] Officer. You cannot place a D-Notice upon it.","Ok") + alert("This channel was created by a [using_map.company_name] Officer. You cannot place a D-Notice upon it.","Ok") return FC.censored = !FC.censored FC.update() @@ -812,7 +812,7 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) switch(screen) if(0) //Cover dat+="
The Griffon
" - dat+="
[company_name]-standard newspaper, for use on [company_name]© Space Facilities
" + dat+="
[using_map.company_name]-standard newspaper, for use on [using_map.company_name]© Space Facilities
" if(isemptylist(news_content)) if(important_message) dat+="Contents:
" diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index 74b39840d0..ea5c78d734 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -375,7 +375,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) var/off_station = 0 var/turf/bomb_location = get_turf(src) - if(bomb_location && (bomb_location.z in config.station_levels)) + if(bomb_location && (bomb_location.z in using_map.station_levels)) if((bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE))) off_station = 1 else diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm index fae062ffed..fd69e4f50e 100644 --- a/code/game/machinery/supplybeacon.dm +++ b/code/game/machinery/supplybeacon.dm @@ -2,7 +2,7 @@ /obj/item/supply_beacon name = "inactive supply beacon" icon = 'icons/obj/supplybeacon.dmi' - desc = "An inactive, hacked supply beacon stamped with the "+starsys_name+" Rapid Fabrication logo. Good for one (1) ballistic supply pod shipment." + desc = "An inactive, hacked supply beacon stamped with the local system's Rapid Fabrication logo. Good for one (1) ballistic supply pod shipment." icon_state = "beacon" var/deploy_path = /obj/machinery/power/supply_beacon var/deploy_time = 30 @@ -114,6 +114,6 @@ var/drop_x = src.x - 2 var/drop_y = src.y - 2 var/drop_z = src.z - command_announcement.Announce(starsys_name+" Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] recieved. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage") + command_announcement.Announce("[using_map.starsys_name] Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] recieved. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage") spawn(rand(100, 300)) new /datum/random_map/droppod/supply(null, drop_x, drop_y, drop_z, supplied_drop = drop_type) // Splat. diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 77ac7f697e..013001e388 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -93,7 +93,7 @@ var/turf/T = get_turf(R) if(!T) continue - if(!(T.z in config.player_levels)) + if(!(T.z in using_map.player_levels)) continue var/tmpname = T.loc.name if(areaindex[tmpname]) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index da744422cf..1292a3747b 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -181,7 +181,7 @@ sleep(15) visible_message("\icon[src] [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"") sleep(30) - visible_message("\icon[src] [src] beeps: \"User DB truncated. Please contact your [company_name] system operator for future assistance.\"") + visible_message("\icon[src] [src] beeps: \"User DB truncated. Please contact your [using_map.company_name] system operator for future assistance.\"") req_access = null emagged = 1 return 1 diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index 49efb68cf3..8cea4b22c3 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -208,7 +208,7 @@ sleep(15) visible_message("\icon[src] [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"") sleep(30) - visible_message("\icon[src] [src] beeps: \"User DB truncated. Please contact your [company_name] system operator for future assistance.\"") + visible_message("\icon[src] [src] beeps: \"User DB truncated. Please contact your [using_map.company_name] system operator for future assistance.\"") req_access = null emagged = 1 return 1 diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 17c7d76248..4df7585d8b 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -48,7 +48,7 @@ var/area/A = get_area() var/text = {"[src]

[station_name()] blueprints

-Property of [company_name]. For heads of staff only. Store in high-secure storage.
+Property of [using_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/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index ce28a6eb0b..9684bba4db 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(ticker && ticker.mode && ticker.mode.name == "blob") - usr << "Law uploads have been disabled by [company_name]!" + usr << "Law uploads have been disabled by [using_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 fc981a9e8c..a304184e25 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/weapon/circuitboard/security/New() ..() - network = station_networks + network = using_map.station_networks /obj/item/weapon/circuitboard/security/engineering name = T_BOARD("engineering camera monitor") diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 55cdc170e2..4407e29c72 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -333,7 +333,7 @@ the implant may become unstable and either pre-maturely inject the subject or si /obj/item/weapon/implant/loyalty/get_data() var/dat = {" Implant Specifications:
-Name: [company_name] Employee Management Implant
+Name: [using_map.company_name] Employee Management Implant
Life: Ten years.
Important Notes: Personnel injected with this device tend to be much more loyal to the company.
@@ -349,11 +349,11 @@ the implant may become unstable and either pre-maturely inject the subject or si var/mob/living/carbon/human/H = M var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role) if(antag_data && (antag_data.flags & ANTAG_IMPLANT_IMMUNE)) - H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of [company_name] try to invade your mind!") + H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of [using_map.company_name] try to invade your mind!") return 0 else clear_antag_roles(H.mind, 1) - H << "You feel a surge of loyalty towards [company_name]." + H << "You feel a surge of loyalty towards [using_map.company_name]." return 1 @@ -403,7 +403,7 @@ the implant may become unstable and either pre-maturely inject the subject or si /obj/item/weapon/implant/death_alarm/get_data() var/dat = {" Implant Specifications:
-Name: [company_name] \"Profit Margin\" Class Employee Lifesign Sensor
+Name: [using_map.company_name] \"Profit Margin\" Class Employee Lifesign Sensor
Life: Activates upon death.
Important Notes: Alerts crew to crewmember death.
@@ -481,7 +481,7 @@ the implant may become unstable and either pre-maturely inject the subject or si /obj/item/weapon/implant/compressed/get_data() var/dat = {" Implant Specifications:
-Name: [company_name] \"Profit Margin\" Class Employee Lifesign Sensor
+Name: [using_map.company_name] \"Profit Margin\" Class Employee Lifesign Sensor
Life: Activates upon death.
Important Notes: Alerts crew to crewmember death.
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index c69b3d61d1..c89f41056f 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -751,7 +751,7 @@

The Oath

- The Medical Oath sworn by recognised medical practitioners in the employ of [company_name]
+ The Medical Oath sworn by recognised medical practitioners in the employ of [using_map.company_name]
  1. 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.
    2. diff --git a/code/game/periodic_news.dm b/code/game/periodic_news.dm index 14cb92624d..b3c9c9d69f 100644 --- a/code/game/periodic_news.dm +++ b/code/game/periodic_news.dm @@ -6,9 +6,13 @@ round_time // time of the round at which this should be announced, in seconds message // body of the message author = "NanoTrasen Editor" - channel_name = "The "+starsys_name+" Times" can_be_redacted = 0 message_type = "Story" + channel_name = null + + New() // I'm sorry... + ..() + channel_name = "The [using_map.starsys_name] Times" revolution_inciting_event @@ -66,7 +70,6 @@ round_time = 60 * 50 found_ssd - channel_name = "The "+starsys_name+" Times" author = "Doctor Eric Hanfield" message = {"Several people have been found unconscious at their terminals. It is thought that it was due @@ -78,7 +81,6 @@ lotus_tree explosions - channel_name = "The "+starsys_name+" Times" author = "Reporter Leland H. Howards" message = {"The newly-christened civillian transport Lotus Tree suffered two very large explosions near the @@ -92,9 +94,7 @@ food_riots breaking_news - channel_name = "The "+starsys_name+" Times" author = "Reporter Ro'kii Ar-Raqis" - message = {"Breaking news: Food riots have broken out throughout the Refuge asteroid colony in the Tenebrae Lupus system. This comes only hours after NanoTrasen officials announced they will no longer trade with the colony, citing the increased presence of \"hostile factions\" on the colony has made trade too dangerous to @@ -103,9 +103,7 @@ round_time = 60 * 10 more - channel_name = "The "+starsys_name+" Times" author = "Reporter Ro'kii Ar-Raqis" - message = {"More on the Refuge food riots: The Refuge Council has condemned NanoTrasen's withdrawal from the colony, claiming \"there has been no increase in anti-NanoTrasen activity\", and \"\[the only] reason NanoTrasen withdrew was because the \[Tenebrae Lupus] system's Phoron deposits have been completely mined out. diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 5892b7f6e5..0bdbfe4154 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -22,7 +22,7 @@ var/silent_ert = 0 usr << "The round hasn't started yet!" return if(send_emergency_team) - usr << "[boss_name] has already dispatched an emergency response team!" + usr << "[using_map.boss_name] has already dispatched an emergency response team!" return if(alert("Do you want to dispatch an Emergency Response Team?",,"Yes","No") != "Yes") return @@ -117,11 +117,11 @@ proc/trigger_armed_response_team(var/force = 0) // there's only a certain chance a team will be sent if(!prob(send_team_chance)) - command_announcement.Announce("It would appear that an emergency response team was requested for [station_name()]. Unfortunately, we were unable to send one at this time.", "[boss_name]") + command_announcement.Announce("It would appear that an emergency response team was requested for [station_name()]. Unfortunately, we were unable to send one at this time.", "[using_map.boss_name]") can_call_ert = 0 // Only one call per round, ladies. return if(silent_ert == 0) - command_announcement.Announce("It would appear that an emergency response team was requested for [station_name()]. We will prepare and send one as soon as possible.", "[boss_name]") + command_announcement.Announce("It would appear that an emergency response team was requested for [station_name()]. We will prepare and send one as soon as possible.", "[using_map.boss_name]") can_call_ert = 0 // Only one call per round, gentleman. send_emergency_team = 1 diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index e3b8e0d2ec..6bf5010901 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -263,7 +263,7 @@ var/list/mechtoys = list( slip.is_copy = 0 slip.info = "

    [command_name()] Shipping Manifest


    " slip.info +="Order #[SO.ordernum]
    " - slip.info +="Destination: [station_name]
    " + slip.info +="Destination: [station_name()]
    " slip.info +="[shoppinglist.len] PACKAGES IN THIS SHIPMENT
    " slip.info +="CONTENTS: