diff --git a/code/ZAS/Controller.dm b/code/ZAS/Controller.dm index be103e7a55..7e095abe91 100644 --- a/code/ZAS/Controller.dm +++ b/code/ZAS/Controller.dm @@ -1,6 +1,6 @@ -var/datum/controller/subsystem/air/air_master +var/global/datum/controller/subsystem/air/air_master -var/tick_multiplier = 2 +var/global/tick_multiplier = 2 /* diff --git a/code/ZAS/Debug.dm b/code/ZAS/Debug.dm index d16cf167db..410f107cd8 100644 --- a/code/ZAS/Debug.dm +++ b/code/ZAS/Debug.dm @@ -1,11 +1,11 @@ -var/image/assigned = image('icons/Testing/Zone.dmi', icon_state = "assigned") -var/image/created = image('icons/Testing/Zone.dmi', icon_state = "created") -var/image/merged = image('icons/Testing/Zone.dmi', icon_state = "merged") -var/image/invalid_zone = image('icons/Testing/Zone.dmi', icon_state = "invalid") -var/image/air_blocked = image('icons/Testing/Zone.dmi', icon_state = "block") -var/image/zone_blocked = image('icons/Testing/Zone.dmi', icon_state = "zoneblock") -var/image/blocked = image('icons/Testing/Zone.dmi', icon_state = "fullblock") -var/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark") +var/global/image/assigned = image('icons/Testing/Zone.dmi', icon_state = "assigned") +var/global/image/created = image('icons/Testing/Zone.dmi', icon_state = "created") +var/global/image/merged = image('icons/Testing/Zone.dmi', icon_state = "merged") +var/global/image/invalid_zone = image('icons/Testing/Zone.dmi', icon_state = "invalid") +var/global/image/air_blocked = image('icons/Testing/Zone.dmi', icon_state = "block") +var/global/image/zone_blocked = image('icons/Testing/Zone.dmi', icon_state = "zoneblock") +var/global/image/blocked = image('icons/Testing/Zone.dmi', icon_state = "fullblock") +var/global/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark") /connection_edge/var/dbg_out = 0 diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 06e52565f2..ff4e873d9e 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -1,4 +1,4 @@ -var/image/contamination_overlay = image('icons/effects/contamination.dmi') +var/global/image/contamination_overlay = image('icons/effects/contamination.dmi') /pl_control var/PHORON_DMG = 3 diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index 964998a8dd..a51ce8fadc 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -46,10 +46,10 @@ #define ANTIBIO_SUPER 3 // Chemistry lists. -var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine", "bliss") // Increase heart rate. -var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "ambrosia_extract", "stoxin") // Decrease heart rate. -var/list/heartstopper = list("potassium_chlorophoride", "zombie_powder") // This stops the heart. -var/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional +var/global/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine", "bliss") // Increase heart rate. +var/global/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "ambrosia_extract", "stoxin") // Decrease heart rate. +var/global/list/heartstopper = list("potassium_chlorophoride", "zombie_powder") // This stops the heart. +var/global/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional #define MAX_PILL_SPRITE 24 //max icon state of the pill sprites #define MAX_BOTTLE_SPRITE 4 //max icon state of the pill sprites @@ -57,4 +57,4 @@ var/list/cheartstopper = list("potassium_chloride") // Thi #define MAX_UNITS_PER_PILL 60 // Max amount of units in a pill #define MAX_UNITS_PER_PATCH 60 // Max amount of units in a patch #define MAX_UNITS_PER_BOTTLE 60 // Max amount of units in a bottle (it's volume) -#define MAX_CUSTOM_NAME_LEN 64 // Max length of a custom pill/condiment/whatever \ No newline at end of file +#define MAX_CUSTOM_NAME_LEN 64 // Max length of a custom pill/condiment/whatever diff --git a/code/__defines/dna.dm b/code/__defines/dna.dm index cb1d2ad7e7..3778488a46 100644 --- a/code/__defines/dna.dm +++ b/code/__defines/dna.dm @@ -44,33 +44,33 @@ // The way blocks are handled badly needs a rewrite, this is horrible. // Too much of a project to handle at the moment, TODO for later. -var/BLINDBLOCK = 0 -var/DEAFBLOCK = 0 -var/HULKBLOCK = 0 -var/TELEBLOCK = 0 -var/FIREBLOCK = 0 -var/XRAYBLOCK = 0 -var/CLUMSYBLOCK = 0 -var/FAKEBLOCK = 0 -var/COUGHBLOCK = 0 -var/GLASSESBLOCK = 0 -var/EPILEPSYBLOCK = 0 -var/TWITCHBLOCK = 0 -var/NERVOUSBLOCK = 0 -var/MONKEYBLOCK = STRUCDNASIZE +var/global/BLINDBLOCK = 0 +var/global/DEAFBLOCK = 0 +var/global/HULKBLOCK = 0 +var/global/TELEBLOCK = 0 +var/global/FIREBLOCK = 0 +var/global/XRAYBLOCK = 0 +var/global/CLUMSYBLOCK = 0 +var/global/FAKEBLOCK = 0 +var/global/COUGHBLOCK = 0 +var/global/GLASSESBLOCK = 0 +var/global/EPILEPSYBLOCK = 0 +var/global/TWITCHBLOCK = 0 +var/global/NERVOUSBLOCK = 0 +var/global/MONKEYBLOCK = STRUCDNASIZE -var/BLOCKADD = 0 -var/DIFFMUT = 0 +var/global/BLOCKADD = 0 +var/global/DIFFMUT = 0 -var/HEADACHEBLOCK = 0 -var/NOBREATHBLOCK = 0 -var/REMOTEVIEWBLOCK = 0 -var/REGENERATEBLOCK = 0 -var/INCREASERUNBLOCK = 0 -var/REMOTETALKBLOCK = 0 -var/MORPHBLOCK = 0 -var/BLENDBLOCK = 0 -var/HALLUCINATIONBLOCK = 0 -var/NOPRINTSBLOCK = 0 -var/SHOCKIMMUNITYBLOCK = 0 -var/SMALLSIZEBLOCK = 0 +var/global/HEADACHEBLOCK = 0 +var/global/NOBREATHBLOCK = 0 +var/global/REMOTEVIEWBLOCK = 0 +var/global/REGENERATEBLOCK = 0 +var/global/INCREASERUNBLOCK = 0 +var/global/REMOTETALKBLOCK = 0 +var/global/MORPHBLOCK = 0 +var/global/BLENDBLOCK = 0 +var/global/HALLUCINATIONBLOCK = 0 +var/global/NOPRINTSBLOCK = 0 +var/global/SHOCKIMMUNITYBLOCK = 0 +var/global/SMALLSIZEBLOCK = 0 diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm index d8f2d26263..6d1755f27a 100644 --- a/code/__defines/gamemode.dm +++ b/code/__defines/gamemode.dm @@ -38,7 +38,7 @@ #define BE_LOYALIST 0x4000 #define BE_PAI 0x8000 -var/list/be_special_flags = list( +var/global/list/be_special_flags = list( "Traitor" = BE_TRAITOR, "Operative" = BE_OPERATIVE, "Changeling" = BE_CHANGELING, diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index 37d495c3b6..57caccc45f 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -74,7 +74,7 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called #define NETWORK_ALARM_FIRE "Fire Alarms" // Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them. -var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret", NETWORK_COMMUNICATORS) +var/global/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret", NETWORK_COMMUNICATORS) #define TRANSMISSION_WIRE 0 //Is this ever used? I don't think it is. #define TRANSMISSION_RADIO 1 //Radio transmissions (like airlock controller to pump) diff --git a/code/_helpers/_global_objects.dm b/code/_helpers/_global_objects.dm index adbd2785e8..329afee427 100644 --- a/code/_helpers/_global_objects.dm +++ b/code/_helpers/_global_objects.dm @@ -1,2 +1,2 @@ -var/datum/gear_tweak/color/gear_tweak_free_color_choice = new() -var/datum/gear_tweak/implant_location/gear_tweak_implant_location = new() \ No newline at end of file +var/global/datum/gear_tweak/color/gear_tweak_free_color_choice = new() +var/global/datum/gear_tweak/implant_location/gear_tweak_implant_location = new() \ No newline at end of file diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index d9660d0195..caacf1111b 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -1,4 +1,4 @@ -var/list/admins = list() //list of all clients whom are admins +var/global/list/admins = list() //list of all clients whom are admins //Since it didn't really belong in any other category, I'm putting this here //This is for procs to replace all the goddamn 'in world's that are chilling around the code @@ -23,7 +23,7 @@ var/global/list/joblist = list() //list of all jobstypes, minus borg and AI #define all_genders_define_list list(MALE,FEMALE,PLURAL,NEUTER) #define all_genders_text_list list("Male","Female","Plural","Neuter") -var/list/mannequins_ +var/global/list/mannequins_ // Times that players are allowed to respawn ("ckey" = world.time) GLOBAL_LIST_EMPTY(respawn_timers) @@ -50,7 +50,7 @@ var/global/list/wing_styles_list = list() // Stores /datum/sprite_accessory/wing GLOBAL_LIST_INIT(custom_species_bases, new) // Species that can be used for a Custom Species icon base //Underwear -var/datum/category_collection/underwear/global_underwear = new() +var/global/datum/category_collection/underwear/global_underwear = new() //Backpacks var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag", "Sports Bag") @@ -58,9 +58,9 @@ var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Hologr var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg) // Visual nets -var/list/datum/visualnet/visual_nets = list() -var/datum/visualnet/camera/cameranet = new() -var/datum/visualnet/cult/cultnet = new() +var/global/list/datum/visualnet/visual_nets = list() +var/global/datum/visualnet/camera/cameranet = new() +var/global/datum/visualnet/cult/cultnet = new() // Runes var/global/list/rune_list = new() diff --git a/code/_helpers/icons.dm b/code/_helpers/icons.dm index a10c351d12..85e9073160 100644 --- a/code/_helpers/icons.dm +++ b/code/_helpers/icons.dm @@ -15,7 +15,7 @@ CHANGING ICONS Several new procs have been added to the /icon datum to simplify working with icons. To use them, remember you first need to setup an /icon var like so: -var/icon/my_icon = new('iconfile.dmi') + var/icon/my_icon = new('iconfile.dmi') icon/ChangeOpacity(amount = 1) A very common operation in DM is to try to make an icon more or less transparent. Making an icon more diff --git a/code/_helpers/matrices.dm b/code/_helpers/matrices.dm index 11d367afc4..7ed576398f 100644 --- a/code/_helpers/matrices.dm +++ b/code/_helpers/matrices.dm @@ -70,7 +70,7 @@ return list(1,0,0, 0,1,0, 0,0,1, power,power,power) -/var/list/delta_index = list( +var/global/list/delta_index = list( 0, 0.01, 0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.1, 0.11, 0.12, 0.14, 0.15, 0.16, 0.17, 0.18, 0.20, 0.21, 0.22, 0.24, 0.25, 0.27, 0.28, 0.30, 0.32, 0.34, 0.36, 0.38, 0.40, 0.42, diff --git a/code/_helpers/names.dm b/code/_helpers/names.dm index e85a607417..dd28999b25 100644 --- a/code/_helpers/names.dm +++ b/code/_helpers/names.dm @@ -1,4 +1,4 @@ -var/church_name = null +var/global/church_name = null /proc/church_name() if (church_name) return church_name @@ -25,7 +25,7 @@ var/church_name = null return name -var/religion_name = null +var/global/religion_name = null /proc/religion_name() if (religion_name) return religion_name @@ -111,7 +111,7 @@ var/religion_name = null return name -var/syndicate_name = null +var/global/syndicate_name = null /proc/syndicate_name() if (syndicate_name) return syndicate_name @@ -143,8 +143,8 @@ var/syndicate_name = null //Traitors and traitor silicons will get these. Revs will not. -var/syndicate_code_phrase//Code phrase for traitors. -var/syndicate_code_response//Code response for traitors. +var/global/syndicate_code_phrase//Code phrase for traitors. +var/global/syndicate_code_response//Code response for traitors. /* Should be expanded. diff --git a/code/_helpers/sorts/__main.dm b/code/_helpers/sorts/__main.dm index 622d88f147..3d1450c0b5 100644 --- a/code/_helpers/sorts/__main.dm +++ b/code/_helpers/sorts/__main.dm @@ -9,7 +9,7 @@ #define MIN_GALLOP 7 //This is a global instance to allow much of this code to be reused. The interfaces are kept separately -var/datum/sortInstance/sortInstance = new() +var/global/datum/sortInstance/sortInstance = new() /datum/sortInstance //The array being sorted. var/list/L diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index 00648bfb2e..ea8b8093ab 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -370,8 +370,8 @@ //For generating neat chat tag-images //The icon var could be local in the proc, but it's a waste of resources // to always create it and then throw it out. -/var/icon/text_tag_icons = 'icons/chattags.dmi' -/var/list/text_tag_cache = list() +var/global/icon/text_tag_icons = 'icons/chattags.dmi' +var/global/list/text_tag_cache = list() /proc/create_text_tag(var/tagname, var/tagdesc = tagname, var/client/C = null) if(!(C && C.is_preference_enabled(/datum/client_preference/chat_tags))) return tagdesc diff --git a/code/_helpers/time.dm b/code/_helpers/time.dm index ad767c5b57..23d46804bd 100644 --- a/code/_helpers/time.dm +++ b/code/_helpers/time.dm @@ -20,7 +20,7 @@ #define TICKS2DS(T) ((T) TICKS) // Convert ticks to deciseconds #define DS2NEARESTTICK(DS) TICKS2DS(-round(-(DS2TICKS(DS)))) -var/world_startup_time +var/global/world_startup_time /proc/get_game_time() var/static/time_offset = 0 @@ -39,8 +39,8 @@ var/world_startup_time return wtime + (time_offset + wusage) * world.tick_lag GLOBAL_VAR_INIT(roundstart_hour, pick(2,7,12,17)) -var/station_date = "" -var/next_station_date_change = 1 DAY +var/global/station_date = "" +var/global/next_station_date_change = 1 DAY #define duration2stationtime(time) time2text(station_time_in_ds + time, "hh:mm") #define worldtime2stationtime(time) time2text(GLOB.roundstart_hour HOURS + time, "hh:mm") @@ -91,8 +91,8 @@ var/next_station_date_change = 1 DAY //else //return 1 -var/next_duration_update = 0 -var/last_round_duration = 0 +var/global/next_duration_update = 0 +var/global/last_round_duration = 0 GLOBAL_VAR_INIT(round_start_time, 0) /hook/roundstart/proc/start_timer() @@ -117,8 +117,8 @@ GLOBAL_VAR_INIT(round_start_time, 0) next_duration_update = world.time + 1 MINUTES return last_round_duration -/var/midnight_rollovers = 0 -/var/rollovercheck_last_timeofday = 0 +var/global/midnight_rollovers = 0 +var/global/rollovercheck_last_timeofday = 0 /proc/update_midnight_rollover() if (world.timeofday < rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS! return midnight_rollovers++ diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 925dda49bb..bd90d79c20 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1193,7 +1193,7 @@ var/global/list/common_tools = list( Checks if that loc and dir has a item on the wall TODO - Fix this ancient list of wall items. Preferably make it dynamically populated. ~Leshana */ -var/list/WALLITEMS = list( +var/global/list/WALLITEMS = list( /obj/machinery/power/apc, /obj/machinery/alarm, /obj/item/radio/intercom, /obj/structure/frame, /obj/structure/extinguisher_cabinet, /obj/structure/reagent_dispensers/peppertank, /obj/machinery/status_display, /obj/machinery/requests_console, /obj/machinery/light_switch, /obj/structure/sign, @@ -1258,7 +1258,7 @@ var/list/WALLITEMS = list( var/color = hex || rgb(red, green, blue) return "___" -var/mob/dview/dview_mob = new +var/global/mob/dview/dview_mob = new //Version of view() which ignores darkness, because BYOND doesn't have it. /proc/dview(var/range = world.view, var/center, var/invis_flags = 0) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 350c6c5067..0fe471eddc 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -3,8 +3,8 @@ The global hud: Uses the same visual objects for all players. */ -var/datum/global_hud/global_hud = new() -var/list/global_huds = list( +var/global/datum/global_hud/global_hud = new() +var/global/list/global_huds = list( global_hud.druggy, global_hud.blurry, global_hud.whitense, diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 95ff6e1104..c3339fd64f 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -1,4 +1,4 @@ -var/obj/screen/robot_inventory +var/global/obj/screen/robot_inventory /mob/living/silicon/robot/create_mob_hud(datum/hud/HUD, apply_to_client = TRUE) ..() diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 4398dbf7e6..eb301f70dc 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -3,7 +3,7 @@ This needs more thinking out, but I might as well. */ -var/const/tk_maxrange = 15 +var/global/const/tk_maxrange = 15 /* Telekinetic attack: diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm index 2ea9e10b59..f4cad9cf12 100644 --- a/code/controllers/autotransfer.dm +++ b/code/controllers/autotransfer.dm @@ -1,4 +1,4 @@ -var/datum/controller/transfer_controller/transfer_controller +var/global/datum/controller/transfer_controller/transfer_controller /datum/controller/transfer_controller var/timerbuffer = 0 //buffer for time check diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index 05f524e4a0..90b7b37c71 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -97,35 +97,35 @@ On the map: 1455 for AI access */ -var/const/RADIO_LOW_FREQ = 1200 -var/const/PUBLIC_LOW_FREQ = 1441 -var/const/PUBLIC_HIGH_FREQ = 1489 -var/const/RADIO_HIGH_FREQ = 1600 +var/global/const/RADIO_LOW_FREQ = 1200 +var/global/const/PUBLIC_LOW_FREQ = 1441 +var/global/const/PUBLIC_HIGH_FREQ = 1489 +var/global/const/RADIO_HIGH_FREQ = 1600 -var/const/BOT_FREQ = 1447 -var/const/COMM_FREQ = 1353 -var/const/ERT_FREQ = 1345 -var/const/AI_FREQ = 1343 -var/const/DTH_FREQ = 1341 -var/const/SYND_FREQ = 1213 -var/const/RAID_FREQ = 1277 -var/const/ENT_FREQ = 1461 //entertainment frequency. This is not a diona exclusive frequency. +var/global/const/BOT_FREQ = 1447 +var/global/const/COMM_FREQ = 1353 +var/global/const/ERT_FREQ = 1345 +var/global/const/AI_FREQ = 1343 +var/global/const/DTH_FREQ = 1341 +var/global/const/SYND_FREQ = 1213 +var/global/const/RAID_FREQ = 1277 +var/global/const/ENT_FREQ = 1461 //entertainment frequency. This is not a diona exclusive frequency. // department channels -var/const/PUB_FREQ = 1459 -var/const/SEC_FREQ = 1359 -var/const/ENG_FREQ = 1357 -var/const/MED_FREQ = 1355 -var/const/SCI_FREQ = 1351 -var/const/SRV_FREQ = 1349 -var/const/SUP_FREQ = 1347 -var/const/EXP_FREQ = 1361 +var/global/const/PUB_FREQ = 1459 +var/global/const/SEC_FREQ = 1359 +var/global/const/ENG_FREQ = 1357 +var/global/const/MED_FREQ = 1355 +var/global/const/SCI_FREQ = 1351 +var/global/const/SRV_FREQ = 1349 +var/global/const/SUP_FREQ = 1347 +var/global/const/EXP_FREQ = 1361 // internal department channels -var/const/MED_I_FREQ = 1485 -var/const/SEC_I_FREQ = 1475 +var/global/const/MED_I_FREQ = 1485 +var/global/const/SEC_I_FREQ = 1475 -var/list/radiochannels = list( +var/global/list/radiochannels = list( "Common" = PUB_FREQ, "Science" = SCI_FREQ, "Command" = COMM_FREQ, @@ -146,13 +146,13 @@ var/list/radiochannels = list( ) // central command channels, i.e deathsquid & response teams -var/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ) +var/global/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ) // Antag channels, i.e. Syndicate -var/list/ANTAG_FREQS = list(SYND_FREQ, RAID_FREQ) +var/global/list/ANTAG_FREQS = list(SYND_FREQ, RAID_FREQ) //Department channels, arranged lexically -var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ) +var/global/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ) /proc/frequency_span_class(var/frequency) // Antags! @@ -195,17 +195,17 @@ var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC //This is done for performance, so we don't send signals to lots of machines unnecessarily. //This filter is special because devices belonging to default also recieve signals sent to any other filter. -var/const/RADIO_DEFAULT = "radio_default" +var/global/const/RADIO_DEFAULT = "radio_default" -var/const/RADIO_TO_AIRALARM = "radio_airalarm" //air alarms -var/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in recieving signals from air alarms -var/const/RADIO_CHAT = "radio_telecoms" -var/const/RADIO_ATMOSIA = "radio_atmos" -var/const/RADIO_NAVBEACONS = "radio_navbeacon" -var/const/RADIO_AIRLOCK = "radio_airlock" -var/const/RADIO_SECBOT = "radio_secbot" -var/const/RADIO_MULEBOT = "radio_mulebot" -var/const/RADIO_MAGNETS = "radio_magnet" +var/global/const/RADIO_TO_AIRALARM = "radio_airalarm" //air alarms +var/global/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in recieving signals from air alarms +var/global/const/RADIO_CHAT = "radio_telecoms" +var/global/const/RADIO_ATMOSIA = "radio_atmos" +var/global/const/RADIO_NAVBEACONS = "radio_navbeacon" +var/global/const/RADIO_AIRLOCK = "radio_airlock" +var/global/const/RADIO_SECBOT = "radio_secbot" +var/global/const/RADIO_MULEBOT = "radio_mulebot" +var/global/const/RADIO_MAGNETS = "radio_magnet" var/global/datum/controller/radio/radio_controller diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 462bc27ee5..f2addca542 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -1,4 +1,4 @@ -var/list/gamemode_cache = list() +var/global/list/gamemode_cache = list() /datum/configuration var/server_name = null // server name (for world name / status) diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 99f2683a68..3215a1476a 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -4,7 +4,7 @@ * Pretty much pokes the MC to make sure it's still alive. **/ -var/datum/controller/failsafe/Failsafe +var/global/datum/controller/failsafe/Failsafe /datum/controller/failsafe // This thing pretty much just keeps poking the master controller name = "Failsafe" diff --git a/code/controllers/subsystems/lighting.dm b/code/controllers/subsystems/lighting.dm index 294a0a3f77..4c2a3f1ce4 100644 --- a/code/controllers/subsystems/lighting.dm +++ b/code/controllers/subsystems/lighting.dm @@ -12,10 +12,10 @@ #define DUAL_TICK_CHECK if (init_tick_checks) { CHECK_TICK; } else if (MC_TICK_CHECK) { return; } // Globals -/var/lighting_overlays_initialised = FALSE -/var/list/lighting_update_lights = list() // List of lighting sources queued for update. -/var/list/lighting_update_corners = list() // List of lighting corners queued for update. -/var/list/lighting_update_overlays = list() // List of lighting overlays queued for update. +var/global/lighting_overlays_initialised = FALSE +var/global/list/lighting_update_lights = list() // List of lighting sources queued for update. +var/global/list/lighting_update_corners = list() // List of lighting corners queued for update. +var/global/list/lighting_update_overlays = list() // List of lighting overlays queued for update. SUBSYSTEM_DEF(lighting) name = "Lighting" diff --git a/code/datums/autolathe/autolathe.dm b/code/datums/autolathe/autolathe.dm index 3c5fd317a0..d0b83ffaeb 100644 --- a/code/datums/autolathe/autolathe.dm +++ b/code/datums/autolathe/autolathe.dm @@ -1,4 +1,4 @@ -var/datum/category_collection/autolathe/autolathe_recipes +var/global/datum/category_collection/autolathe/autolathe_recipes /datum/category_item/autolathe/New() ..() diff --git a/code/datums/chat_message.dm b/code/datums/chat_message.dm index b7582e6fe1..41cd3e756a 100644 --- a/code/datums/chat_message.dm +++ b/code/datums/chat_message.dm @@ -25,7 +25,7 @@ */ // Cached runechat icon -var/list/runechat_image_cache = list() +var/global/list/runechat_image_cache = list() /hook/startup/proc/runechat_images() diff --git a/code/datums/modules.dm b/code/datums/modules.dm index 43d25a2e25..d24610b679 100644 --- a/code/datums/modules.dm +++ b/code/datums/modules.dm @@ -13,7 +13,7 @@ var/list/modcount = list() // assoc list of the count of modules for a type -var/list/modules = list( // global associative list +var/global/list/modules = list( // global associative list "/obj/machinery/power/apc" = "card_reader,power_control,id_auth,cell_power,cell_charge") diff --git a/code/datums/observation/turf_changed.dm b/code/datums/observation/turf_changed.dm index 0bb0ed9115..cc272d9b92 100644 --- a/code/datums/observation/turf_changed.dm +++ b/code/datums/observation/turf_changed.dm @@ -10,7 +10,7 @@ // /old_opacity: Opacity before the change // /new_opacity: Opacity after the change -var/decl/observ/turf_changed/turf_changed_event = new() +var/global/decl/observ/turf_changed/turf_changed_event = new() /decl/observ/turf_changed name = "Turf Changed" diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index f20158a724..c779b9cf5b 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -1,6 +1,6 @@ -var/list/outfits_decls_ -var/list/outfits_decls_root_ -var/list/outfits_decls_by_type_ +var/global/list/outfits_decls_ +var/global/list/outfits_decls_root_ +var/global/list/outfits_decls_by_type_ /proc/outfit_by_type(var/outfit_type) if(!outfits_decls_root_) diff --git a/code/datums/repositories/decls.dm b/code/datums/repositories/decls.dm index ef53abdc87..6b092684e2 100644 --- a/code/datums/repositories/decls.dm +++ b/code/datums/repositories/decls.dm @@ -14,7 +14,7 @@ // III. Thou shalt not write a decl that relies on arguments supplied to New(). // IV. Thou shalt not call Initialize() on a /decl. -var/repository/decls/decls_repository = new() +var/global/repository/decls/decls_repository = new() /repository/decls var/list/fetched_decls var/list/fetched_decl_types diff --git a/code/datums/repositories/unique.dm b/code/datums/repositories/unique.dm index a53111cb24..ddc779ebc4 100644 --- a/code/datums/repositories/unique.dm +++ b/code/datums/repositories/unique.dm @@ -1,4 +1,4 @@ -var/repository/unique/uniqueness_repository = new() +var/global/repository/unique/uniqueness_repository = new() /repository/unique var/list/generators diff --git a/code/datums/supplypacks/supplypacks.dm b/code/datums/supplypacks/supplypacks.dm index d419198af3..9fa08f6d20 100644 --- a/code/datums/supplypacks/supplypacks.dm +++ b/code/datums/supplypacks/supplypacks.dm @@ -7,7 +7,7 @@ //NOTE NOTE: Hidden var is now deprecated, whoever removed support for it should've removed the var altogether //var/list/all_supply_groups = list("Operations","Security","Hospitality","Engineering","Atmospherics","Medical","Reagents","Reagent Cartridges","Science","Hydroponics", "Supply", "Miscellaneous") -var/list/all_supply_groups = list("Atmospherics", +var/global/list/all_supply_groups = list("Atmospherics", "Costumes", "Engineering", "Hospitality", diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm index 3fbabed61b..04449ad60d 100644 --- a/code/datums/uplink/uplink_items.dm +++ b/code/datums/uplink/uplink_items.dm @@ -1,4 +1,4 @@ -var/datum/uplink/uplink = new() +var/global/datum/uplink/uplink = new() /datum/uplink var/list/items_assoc diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 66706c9235..6628a73730 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -43,7 +43,7 @@ * This item is completely unused, but removing it will break something in R&D and Radio code causing PDA and Ninja code to fail on compile */ -/var/list/acting_rank_prefixes = list("acting", "temporary", "interim", "provisional") +var/global/list/acting_rank_prefixes = list("acting", "temporary", "interim", "provisional") /proc/make_list_rank(rank) for(var/prefix in acting_rank_prefixes) diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 64b1688c1c..6a170431e5 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -1,5 +1,5 @@ -/var/datum/announcement/priority/priority_announcement = new(do_log = 0) -/var/datum/announcement/priority/command/command_announcement = new(do_log = 0, do_newscast = 1) +var/global/datum/announcement/priority/priority_announcement = new(do_log = 0) +var/global/datum/announcement/priority/command/command_announcement = new(do_log = 0, do_newscast = 1) /datum/announcement var/title = "Attention" diff --git a/code/defines/procs/dbcore.dm b/code/defines/procs/dbcore.dm index e0f8ab94af..4901673789 100644 --- a/code/defines/procs/dbcore.dm +++ b/code/defines/procs/dbcore.dm @@ -31,13 +31,6 @@ #define BLOB 14 // TODO: Investigate more recent type additions and see if I can handle them. - Nadrew - -// Deprecated! See global.dm for new configuration vars -/* -var/DB_SERVER = "" // This is the location of your MySQL server (localhost is USUALLY fine) -var/DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is the default) -*/ - /DBConnection var/_db_con // This variable contains a reference to the actual database connection. var/dbi // This variable is a string containing the DBI MySQL requires. diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index b14e4d5719..e0df2f06ae 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -346,7 +346,7 @@ ////////////////////////////////////////////////////////////////// -var/list/mob/living/forced_ambiance_list = new +var/global/list/mob/living/forced_ambiance_list = new /area/Entered(A) if(!istype(A,/mob/living)) return @@ -471,7 +471,7 @@ var/list/mob/living/forced_ambiance_list = new /*Adding a wizard area teleport list because motherfucking lag -- Urist*/ /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/ -var/list/teleportlocs = list() +var/global/list/teleportlocs = list() /hook/startup/proc/setupTeleportLocs() for(var/area/AR in world) @@ -486,7 +486,7 @@ var/list/teleportlocs = list() return 1 -var/list/ghostteleportlocs = list() +var/global/list/ghostteleportlocs = list() /hook/startup/proc/setupGhostTeleportLocs() for(var/area/AR in world) diff --git a/code/game/gamemodes/changeling/changeling_evolutiontree.dm b/code/game/gamemodes/changeling/changeling_evolutiontree.dm index afd2da9d7e..80f9d8842b 100644 --- a/code/game/gamemodes/changeling/changeling_evolutiontree.dm +++ b/code/game/gamemodes/changeling/changeling_evolutiontree.dm @@ -1,5 +1,5 @@ -var/list/powers = typesof(/datum/power/changeling) - /datum/power/changeling //needed for the badmin verb for now -var/list/datum/power/changeling/powerinstances = list() +var/global/list/powers = typesof(/datum/power/changeling) - /datum/power/changeling //needed for the badmin verb for now +var/global/list/datum/power/changeling/powerinstances = list() /datum/power //Could be used by other antags too var/name = "Power" diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index a184f5c210..d19421e27a 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -20,7 +20,7 @@ // HIVE MIND UPLOAD/DOWNLOAD DNA -var/list/datum/dna/hivemind_bank = list() +var/global/list/datum/dna/hivemind_bank = list() /mob/proc/changeling_hiveupload() set category = "Changeling" diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 4ef8deda55..25bea02991 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 -var/cultwords = list() -var/runedec = 0 +var/global/cultwords = list() +var/global/runedec = 0 var/global/list/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", "self", "see", "other", "hide") var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","mgar","balaq", "karazet", "geeri") diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 5bfbdbaa19..ab5edcd43c 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -1,4 +1,4 @@ -var/list/sacrificed = list() +var/global/list/sacrificed = list() /obj/effect/rune/cultify() return diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 6fe555c230..bbffe21056 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -98,8 +98,8 @@ if(15) communications_blackout() */ -var/eventchance = 10 // Percent chance per 5 minutes. -var/hadevent = 0 +var/global/eventchance = 10 // Percent chance per 5 minutes. +var/global/hadevent = 0 /proc/appendicitis() for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index a475f630ed..a4fb4192c9 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -1,13 +1,13 @@ -/var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds +var/global/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds //set to at least 100 unless you want evarr ruining every round //Meteors probability of spawning during a given wave //for space dust event -/var/list/meteors_dust = list(/obj/effect/meteor/dust) +var/global/list/meteors_dust = list(/obj/effect/meteor/dust) //for normal meteor event -/var/list/meteors_normal = list( +var/global/list/meteors_normal = list( /obj/effect/meteor/dust=3, /obj/effect/meteor/medium=5, /obj/effect/meteor/medium/spalling = 3, @@ -17,7 +17,7 @@ ) //for threatening meteor event -/var/list/meteors_threatening = list( +var/global/list/meteors_threatening = list( /obj/effect/meteor/medium=3, /obj/effect/meteor/medium/spalling = 2, /obj/effect/meteor/big=10, @@ -26,7 +26,7 @@ /obj/effect/meteor/emp=3) //for catastrophic meteor event -/var/list/meteors_catastrophic = list( +var/global/list/meteors_catastrophic = list( /obj/effect/meteor/medium=2, /obj/effect/meteor/medium/spalling = 3, /obj/effect/meteor/big=75, diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index b386645fc4..53ab00c9cc 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -2,7 +2,7 @@ MERCENARY ROUNDTYPE */ -var/list/nuke_disks = list() +var/global/list/nuke_disks = list() /datum/game_mode/nuclear name = "Mercenary" diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 6651000ee3..b0842eec9d 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 -var/hsboxspawn = 1 -var/list +var/global/hsboxspawn = 1 +var/global/list hrefs = list( "hsbsuit" = "Suit Up (Space Travel Gear)", "hsbmetal" = "Spawn 50 Metal", diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm index 8da5e12945..d0dfda2a4c 100644 --- a/code/game/gamemodes/technomancer/catalog.dm +++ b/code/game/gamemodes/technomancer/catalog.dm @@ -4,10 +4,10 @@ #define UTILITY_SPELLS "Utility" #define SUPPORT_SPELLS "Support" -var/list/all_technomancer_spells = typesof(/datum/technomancer/spell) - /datum/technomancer/spell -var/list/all_technomancer_equipment = typesof(/datum/technomancer/equipment) - /datum/technomancer/equipment -var/list/all_technomancer_consumables = typesof(/datum/technomancer/consumable) - /datum/technomancer/consumable -var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - /datum/technomancer/assistance +var/global/list/all_technomancer_spells = typesof(/datum/technomancer/spell) - /datum/technomancer/spell +var/global/list/all_technomancer_equipment = typesof(/datum/technomancer/equipment) - /datum/technomancer/equipment +var/global/list/all_technomancer_consumables = typesof(/datum/technomancer/consumable) - /datum/technomancer/consumable +var/global/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - /datum/technomancer/assistance /datum/technomancer var/name = "technomancer thing" diff --git a/code/game/gamemodes/technomancer/spells/track.dm b/code/game/gamemodes/technomancer/spells/track.dm index ac284da18b..a3d67d7525 100644 --- a/code/game/gamemodes/technomancer/spells/track.dm +++ b/code/game/gamemodes/technomancer/spells/track.dm @@ -10,7 +10,7 @@ // This stores a ref to all important items that belong to a Technomancer, in case of theft. Used by the spell below. // I feel dirty for adding yet another global list used by one thing, but the only alternative is to loop through world, and yeahhh. -var/list/technomancer_belongings = list() +var/global/list/technomancer_belongings = list() /obj/item/spell/track name = "track" diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index ed7fd87ff9..8c7638615b 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -65,7 +65,7 @@ if("Supreme Commander") return get_all_centcom_access() -/var/list/datum/access/priv_all_access_datums +var/global/list/datum/access/priv_all_access_datums /proc/get_all_access_datums() if(!priv_all_access_datums) priv_all_access_datums = init_subtypes(/datum/access) @@ -73,7 +73,7 @@ return priv_all_access_datums -/var/list/datum/access/priv_all_access_datums_id +var/global/list/datum/access/priv_all_access_datums_id /proc/get_all_access_datums_by_id() if(!priv_all_access_datums_id) priv_all_access_datums_id = list() @@ -82,7 +82,7 @@ return priv_all_access_datums_id -/var/list/datum/access/priv_all_access_datums_region +var/global/list/datum/access/priv_all_access_datums_region /proc/get_all_access_datums_by_region() if(!priv_all_access_datums_region) priv_all_access_datums_region = list() @@ -100,7 +100,7 @@ L += A.id return L -/var/list/priv_all_access +var/global/list/priv_all_access /proc/get_all_accesses() RETURN_TYPE(/list) if(!priv_all_access) @@ -108,7 +108,7 @@ return priv_all_access -/var/list/priv_station_access +var/global/list/priv_station_access /proc/get_all_station_access() RETURN_TYPE(/list) if(!priv_station_access) @@ -116,7 +116,7 @@ return priv_station_access -/var/list/priv_centcom_access +var/global/list/priv_centcom_access /proc/get_all_centcom_access() RETURN_TYPE(/list) if(!priv_centcom_access) @@ -124,7 +124,7 @@ return priv_centcom_access -/var/list/priv_syndicate_access +var/global/list/priv_syndicate_access /proc/get_all_syndicate_access() RETURN_TYPE(/list) if(!priv_syndicate_access) @@ -132,7 +132,7 @@ return priv_syndicate_access -/var/list/priv_private_access +var/global/list/priv_private_access /proc/get_all_private_access() RETURN_TYPE(/list) if(!priv_private_access) @@ -140,7 +140,7 @@ return priv_syndicate_access -/var/list/priv_region_access +var/global/list/priv_region_access /proc/get_region_accesses(var/code) if(code == ACCESS_REGION_ALL) return get_all_station_access() diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 2dc02614d0..c29bee2009 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -10,253 +10,253 @@ /***************** * Station access * *****************/ -/var/const/access_security = 1 +var/global/const/access_security = 1 /datum/access/security id = access_security desc = "Security Equipment" region = ACCESS_REGION_SECURITY -/var/const/access_brig = 2 // Brig timers and permabrig +var/global/const/access_brig = 2 // Brig timers and permabrig /datum/access/holding id = access_brig desc = "Holding Cells" region = ACCESS_REGION_SECURITY -/var/const/access_armory = 3 +var/global/const/access_armory = 3 /datum/access/armory id = access_armory desc = "Armory" region = ACCESS_REGION_SECURITY -/var/const/access_forensics_lockers = 4 +var/global/const/access_forensics_lockers = 4 /datum/access/forensics_lockers id = access_forensics_lockers desc = "Forensics" region = ACCESS_REGION_SECURITY -/var/const/access_medical = 5 +var/global/const/access_medical = 5 /datum/access/medical id = access_medical desc = "Medical" region = ACCESS_REGION_MEDBAY -/var/const/access_morgue = 6 +var/global/const/access_morgue = 6 /datum/access/morgue id = access_morgue desc = "Morgue" region = ACCESS_REGION_MEDBAY -/var/const/access_tox = 7 +var/global/const/access_tox = 7 /datum/access/tox id = access_tox desc = "R&D Lab" region = ACCESS_REGION_RESEARCH -/var/const/access_tox_storage = 8 +var/global/const/access_tox_storage = 8 /datum/access/tox_storage id = access_tox_storage desc = "Toxins Lab" region = ACCESS_REGION_RESEARCH -/var/const/access_genetics = 9 +var/global/const/access_genetics = 9 /datum/access/genetics id = access_genetics desc = "Genetics Lab" region = ACCESS_REGION_MEDBAY -/var/const/access_engine = 10 +var/global/const/access_engine = 10 /datum/access/engine id = access_engine desc = "Engineering" region = ACCESS_REGION_ENGINEERING -/var/const/access_engine_equip = 11 +var/global/const/access_engine_equip = 11 /datum/access/engine_equip id = access_engine_equip desc = "Engine Room" region = ACCESS_REGION_ENGINEERING -/var/const/access_maint_tunnels = 12 +var/global/const/access_maint_tunnels = 12 /datum/access/maint_tunnels id = access_maint_tunnels desc = "Maintenance" region = ACCESS_REGION_ENGINEERING -/var/const/access_external_airlocks = 13 +var/global/const/access_external_airlocks = 13 /datum/access/external_airlocks id = access_external_airlocks desc = "External Airlocks" region = ACCESS_REGION_ENGINEERING -/var/const/access_emergency_storage = 14 +var/global/const/access_emergency_storage = 14 /datum/access/emergency_storage id = access_emergency_storage desc = "Emergency Storage" region = ACCESS_REGION_ENGINEERING -/var/const/access_change_ids = 15 +var/global/const/access_change_ids = 15 /datum/access/change_ids id = access_change_ids desc = "ID Computer" region = ACCESS_REGION_COMMAND -/var/const/access_ai_upload = 16 +var/global/const/access_ai_upload = 16 /datum/access/ai_upload id = access_ai_upload desc = "AI Upload" region = ACCESS_REGION_COMMAND -/var/const/access_teleporter = 17 +var/global/const/access_teleporter = 17 /datum/access/teleporter id = access_teleporter desc = "Teleporter" region = ACCESS_REGION_COMMAND -/var/const/access_eva = 18 +var/global/const/access_eva = 18 /datum/access/eva id = access_eva desc = "EVA" region = ACCESS_REGION_COMMAND -/var/const/access_heads = 19 +var/global/const/access_heads = 19 /datum/access/heads id = access_heads desc = "Bridge" region = ACCESS_REGION_COMMAND -/var/const/access_captain = 20 +var/global/const/access_captain = 20 /datum/access/captain id = access_captain desc = "Site Manager" region = ACCESS_REGION_COMMAND -/var/const/access_all_personal_lockers = 21 +var/global/const/access_all_personal_lockers = 21 /datum/access/all_personal_lockers id = access_all_personal_lockers desc = "Personal Lockers" region = ACCESS_REGION_COMMAND -/var/const/access_chapel_office = 22 +var/global/const/access_chapel_office = 22 /datum/access/chapel_office id = access_chapel_office desc = "Chapel Office" region = ACCESS_REGION_GENERAL -/var/const/access_tech_storage = 23 +var/global/const/access_tech_storage = 23 /datum/access/tech_storage id = access_tech_storage desc = "Technical Storage" region = ACCESS_REGION_ENGINEERING -/var/const/access_atmospherics = 24 +var/global/const/access_atmospherics = 24 /datum/access/atmospherics id = access_atmospherics desc = "Atmospherics" region = ACCESS_REGION_ENGINEERING -/var/const/access_bar = 25 +var/global/const/access_bar = 25 /datum/access/bar id = access_bar desc = "Bar" region = ACCESS_REGION_GENERAL -/var/const/access_janitor = 26 +var/global/const/access_janitor = 26 /datum/access/janitor id = access_janitor desc = "Custodial Closet" region = ACCESS_REGION_GENERAL -/var/const/access_crematorium = 27 +var/global/const/access_crematorium = 27 /datum/access/crematorium id = access_crematorium desc = "Crematorium" region = ACCESS_REGION_GENERAL -/var/const/access_kitchen = 28 +var/global/const/access_kitchen = 28 /datum/access/kitchen id = access_kitchen desc = "Kitchen" region = ACCESS_REGION_GENERAL -/var/const/access_robotics = 29 +var/global/const/access_robotics = 29 /datum/access/robotics id = access_robotics desc = "Robotics" region = ACCESS_REGION_RESEARCH -/var/const/access_rd = 30 +var/global/const/access_rd = 30 /datum/access/rd id = access_rd desc = "Research Director" region = ACCESS_REGION_RESEARCH -/var/const/access_cargo = 31 +var/global/const/access_cargo = 31 /datum/access/cargo id = access_cargo desc = "Cargo Bay" region = ACCESS_REGION_SUPPLY -/var/const/access_construction = 32 +var/global/const/access_construction = 32 /datum/access/construction id = access_construction desc = "Construction Areas" region = ACCESS_REGION_ENGINEERING -/var/const/access_chemistry = 33 +var/global/const/access_chemistry = 33 /datum/access/chemistry id = access_chemistry desc = "Chemistry Lab" region = ACCESS_REGION_MEDBAY -/var/const/access_cargo_bot = 34 +var/global/const/access_cargo_bot = 34 /datum/access/cargo_bot id = access_cargo_bot desc = "Cargo Bot Delivery" region = ACCESS_REGION_SUPPLY -/var/const/access_hydroponics = 35 +var/global/const/access_hydroponics = 35 /datum/access/hydroponics id = access_hydroponics desc = "Hydroponics" region = ACCESS_REGION_GENERAL -/var/const/access_manufacturing = 36 +var/global/const/access_manufacturing = 36 /datum/access/manufacturing id = access_manufacturing desc = "Manufacturing" access_type = ACCESS_TYPE_NONE -/var/const/access_library = 37 +var/global/const/access_library = 37 /datum/access/library id = access_library desc = "Library" region = ACCESS_REGION_GENERAL -/var/const/access_lawyer = 38 +var/global/const/access_lawyer = 38 /datum/access/lawyer id = access_lawyer desc = "Internal Affairs" region = ACCESS_REGION_COMMAND -/var/const/access_virology = 39 +var/global/const/access_virology = 39 /datum/access/virology id = access_virology desc = "Virology" region = ACCESS_REGION_MEDBAY -/var/const/access_cmo = 40 +var/global/const/access_cmo = 40 /datum/access/cmo id = access_cmo desc = "Chief Medical Officer" region = ACCESS_REGION_COMMAND -/var/const/access_qm = 41 +var/global/const/access_qm = 41 /datum/access/qm id = access_qm desc = "Quartermaster" region = ACCESS_REGION_SUPPLY -/var/const/access_network = 42 +var/global/const/access_network = 42 /datum/access/network id = access_network desc = "Station Network" @@ -265,7 +265,7 @@ // /var/const/free_access_id = 43 // /var/const/free_access_id = 44 -/var/const/access_surgery = 45 +var/global/const/access_surgery = 45 /datum/access/surgery id = access_surgery desc = "Surgery" @@ -273,25 +273,25 @@ // /var/const/free_access_id = 46 -/var/const/access_research = 47 +var/global/const/access_research = 47 /datum/access/research id = access_research desc = "Science" region = ACCESS_REGION_RESEARCH -/var/const/access_mining = 48 +var/global/const/access_mining = 48 /datum/access/mining id = access_mining desc = "Mining" region = ACCESS_REGION_SUPPLY -/var/const/access_mining_office = 49 +var/global/const/access_mining_office = 49 /datum/access/mining_office id = access_mining_office desc = "Mining Office" access_type = ACCESS_TYPE_NONE -/var/const/access_mailsorting = 50 +var/global/const/access_mailsorting = 50 /datum/access/mailsorting id = access_mailsorting desc = "Cargo Office" @@ -300,85 +300,85 @@ // /var/const/free_access_id = 51 // /var/const/free_access_id = 52 -/var/const/access_heads_vault = 53 +var/global/const/access_heads_vault = 53 /datum/access/heads_vault id = access_heads_vault desc = "Main Vault" region = ACCESS_REGION_COMMAND -/var/const/access_mining_station = 54 +var/global/const/access_mining_station = 54 /datum/access/mining_station id = access_mining_station desc = "Mining EVA" region = ACCESS_REGION_SUPPLY -/var/const/access_xenobiology = 55 +var/global/const/access_xenobiology = 55 /datum/access/xenobiology id = access_xenobiology desc = "Xenobiology Lab" region = ACCESS_REGION_RESEARCH -/var/const/access_ce = 56 +var/global/const/access_ce = 56 /datum/access/ce id = access_ce desc = "Chief Engineer" region = ACCESS_REGION_ENGINEERING -/var/const/access_hop = 57 +var/global/const/access_hop = 57 /datum/access/hop id = access_hop desc = "Head of Personnel" region = ACCESS_REGION_COMMAND -/var/const/access_hos = 58 +var/global/const/access_hos = 58 /datum/access/hos id = access_hos desc = "Head of Security" region = ACCESS_REGION_SECURITY -/var/const/access_RC_announce = 59 //Request console announcements +var/global/const/access_RC_announce = 59 //Request console announcements /datum/access/RC_announce id = access_RC_announce desc = "RC Announcements" region = ACCESS_REGION_COMMAND -/var/const/access_keycard_auth = 60 //Used for events which require at least two people to confirm them +var/global/const/access_keycard_auth = 60 //Used for events which require at least two people to confirm them /datum/access/keycard_auth id = access_keycard_auth desc = "Keycode Auth. Device" region = ACCESS_REGION_COMMAND -/var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery +var/global/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery /datum/access/tcomsat id = access_tcomsat desc = "Telecommunications" region = ACCESS_REGION_COMMAND -/var/const/access_gateway = 62 +var/global/const/access_gateway = 62 /datum/access/gateway id = access_gateway desc = "Gateway" region = ACCESS_REGION_COMMAND -/var/const/access_sec_doors = 63 // Security front doors +var/global/const/access_sec_doors = 63 // Security front doors /datum/access/sec_doors id = access_sec_doors desc = "Security" region = ACCESS_REGION_SECURITY -/var/const/access_psychiatrist = 64 // Psychiatrist's office +var/global/const/access_psychiatrist = 64 // Psychiatrist's office /datum/access/psychiatrist id = access_psychiatrist desc = "Psychiatrist's Office" region = ACCESS_REGION_MEDBAY -/var/const/access_xenoarch = 65 +var/global/const/access_xenoarch = 65 /datum/access/xenoarch id = access_xenoarch desc = "Xenoarchaeology" region = ACCESS_REGION_RESEARCH -/var/const/access_medical_equip = 66 +var/global/const/access_medical_equip = 66 /datum/access/medical_equip id = access_medical_equip desc = "Medical Equipment" @@ -387,55 +387,55 @@ /****************** * Central Command * ******************/ -/var/const/access_cent_general = 101//General facilities. +var/global/const/access_cent_general = 101//General facilities. /datum/access/cent_general id = access_cent_general desc = "General Facilities" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_thunder = 102//Thunderdome. +var/global/const/access_cent_thunder = 102//Thunderdome. /datum/access/cent_thunder id = access_cent_thunder desc = "Entertainment Facilities" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_specops = 103//Special Ops. +var/global/const/access_cent_specops = 103//Special Ops. /datum/access/cent_specops id = access_cent_specops desc = "Emergency Response Team Prep" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_medical = 104//Medical/Research +var/global/const/access_cent_medical = 104//Medical/Research /datum/access/cent_medical id = access_cent_medical desc = "Medical Facilities" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_living = 105//Living quarters. +var/global/const/access_cent_living = 105//Living quarters. /datum/access/cent_living id = access_cent_living desc = "Dormitories" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_storage = 106//Generic storage areas. +var/global/const/access_cent_storage = 106//Generic storage areas. /datum/access/cent_storage id = access_cent_storage desc = "Storage" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_teleporter = 107//Teleporter. +var/global/const/access_cent_teleporter = 107//Teleporter. /datum/access/cent_teleporter id = access_cent_teleporter desc = "Central Command Teleporter" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_creed = 108//Creed's office. +var/global/const/access_cent_creed = 108//Creed's office. /datum/access/cent_creed id = access_cent_creed desc = "Emergency Response Team Administration" access_type = ACCESS_TYPE_CENTCOM -/var/const/access_cent_captain = 109//Captain's office/ID comp/AI. +var/global/const/access_cent_captain = 109//Captain's office/ID comp/AI. /datum/access/cent_captain id = access_cent_captain desc = "Central Command Administration" @@ -444,7 +444,7 @@ /*************** * Antag access * ***************/ -/var/const/access_syndicate = 150//General Syndicate Access +var/global/const/access_syndicate = 150//General Syndicate Access /datum/access/syndicate id = access_syndicate access_type = ACCESS_TYPE_SYNDICATE @@ -452,23 +452,23 @@ /******* * Misc * *******/ -/var/const/access_synth = 199 +var/global/const/access_synth = 199 /datum/access/synthetic id = access_synth desc = "Synthetic" access_type = ACCESS_TYPE_NONE -/var/const/access_crate_cash = 200 +var/global/const/access_crate_cash = 200 /datum/access/crate_cash id = access_crate_cash access_type = ACCESS_TYPE_NONE -/var/const/access_trader = 160//General Beruang Trader Access +var/global/const/access_trader = 160//General Beruang Trader Access /datum/access/trader id = access_trader access_type = ACCESS_TYPE_PRIVATE -/var/const/access_alien = 300 // For things like crashed ships. +var/global/const/access_alien = 300 // For things like crashed ships. /datum/access/alien id = access_alien desc = "#%_^&*@!" diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 87273128c6..cea6daff29 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -1,4 +1,4 @@ -var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) +var/global/datum/announcement/minor/captain_announcement = new(do_newscast = 1) ////////////////////////////////// // Captain diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 04a6f41b97..a5e696b2fe 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -1,48 +1,48 @@ -var/const/ENGSEC =(1<<0) +var/global/const/ENGSEC =(1<<0) -var/const/CAPTAIN =(1<<0) -var/const/HOS =(1<<1) -var/const/WARDEN =(1<<2) -var/const/DETECTIVE =(1<<3) -var/const/OFFICER =(1<<4) -var/const/CHIEF =(1<<5) -var/const/ENGINEER =(1<<6) -var/const/ATMOSTECH =(1<<7) -var/const/AI =(1<<8) -var/const/CYBORG =(1<<9) +var/global/const/CAPTAIN =(1<<0) +var/global/const/HOS =(1<<1) +var/global/const/WARDEN =(1<<2) +var/global/const/DETECTIVE =(1<<3) +var/global/const/OFFICER =(1<<4) +var/global/const/CHIEF =(1<<5) +var/global/const/ENGINEER =(1<<6) +var/global/const/ATMOSTECH =(1<<7) +var/global/const/AI =(1<<8) +var/global/const/CYBORG =(1<<9) -var/const/MEDSCI =(1<<1) +var/global/const/MEDSCI =(1<<1) -var/const/RD =(1<<0) -var/const/SCIENTIST =(1<<1) -var/const/CHEMIST =(1<<2) -var/const/CMO =(1<<3) -var/const/DOCTOR =(1<<4) -var/const/GENETICIST =(1<<5) -var/const/VIROLOGIST =(1<<6) -var/const/PSYCHIATRIST =(1<<7) -var/const/ROBOTICIST =(1<<8) -var/const/XENOBIOLOGIST =(1<<9) -var/const/PARAMEDIC =(1<<10) +var/global/const/RD =(1<<0) +var/global/const/SCIENTIST =(1<<1) +var/global/const/CHEMIST =(1<<2) +var/global/const/CMO =(1<<3) +var/global/const/DOCTOR =(1<<4) +var/global/const/GENETICIST =(1<<5) +var/global/const/VIROLOGIST =(1<<6) +var/global/const/PSYCHIATRIST =(1<<7) +var/global/const/ROBOTICIST =(1<<8) +var/global/const/XENOBIOLOGIST =(1<<9) +var/global/const/PARAMEDIC =(1<<10) -var/const/CIVILIAN =(1<<2) +var/global/const/CIVILIAN =(1<<2) -var/const/HOP =(1<<0) -var/const/BARTENDER =(1<<1) -var/const/BOTANIST =(1<<2) -var/const/CHEF =(1<<3) -var/const/JANITOR =(1<<4) -var/const/LIBRARIAN =(1<<5) -var/const/QUARTERMASTER =(1<<6) -var/const/CARGOTECH =(1<<7) -var/const/MINER =(1<<8) -var/const/LAWYER =(1<<9) -var/const/CHAPLAIN =(1<<10) -var/const/ASSISTANT =(1<<11) -var/const/BRIDGE =(1<<12) +var/global/const/HOP =(1<<0) +var/global/const/BARTENDER =(1<<1) +var/global/const/BOTANIST =(1<<2) +var/global/const/CHEF =(1<<3) +var/global/const/JANITOR =(1<<4) +var/global/const/LIBRARIAN =(1<<5) +var/global/const/QUARTERMASTER =(1<<6) +var/global/const/CARGOTECH =(1<<7) +var/global/const/MINER =(1<<8) +var/global/const/LAWYER =(1<<9) +var/global/const/CHAPLAIN =(1<<10) +var/global/const/ASSISTANT =(1<<11) +var/global/const/BRIDGE =(1<<12) /proc/guest_jobbans(var/job) return ( (job in SSjob.get_job_titles_in_department(DEPARTMENT_COMMAND)) || (job in SSjob.get_job_titles_in_department(DEPARTMENT_SYNTHETIC)) || (job in SSjob.get_job_titles_in_department(DEPARTMENT_SECURITY)) ) diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index b1911bb08c..bbb0f5c27c 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -1,4 +1,4 @@ -var/list/whitelist = list() +var/global/list/whitelist = list() /hook/startup/proc/loadWhitelist() if(config.usewhitelist) @@ -14,7 +14,7 @@ var/list/whitelist = list() return FALSE return ("[M.ckey]" in whitelist) -/var/list/alien_whitelist = list() +var/global/list/alien_whitelist = list() /hook/startup/proc/loadAlienWhitelist() if(config.usealienwhitelist) @@ -73,7 +73,7 @@ var/list/whitelist = list() /proc/whitelist_overrides(mob/M) return !config.usealienwhitelist || check_rights(R_ADMIN|R_EVENT, 0, M) -/var/list/genemod_whitelist = list() +var/global/list/genemod_whitelist = list() /hook/startup/proc/LoadGenemodWhitelist() global.genemod_whitelist = file2list("config/genemodwhitelist.txt") return TRUE diff --git a/code/game/json.dm b/code/game/json.dm index 2a2bd78933..38b8de32e5 100644 --- a/code/game/json.dm +++ b/code/game/json.dm @@ -1,7 +1,7 @@ -var/jsonpath = "/home/bay12/public_html" -var/dmepath = "/home/bay12/git/baystation12.dme" -var/makejson = 1 //temp +var/global/jsonpath = "/home/bay12/public_html" +var/global/dmepath = "/home/bay12/git/baystation12.dme" +var/global/makejson = 1 //temp /proc/makejson() if(!makejson) diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index 2406cd5922..50f9b3e430 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -3,12 +3,12 @@ #define PRISON_STATION_AREATYPE "/area/shuttle/prison/station" //Type of the prison shuttle area for station #define PRISON_DOCK_AREATYPE "/area/shuttle/prison/prison" //Type of the prison shuttle area for dock -var/prison_shuttle_moving_to_station = 0 -var/prison_shuttle_moving_to_prison = 0 -var/prison_shuttle_at_station = 0 -var/prison_shuttle_can_send = 1 -var/prison_shuttle_time = 0 -var/prison_shuttle_timeleft = 0 +var/global/prison_shuttle_moving_to_station = 0 +var/global/prison_shuttle_moving_to_prison = 0 +var/global/prison_shuttle_at_station = 0 +var/global/prison_shuttle_can_send = 1 +var/global/prison_shuttle_time = 0 +var/global/prison_shuttle_timeleft = 0 /obj/machinery/computer/prison_shuttle name = "prison shuttle control console" diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index e69d57782c..52357ea6d6 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -4,12 +4,12 @@ #define SPECOPS_DOCK_AREATYPE "/area/shuttle/specops/centcom" //Type of the spec ops shuttle area for dock #define SPECOPS_RETURN_DELAY 600 //Time between the shuttle is capable of moving. -var/specops_shuttle_moving_to_station = 0 -var/specops_shuttle_moving_to_centcom = 0 -var/specops_shuttle_at_station = 0 -var/specops_shuttle_can_send = 1 -var/specops_shuttle_time = 0 -var/specops_shuttle_timeleft = 0 +var/global/specops_shuttle_moving_to_station = 0 +var/global/specops_shuttle_moving_to_centcom = 0 +var/global/specops_shuttle_at_station = 0 +var/global/specops_shuttle_can_send = 1 +var/global/specops_shuttle_time = 0 +var/global/specops_shuttle_timeleft = 0 /obj/machinery/computer/specops_shuttle name = "special operations shuttle control console" diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 6e21fd60c4..8723d554c5 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -1,4 +1,4 @@ -var/list/doppler_arrays = list() +var/global/list/doppler_arrays = list() /obj/machinery/doppler_array anchored = 1 diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index 9198bdb472..cd042a254c 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -1,4 +1,4 @@ -var/list/floor_light_cache = list() +var/global/list/floor_light_cache = list() /obj/machinery/floor_light name = "floor light" diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 1f922e1ee6..552fd9cd87 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -27,7 +27,7 @@ Possible to do for anyone motivated enough: #define RANGE_BASED 4 #define AREA_BASED 6 -var/const/HOLOPAD_MODE = RANGE_BASED +var/global/const/HOLOPAD_MODE = RANGE_BASED /obj/machinery/hologram/holopad name = "\improper AI holopad" diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index b67c3aedd5..bf6252281e 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -120,7 +120,7 @@ // PDA.new_news(annoncement) -var/datum/feed_network/news_network = new /datum/feed_network //The global news-network, which is coincidentally a global list. +var/global/datum/feed_network/news_network = new /datum/feed_network //The global news-network, which is coincidentally a global list. GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) /obj/machinery/newscaster diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index 61ee7ac5f6..bf92b5057b 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -1,4 +1,4 @@ -var/bomb_set +var/global/bomb_set /obj/machinery/nuclearbomb name = "\improper Nuclear Fission Explosive" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 900b30a98f..a0c6af6921 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -17,10 +17,10 @@ #define RCS_MESSAUTH 7 // Authentication before sending #define RCS_ANNOUNCE 8 // Send announcement -var/req_console_assistance = list() -var/req_console_supplies = list() -var/req_console_information = list() -var/list/obj/machinery/requests_console/allConsoles = list() +var/global/req_console_assistance = list() +var/global/req_console_supplies = list() +var/global/req_console_information = list() +var/global/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console name = "requests console" diff --git a/code/game/machinery/status_display_ai.dm b/code/game/machinery/status_display_ai.dm index abdc50ca52..ecd9815dd0 100644 --- a/code/game/machinery/status_display_ai.dm +++ b/code/game/machinery/status_display_ai.dm @@ -6,7 +6,7 @@ overlay = over ckey = key -var/list/ai_status_emotions = list( +var/global/list/ai_status_emotions = list( "Very Happy" = new /datum/ai_emotion("ai_veryhappy"), "Happy" = new /datum/ai_emotion("ai_happy"), "Neutral" = new /datum/ai_emotion("ai_neutral"), diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 0cad7da1c9..649e69d3c1 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -7,8 +7,8 @@ They receive their message from a server after the message has been logged. */ -var/list/recentmessages = list() // global list of recent messages broadcasted : used to circumvent massive radio spam -var/message_delay = 0 // To make sure restarting the recentmessages list is kept in sync +var/global/list/recentmessages = list() // global list of recent messages broadcasted : used to circumvent massive radio spam +var/global/message_delay = 0 // To make sure restarting the recentmessages list is kept in sync /obj/machinery/telecomms/broadcaster name = "Subspace Broadcaster" diff --git a/code/game/magic/Uristrunes.dm b/code/game/magic/Uristrunes.dm index cecbefc798..8efea35a6e 100644 --- a/code/game/magic/Uristrunes.dm +++ b/code/game/magic/Uristrunes.dm @@ -1,5 +1,5 @@ -var/list/word_to_uristrune_table = null +var/global/list/word_to_uristrune_table = null /proc/word_to_uristrune_bit(word) if(word_to_uristrune_table == null) @@ -57,7 +57,7 @@ var/list/word_to_uristrune_table = null return get_uristrune(bits, animated) -var/list/uristrune_cache = list() +var/global/list/uristrune_cache = list() /proc/get_uristrune(symbol_bits, animated = 0) var/lookup = "[symbol_bits]-[animated]" diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index 139092e4f0..9bcafefee8 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -420,14 +420,13 @@ /* * Egg */ -/var/const //for the status var - BURST = 0 - BURSTING = 1 - GROWING = 2 - GROWN = 3 - MIN_GROWTH_TIME = 1800 //time it takes to grow a hugger - MAX_GROWTH_TIME = 3000 +var/global/const/BURST = 0 +var/global/const/BURSTING = 1 +var/global/const/GROWING = 2 +var/global/const/GROWN = 3 +var/global/const/MIN_GROWTH_TIME = 1800 //time it takes to grow a hugger +var/global/const/MAX_GROWTH_TIME = 3000 /obj/effect/alien/egg desc = "It looks like a weird egg" diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index ea7178e91d..d2170f08b8 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -1,4 +1,4 @@ -var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list() +var/global/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list() /obj/effect/bump_teleporter name = "bump-teleporter" diff --git a/code/game/objects/explosion_recursive.dm b/code/game/objects/explosion_recursive.dm index 400820f49f..afe6bfb85d 100644 --- a/code/game/objects/explosion_recursive.dm +++ b/code/game/objects/explosion_recursive.dm @@ -8,9 +8,9 @@ -var/list/explosion_turfs = list() +var/global/list/explosion_turfs = list() -var/explosion_in_progress = 0 +var/global/explosion_in_progress = 0 /proc/explosion_rec(turf/epicenter, power) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 6770adf0d1..0496365b26 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -352,7 +352,7 @@ return //Defines which slots correspond to which slot flags -var/list/global/slot_flags_enumeration = list( +var/global/list/global/slot_flags_enumeration = list( "[slot_wear_mask]" = SLOT_MASK, "[slot_back]" = SLOT_BACK, "[slot_wear_suit]" = SLOT_OCLOTHING, diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 26bac91db2..9f7691a34b 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -1,4 +1,4 @@ -var/list/GPS_list = list() +var/global/list/GPS_list = list() /obj/item/gps name = "global positioning system" diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm index 9912e9f61f..b257b14024 100644 --- a/code/game/objects/items/devices/uplink_random_lists.dm +++ b/code/game/objects/items/devices/uplink_random_lists.dm @@ -1,5 +1,5 @@ -var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_random_selection/default() -var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random_selection/all() +var/global/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_random_selection/default() +var/global/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random_selection/all() /datum/uplink_random_item var/uplink_item // The uplink item diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm index f8709c255d..4d3b43873a 100644 --- a/code/game/objects/items/stacks/marker_beacons.dm +++ b/code/game/objects/items/stacks/marker_beacons.dm @@ -1,5 +1,5 @@ /*****************Marker Beacons**************************/ -var/list/marker_beacon_colors = list( +var/global/list/marker_beacon_colors = list( "Random" = FALSE, //not a true color, will pick a random color "Burgundy" = LIGHT_COLOR_FLARE, "Bronze" = LIGHT_COLOR_ORANGE, diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index bbf78d5cff..892d7df210 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -112,7 +112,7 @@ user.drop_l_hand() user.stop_pulling() -var/last_chew = 0 +var/global/last_chew = 0 /mob/living/carbon/human/RestrainedClickOn(var/atom/A) if (A != src) return ..() if (last_chew + 26 > world.time) return diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index 6ab8d5881c..5c52854e51 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -26,8 +26,8 @@ return INITIALIZE_HINT_QDEL -var/list/image/hazard_overlays -var/list/tape_roll_applications = list() +var/global/list/image/hazard_overlays +var/global/list/tape_roll_applications = list() /obj/item/tape name = "tape" diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index b8fe810e7e..39c4907e8a 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -2,7 +2,7 @@ * Donut Box */ -var/list/random_weighted_donuts = list( +var/global/list/random_weighted_donuts = list( /obj/item/reagent_containers/food/snacks/donut/plain = 5, /obj/item/reagent_containers/food/snacks/donut/plain/jelly = 5, /obj/item/reagent_containers/food/snacks/donut/pink = 4, @@ -101,4 +101,4 @@ var/list/random_weighted_donuts = list( /obj/item/storage/box/wormcan/deluxe/update_icon(var/itemremoved = 0) if (contents.len == 0) - icon_state = "wormcan_empty_deluxe" \ No newline at end of file + icon_state = "wormcan_empty_deluxe" diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 9a4c7c6d6a..6b187b21b7 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -1,6 +1,6 @@ #define TANK_IDEAL_PRESSURE 1015 //Arbitrary. -var/list/global/tank_gauge_cache = list() +var/global/list/global/tank_gauge_cache = list() /obj/item/tank name = "tank" diff --git a/code/game/objects/random/_random.dm b/code/game/objects/random/_random.dm index 6487de2fc4..887d7edbb7 100644 --- a/code/game/objects/random/_random.dm +++ b/code/game/objects/random/_random.dm @@ -44,8 +44,8 @@ if(build_path) return new build_path(drop_location()) -var/list/random_junk_ -var/list/random_useful_ +var/global/list/random_junk_ +var/global/list/random_useful_ /proc/get_random_useful_type() if(!random_useful_) random_useful_ = subtypesof(/obj/item/pen/crayon) @@ -103,7 +103,7 @@ var/list/random_useful_ // Multi Point Spawn // Selects one spawn point out of a group of points with the same ID and asks it to generate its items */ -var/list/multi_point_spawns +var/global/list/multi_point_spawns /obj/random_multi name = "random object spawn point" diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 2e1edabf89..7d4fa31c7e 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -3,9 +3,9 @@ var/global/send_emergency_team = 0 // Used for automagic response teams // 'admin_emergency_team' for admin-spawned response teams -var/ert_base_chance = 10 // Default base chance. Will be incremented by increment ERT chance. -var/can_call_ert -var/silent_ert = 0 +var/global/ert_base_chance = 10 // Default base chance. Will be incremented by increment ERT chance. +var/global/can_call_ert +var/global/silent_ert = 0 /client/proc/response_team() set name = "Dispatch Emergency Response Team" diff --git a/code/game/sound.dm b/code/game/sound.dm index 2d5e4fbb7b..07506f299d 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -226,5 +226,5 @@ return soundin //Are these even used? -var/list/keyboard_sound = list ('sound/effects/keyboard/keyboard1.ogg','sound/effects/keyboard/keyboard2.ogg','sound/effects/keyboard/keyboard3.ogg', 'sound/effects/keyboard/keyboard4.ogg') -var/list/bodyfall_sound = list('sound/effects/bodyfall1.ogg','sound/effects/bodyfall2.ogg','sound/effects/bodyfall3.ogg','sound/effects/bodyfall4.ogg') +var/global/list/keyboard_sound = list ('sound/effects/keyboard/keyboard1.ogg','sound/effects/keyboard/keyboard2.ogg','sound/effects/keyboard/keyboard3.ogg', 'sound/effects/keyboard/keyboard4.ogg') +var/global/list/bodyfall_sound = list('sound/effects/bodyfall1.ogg','sound/effects/bodyfall2.ogg','sound/effects/bodyfall3.ogg','sound/effects/bodyfall4.ogg') diff --git a/code/game/trader_visit.dm b/code/game/trader_visit.dm index 1c358ded97..34d5a9744f 100644 --- a/code/game/trader_visit.dm +++ b/code/game/trader_visit.dm @@ -1,7 +1,7 @@ //Based on the ERT setup var/global/send_beruang = 0 -var/can_call_traders = 1 +var/global/can_call_traders = 1 /client/proc/trader_ship() set name = "Dispatch Beruang Trader Ship" diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index f12eb0e559..3ce74460ce 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -1,4 +1,4 @@ -var/list/flooring_types +var/global/list/flooring_types /proc/populate_flooring_types() flooring_types = list() diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index 44d3076346..ef882518f4 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -1,7 +1,7 @@ // These are objects that destroy themselves and add themselves to the // decal list of the floor under them. Use them rather than distinct icon_states // when mapping in interesting floor designs. -var/list/floor_decals = list() +var/global/list/floor_decals = list() /obj/effect/floor_decal name = "floor decal" diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm index e82edc294d..e54cb262ee 100644 --- a/code/game/turfs/simulated/floor_icon.dm +++ b/code/game/turfs/simulated/floor_icon.dm @@ -1,6 +1,6 @@ -var/list/flooring_cache = list() +var/global/list/flooring_cache = list() -var/image/no_ceiling_image = null +var/global/image/no_ceiling_image = null /hook/startup/proc/setup_no_ceiling_image() cache_no_ceiling_image() diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 72c2229cb1..39bd4ca1b2 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -1,4 +1,4 @@ -var/list/turf_edge_cache = list() +var/global/list/turf_edge_cache = list() /turf // If greater than 0, this turf will apply edge overlays on top of other turfs cardinally adjacent to it, if those adjacent turfs are of a different icon_state, diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index d2753debe1..3a61ed5c4b 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -152,7 +152,7 @@ remove_modifiers_of_type(/datum/modifier/fire) inflict_water_damage(20 * amount) // Only things vulnerable to water will actually be harmed (slimes/prommies). -var/list/shoreline_icon_cache = list() +var/global/list/shoreline_icon_cache = list() /turf/simulated/floor/water/beach name = "beach shoreline" diff --git a/code/game/world.dm b/code/game/world.dm index 81078f642e..7e825f1bb2 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -63,8 +63,8 @@ return -var/world_topic_spam_protect_ip = "0.0.0.0" -var/world_topic_spam_protect_time = world.timeofday +var/global/world_topic_spam_protect_ip = "0.0.0.0" +var/global/world_topic_spam_protect_time = world.timeofday /world/Topic(T, addr, master, key) debug_log << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key][log_end]" @@ -542,8 +542,8 @@ var/world_topic_spam_protect_time = world.timeofday src.status = s #define FAILED_DB_CONNECTION_CUTOFF 5 -var/failed_db_connections = 0 -var/failed_old_db_connections = 0 +var/global/failed_db_connections = 0 +var/global/failed_old_db_connections = 0 /hook/startup/proc/connectDB() if(!config.sql_enabled) diff --git a/code/global.dm b/code/global.dm index 4d92c600c7..80d3a617af 100644 --- a/code/global.dm +++ b/code/global.dm @@ -16,12 +16,12 @@ var/global/datum/universal_state/universe = new var/global/list/global_map = null // Noises made when hit while typing. -var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF") -var/log_path = "data/logs/" //See world.dm for the full calculated path -var/diary = null -var/error_log = null -var/debug_log = null -var/href_logfile = null +var/global/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF") +var/global/log_path = "data/logs/" //See world.dm for the full calculated path +var/global/diary = null +var/global/error_log = null +var/global/debug_log = null +var/global/href_logfile = null // var/station_name = "Northern Star" // var/const/station_orig = "Northern Star" //station_name can't be const due to event prefix/suffix // var/const/station_short = "Northern Star" @@ -32,115 +32,115 @@ var/href_logfile = null // var/const/company_short = "NT" // var/const/star_name = "Vir" // var/const/starsys_name = "Vir" -var/const/game_version = "Polaris" -var/changelog_hash = "" -var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 552) -var/round_progressing = 1 +var/global/const/game_version = "Polaris" +var/global/changelog_hash = "" +var/global/game_year = (text2num(time2text(world.realtime, "YYYY")) + 552) +var/global/round_progressing = 1 -var/master_mode = "extended" // "extended" -var/secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode. +var/global/master_mode = "extended" // "extended" +var/global/secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode. -var/host = null //only here until check @ code\modules\ghosttrap\trap.dm:112 is fixed +var/global/host = null //only here until check @ code\modules\ghosttrap\trap.dm:112 is fixed -var/list/jobMax = list() -var/list/bombers = list() -var/list/admin_log = list() -var/list/lastsignalers = list() // Keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]" -var/list/lawchanges = list() // Stores who uploaded laws to which silicon-based lifeform, and what the law was. -var/list/reg_dna = list() +var/global/list/jobMax = list() +var/global/list/bombers = list() +var/global/list/admin_log = list() +var/global/list/lastsignalers = list() // Keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]" +var/global/list/lawchanges = list() // Stores who uploaded laws to which silicon-based lifeform, and what the law was. +var/global/list/reg_dna = list() -var/mouse_respawn_time = 5 // Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes. +var/global/mouse_respawn_time = 5 // Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes. -var/list/monkeystart = list() -var/list/wizardstart = list() -var/list/newplayer_start = list() +var/global/list/monkeystart = list() +var/global/list/wizardstart = list() +var/global/list/newplayer_start = list() //Spawnpoints. -var/list/latejoin = list() -var/list/latejoin_gateway = list() -var/list/latejoin_elevator = list() -var/list/latejoin_cryo = list() -var/list/latejoin_cyborg = list() -var/list/latejoin_checkpoint = list() +var/global/list/latejoin = list() +var/global/list/latejoin_gateway = list() +var/global/list/latejoin_elevator = list() +var/global/list/latejoin_cryo = list() +var/global/list/latejoin_cyborg = list() +var/global/list/latejoin_checkpoint = list() -var/list/prisonwarp = list() // Prisoners go to these -var/list/holdingfacility = list() // Captured people go here -var/list/xeno_spawn = list() // Aliens spawn at at these. -var/list/tdome1 = list() -var/list/tdome2 = list() -var/list/tdomeobserve = list() -var/list/tdomeadmin = list() -var/list/prisonsecuritywarp = list() // Prison security goes to these. -var/list/prisonwarped = list() // List of players already warped. -var/list/blobstart = list() -var/list/ninjastart = list() +var/global/list/prisonwarp = list() // Prisoners go to these +var/global/list/holdingfacility = list() // Captured people go here +var/global/list/xeno_spawn = list() // Aliens spawn at at these. +var/global/list/tdome1 = list() +var/global/list/tdome2 = list() +var/global/list/tdomeobserve = list() +var/global/list/tdomeadmin = list() +var/global/list/prisonsecuritywarp = list() // Prison security goes to these. +var/global/list/prisonwarped = list() // List of players already warped. +var/global/list/blobstart = list() +var/global/list/ninjastart = list() -var/list/cardinal = list(NORTH, SOUTH, EAST, WEST) -var/list/cardinalz = list(NORTH, SOUTH, EAST, WEST, UP, DOWN) -var/list/cornerdirs = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) -var/list/cornerdirsz = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTH|UP, EAST|UP, WEST|UP, SOUTH|UP, NORTH|DOWN, EAST|DOWN, WEST|DOWN, SOUTH|DOWN) -var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) -var/list/reverse_dir = list( // reverse_dir[dir] = reverse of dir +var/global/list/cardinal = list(NORTH, SOUTH, EAST, WEST) +var/global/list/cardinalz = list(NORTH, SOUTH, EAST, WEST, UP, DOWN) +var/global/list/cornerdirs = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) +var/global/list/cornerdirsz = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTH|UP, EAST|UP, WEST|UP, SOUTH|UP, NORTH|DOWN, EAST|DOWN, WEST|DOWN, SOUTH|DOWN) +var/global/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) +var/global/list/reverse_dir = list( // reverse_dir[dir] = reverse of dir 2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 32, 34, 33, 35, 40, 42, 41, 43, 36, 38, 37, 39, 44, 46, 45, 47, 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21, 23, 28, 30, 29, 31, 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63 ) -var/datum/configuration/config = null +var/global/datum/configuration/config = null -var/list/combatlog = list() -var/list/IClog = list() -var/list/OOClog = list() -var/list/adminlog = list() +var/global/list/combatlog = list() +var/global/list/IClog = list() +var/global/list/OOClog = list() +var/global/list/adminlog = list() -var/list/powernets = list() // TODO - Move into SSmachines +var/global/list/powernets = list() // TODO - Move into SSmachines -var/Debug2 = 0 -var/datum/debug/debugobj +var/global/Debug2 = 0 +var/global/datum/debug/debugobj -var/datum/moduletypes/mods = new() +var/global/datum/moduletypes/mods = new() -var/gravity_is_on = 1 +var/global/gravity_is_on = 1 -var/join_motd = null +var/global/join_motd = null -var/datum/metric/metric = new() // Metric datum, used to keep track of the round. +var/global/datum/metric/metric = new() // Metric datum, used to keep track of the round. -var/list/awaydestinations = list() // Away missions. A list of landmarks that the warpgate can take you to. +var/global/list/awaydestinations = list() // Away missions. A list of landmarks that the warpgate can take you to. // Forum MySQL configuration. (for use with forum account/key authentication) // These are all default values that will load should the forumdbconfig.txt file fail to read for whatever reason. -var/forumsqladdress = "localhost" -var/forumsqlport = "3306" -var/forumsqldb = "tgstation" -var/forumsqllogin = "root" -var/forumsqlpass = "" -var/forum_activated_group = "2" -var/forum_authenticated_group = "10" +var/global/forumsqladdress = "localhost" +var/global/forumsqlport = "3306" +var/global/forumsqldb = "tgstation" +var/global/forumsqllogin = "root" +var/global/forumsqlpass = "" +var/global/forum_activated_group = "2" +var/global/forum_authenticated_group = "10" // For FTP requests. (i.e. downloading runtime logs.) // However it'd be ok to use for accessing attack logs and such too, which are even laggier. -var/fileaccess_timer = 0 -var/custom_event_msg = null +var/global/fileaccess_timer = 0 +var/global/custom_event_msg = null // Database connections. A connection is established on world creation. // Ideally, the connection dies when the server restarts (After feedback logging.). -var/DBConnection/dbcon = new() // Feedback database (New database) -var/DBConnection/dbcon_old = new() // /tg/station database (Old database) -- see the files in the SQL folder for information on what goes where. +var/global/DBConnection/dbcon = new() // Feedback database (New database) +var/global/DBConnection/dbcon_old = new() // /tg/station database (Old database) -- see the files in the SQL folder for information on what goes where. // Added for Xenoarchaeology, might be useful for other stuff. var/global/list/alphabet_uppercase = 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") // Used by robots and robot preferences. -var/list/robot_module_types = list( +var/global/list/robot_module_types = list( "Standard", "Engineering", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Clerical", "Security", "Research" ) // Some scary sounds. -var/static/list/scarySounds = list( +var/global/static/list/scarySounds = list( 'sound/weapons/thudswoosh.ogg', 'sound/weapons/Taser.ogg', 'sound/weapons/armbomb.ogg', @@ -161,18 +161,18 @@ var/static/list/scarySounds = list( ) // Bomb cap! -var/max_explosion_range = 14 +var/global/max_explosion_range = 14 // Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it. var/global/obj/item/radio/intercom/omni/global_announcer = new /obj/item/radio/intercom/omni(null) -var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian") +var/global/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian") //Icons for in-game HUD glasses. Why don't we just share these a little bit? -var/static/icon/ingame_hud = icon('icons/mob/hud.dmi') -var/static/icon/ingame_hud_med = icon('icons/mob/hud_med.dmi') -var/static/icon/buildmode_hud = icon('icons/misc/buildmode.dmi') +var/global/static/icon/ingame_hud = icon('icons/mob/hud.dmi') +var/global/static/icon/ingame_hud_med = icon('icons/mob/hud_med.dmi') +var/global/static/icon/buildmode_hud = icon('icons/misc/buildmode.dmi') //Keyed list for caching icons so you don't need to make them for records, IDs, etc all separately. //Could be useful for AI impersonation or something at some point? -var/static/list/cached_character_icons = list() +var/global/static/list/cached_character_icons = list() diff --git a/code/js/byjax.dm b/code/js/byjax.dm index bf9d778989..38d4f8898b 100644 --- a/code/js/byjax.dm +++ b/code/js/byjax.dm @@ -1,5 +1,5 @@ //this function places received data into element with specified id. -var/const/js_byjax = {" +var/global/const/js_byjax = {" function replaceContent() { var args = Array.prototype.slice.call(arguments); diff --git a/code/js/menus.dm b/code/js/menus.dm index 69ff900db6..3b54b2da13 100644 --- a/code/js/menus.dm +++ b/code/js/menus.dm @@ -1,4 +1,4 @@ -var/const/js_dropdowns = {" +var/global/const/js_dropdowns = {" function dropdowns() { var divs = document.getElementsByTagName('div'); var headers = new Array(); diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 7bd0950e87..3cda3e1338 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -1,5 +1,5 @@ -var/CMinutes = null -var/savefile/Banlist +var/global/CMinutes = null +var/global/savefile/Banlist /proc/CheckBan(var/ckey, var/id, var/address) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 52b9ddcedd..523347124f 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -1,4 +1,4 @@ -var/list/admin_ranks = list() //list of all ranks with associated rights +var/global/list/admin_ranks = list() //list of all ranks with associated rights //load our rank - > rights associations /proc/load_admin_ranks() diff --git a/code/modules/admin/admin_report.dm b/code/modules/admin/admin_report.dm index 6a6a5d241e..76e0c59a02 100644 --- a/code/modules/admin/admin_report.dm +++ b/code/modules/admin/admin_report.dm @@ -24,7 +24,7 @@ else if(href_list["action"] == "edit") C.edit_report(text2num(href_list["ID"])) -var/datum/report_topic_handler/report_topic_handler +var/global/datum/report_topic_handler/report_topic_handler world/New() ..() diff --git a/code/modules/admin/admin_secrets.dm b/code/modules/admin/admin_secrets.dm index e830ebeab1..bc66cc15b7 100644 --- a/code/modules/admin/admin_secrets.dm +++ b/code/modules/admin/admin_secrets.dm @@ -1,4 +1,4 @@ -var/datum/admin_secrets/admin_secrets = new() +var/global/datum/admin_secrets/admin_secrets = new() /datum/admin_secrets var/list/datum/admin_secret_category/categories diff --git a/code/modules/admin/admin_verb_lists.dm b/code/modules/admin/admin_verb_lists.dm index 223e353e3b..215a90adf6 100644 --- a/code/modules/admin/admin_verb_lists.dm +++ b/code/modules/admin/admin_verb_lists.dm @@ -1,5 +1,5 @@ //admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless -var/list/admin_verbs_default = list( +var/global/list/admin_verbs_default = list( /datum/admins/proc/show_player_panel, //shows an interface for individual players, with various links (links require additional flags, /client/proc/player_panel_new, //shows an interface for all players, with links to various panels, /client/proc/player_panel, @@ -15,7 +15,7 @@ var/list/admin_verbs_default = list( // /client/proc/toggle_ahelp_sound, ) -var/list/admin_verbs_admin = list( +var/global/list/admin_verbs_admin = list( /datum/admins/proc/set_tcrystals, /datum/admins/proc/add_tcrystals, /client/proc/invisimin, //allows our mob to go invisible/visible, @@ -110,18 +110,18 @@ var/list/admin_verbs_admin = list( /client/proc/debug_global_variables ) -var/list/admin_verbs_ban = list( +var/global/list/admin_verbs_ban = list( /client/proc/unban_panel, /client/proc/jobbans ) -var/list/admin_verbs_sounds = list( +var/global/list/admin_verbs_sounds = list( /client/proc/play_local_sound, /client/proc/play_sound, /client/proc/play_server_sound ) -var/list/admin_verbs_fun = list( +var/global/list/admin_verbs_fun = list( /client/proc/object_talk, /datum/admins/proc/cmd_admin_dress, /client/proc/cmd_admin_gib_self, @@ -142,7 +142,7 @@ var/list/admin_verbs_fun = list( /client/proc/admin_lightning_strike, ) -var/list/admin_verbs_spawn = list( +var/global/list/admin_verbs_spawn = list( /datum/admins/proc/spawn_fruit, /datum/admins/proc/spawn_custom_item, /datum/admins/proc/check_custom_items, @@ -156,7 +156,7 @@ var/list/admin_verbs_spawn = list( /client/proc/map_template_load_on_new_z ) -var/list/admin_verbs_server = list( +var/global/list/admin_verbs_server = list( /datum/admins/proc/capture_map, /client/proc/Set_Holiday, /client/proc/ToRban, @@ -189,7 +189,7 @@ var/list/admin_verbs_server = list( /client/proc/dbcon_fix ) -var/list/admin_verbs_debug = list( +var/global/list/admin_verbs_debug = list( /client/proc/getruntimelog, //allows us to access runtime logs to somebody, /client/proc/cmd_admin_list_open_jobs, /client/proc/Debug2, @@ -240,25 +240,25 @@ var/list/admin_verbs_debug = list( /client/proc/reload_webhooks ) -var/list/admin_verbs_paranoid_debug = list( +var/global/list/admin_verbs_paranoid_debug = list( /client/proc/callproc, /client/proc/callproc_datum, /client/proc/debug_controller ) -var/list/admin_verbs_possess = list( +var/global/list/admin_verbs_possess = list( /proc/possess, /proc/release ) -var/list/admin_verbs_permissions = list( +var/global/list/admin_verbs_permissions = list( /client/proc/edit_admin_permissions ) -var/list/admin_verbs_rejuv = list( +var/global/list/admin_verbs_rejuv = list( /client/proc/respawn_character ) //verbs which can be hidden - needs work -var/list/admin_verbs_hideable = list( +var/global/list/admin_verbs_hideable = list( /client/proc/deadmin_self, // /client/proc/deadchat, /datum/admins/proc/show_traitor_panel, @@ -334,7 +334,7 @@ var/list/admin_verbs_hideable = list( /datum/admins/proc/set_tcrystals, /client/proc/debug_global_variables ) -var/list/admin_verbs_mod = list( +var/global/list/admin_verbs_mod = list( /client/proc/cmd_admin_pm_context, //right-click adminPM interface, /client/proc/cmd_admin_pm_panel, //admin-pm list, /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game., @@ -364,7 +364,7 @@ var/list/admin_verbs_mod = list( /datum/admins/proc/view_atk_log //shows the server combat-log, doesn't do anything presently, ) -var/list/admin_verbs_event_manager = list( +var/global/list/admin_verbs_event_manager = list( /client/proc/cmd_event_say, /client/proc/cmd_admin_pm_context, /client/proc/cmd_admin_pm_panel, diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 0bfa4e516a..c9e1bce8f2 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 -var/jobban_runonce // Updates legacy bans with new info -var/jobban_keylist[0] //to store the keys & ranks +var/global/jobban_runonce // Updates legacy bans with new info +var/global/jobban_keylist[0] //to store the keys & ranks /proc/jobban_fullban(mob/M, rank, reason) if (!M || !M.key) return diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index fc04317ef2..9dda44bc78 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -1,4 +1,4 @@ -/var/create_mob_html = null +var/global/create_mob_html = null /datum/admins/proc/create_mob(var/mob/user) if (!create_mob_html) var/mobjs = null diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index d7ea83ac05..2140ad3a41 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -1,4 +1,4 @@ -/var/create_object_html = null +var/global/create_object_html = null /datum/admins/proc/create_object(var/mob/user) if (!create_object_html) diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index f3de693055..7186b2da2e 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -1,4 +1,4 @@ -/var/create_turf_html = null +var/global/create_turf_html = null /datum/admins/proc/create_turf(var/mob/user) if (!create_turf_html) var/turfjs = null diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index eeab15eb8c..0895e9a8cd 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -1,4 +1,4 @@ -var/list/admin_datums = list() +var/global/list/admin_datums = list() /datum/admins var/rank = "Temporary Admin" diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index cbb28161ee..9c50bf352f 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -1,4 +1,4 @@ -var/savefile/Banlistjob +var/global/savefile/Banlistjob /proc/_jobban_isbanned(var/client/clientvar, var/rank) diff --git a/code/modules/admin/verbs/check_customitem_activity.dm b/code/modules/admin/verbs/check_customitem_activity.dm index 80bbfccc12..947e8baadf 100644 --- a/code/modules/admin/verbs/check_customitem_activity.dm +++ b/code/modules/admin/verbs/check_customitem_activity.dm @@ -1,5 +1,5 @@ -var/checked_for_inactives = 0 -var/inactive_keys = "None
" +var/global/checked_for_inactives = 0 +var/global/inactive_keys = "None
" /client/proc/check_customitem_activity() set category = "Admin" diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 4d1c323e61..ad2fa76ad1 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -19,8 +19,8 @@ //- Identify how hard it is to break into the area and where the weak points are //- Check if the area has too much empty space. If so, make it smaller and replace the rest with maintenance tunnels. -var/camera_range_display_status = 0 -var/intercom_range_display_status = 0 +var/global/camera_range_display_status = 0 +var/global/intercom_range_display_status = 0 GLOBAL_LIST_BOILERPLATE(all_debugging_effects, /obj/effect/debugging) @@ -125,7 +125,7 @@ GLOBAL_LIST_BOILERPLATE(all_debugging_effects, /obj/effect/debugging) qdel(F) feedback_add_details("admin_verb","mIRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -var/list/debug_verbs = list ( +var/global/list/debug_verbs = list ( /client/proc/do_not_use_these ,/client/proc/camera_view ,/client/proc/sec_camera_report diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 7df6891ce7..107e04dc24 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -1,4 +1,4 @@ -var/list/sounds_cache = list() +var/global/list/sounds_cache = list() /client/proc/play_sound(S as sound) set category = "Fun" diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index c0c64008c9..308c8524c7 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -1,5 +1,5 @@ //STRIKE TEAMS -var/const/commandos_possible = 6 //if more Commandos are needed in the future +var/global/const/commandos_possible = 6 //if more Commandos are needed in the future /client/proc/strike_team() set category = "Fun" diff --git a/code/modules/antagonist/alien/borer.dm b/code/modules/antagonist/alien/borer.dm index 2673774d1c..f866a13f90 100644 --- a/code/modules/antagonist/alien/borer.dm +++ b/code/modules/antagonist/alien/borer.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/borer/borers +var/global/datum/antagonist/borer/borers /datum/antagonist/borer id = MODE_BORER diff --git a/code/modules/antagonist/alien/xenomorph.dm b/code/modules/antagonist/alien/xenomorph.dm index 86cc06516a..3cb1093919 100644 --- a/code/modules/antagonist/alien/xenomorph.dm +++ b/code/modules/antagonist/alien/xenomorph.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/xenos/xenomorphs +var/global/datum/antagonist/xenos/xenomorphs /datum/antagonist/xenos id = MODE_XENOMORPH diff --git a/code/modules/antagonist/mutiny/loyalist.dm b/code/modules/antagonist/mutiny/loyalist.dm index 36feefc175..d0e421c53d 100644 --- a/code/modules/antagonist/mutiny/loyalist.dm +++ b/code/modules/antagonist/mutiny/loyalist.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/mutineer/loyalist/loyalists +var/global/datum/antagonist/mutineer/loyalist/loyalists /datum/antagonist/mutineer/loyalist role_text = "Loyalist" diff --git a/code/modules/antagonist/mutiny/mutineer.dm b/code/modules/antagonist/mutiny/mutineer.dm index 480fc83c70..180ac5786e 100644 --- a/code/modules/antagonist/mutiny/mutineer.dm +++ b/code/modules/antagonist/mutiny/mutineer.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/mutineer/mutineers +var/global/datum/antagonist/mutineer/mutineers /datum/antagonist/mutineer role_type = BE_MUTINEER diff --git a/code/modules/antagonist/outsider/commando.dm b/code/modules/antagonist/outsider/commando.dm index d0acbf61e7..622009eaa4 100644 --- a/code/modules/antagonist/outsider/commando.dm +++ b/code/modules/antagonist/outsider/commando.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/deathsquad/mercenary/commandos +var/global/datum/antagonist/deathsquad/mercenary/commandos /datum/antagonist/deathsquad/mercenary id = MODE_COMMANDO diff --git a/code/modules/antagonist/outsider/deathsquad.dm b/code/modules/antagonist/outsider/deathsquad.dm index 54ab78dd36..648b5330da 100644 --- a/code/modules/antagonist/outsider/deathsquad.dm +++ b/code/modules/antagonist/outsider/deathsquad.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/deathsquad/deathsquad +var/global/datum/antagonist/deathsquad/deathsquad /datum/antagonist/deathsquad id = MODE_DEATHSQUAD diff --git a/code/modules/antagonist/outsider/ert.dm b/code/modules/antagonist/outsider/ert.dm index a6bf49163f..c99e439466 100644 --- a/code/modules/antagonist/outsider/ert.dm +++ b/code/modules/antagonist/outsider/ert.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/ert/ert +var/global/datum/antagonist/ert/ert /datum/antagonist/ert id = MODE_ERT diff --git a/code/modules/antagonist/outsider/mercenary.dm b/code/modules/antagonist/outsider/mercenary.dm index 47f2cd85bc..ac38fa8bdf 100644 --- a/code/modules/antagonist/outsider/mercenary.dm +++ b/code/modules/antagonist/outsider/mercenary.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/mercenary/mercs +var/global/datum/antagonist/mercenary/mercs /datum/antagonist/mercenary id = MODE_MERCENARY diff --git a/code/modules/antagonist/outsider/ninja.dm b/code/modules/antagonist/outsider/ninja.dm index 15a2d64904..1ad79e97de 100644 --- a/code/modules/antagonist/outsider/ninja.dm +++ b/code/modules/antagonist/outsider/ninja.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/ninja/ninjas +var/global/datum/antagonist/ninja/ninjas /datum/antagonist/ninja id = MODE_NINJA diff --git a/code/modules/antagonist/outsider/raider.dm b/code/modules/antagonist/outsider/raider.dm index 7868420b14..0678a8f7d6 100644 --- a/code/modules/antagonist/outsider/raider.dm +++ b/code/modules/antagonist/outsider/raider.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/raider/raiders +var/global/datum/antagonist/raider/raiders /datum/antagonist/raider id = MODE_RAIDER diff --git a/code/modules/antagonist/outsider/technomancer.dm b/code/modules/antagonist/outsider/technomancer.dm index 60e813bcdd..6c10316c00 100644 --- a/code/modules/antagonist/outsider/technomancer.dm +++ b/code/modules/antagonist/outsider/technomancer.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/technomancer/technomancers +var/global/datum/antagonist/technomancer/technomancers /datum/antagonist/technomancer id = MODE_TECHNOMANCER diff --git a/code/modules/antagonist/outsider/trader.dm b/code/modules/antagonist/outsider/trader.dm index 9f09d492aa..45e7287cc5 100644 --- a/code/modules/antagonist/outsider/trader.dm +++ b/code/modules/antagonist/outsider/trader.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/trader/traders +var/global/datum/antagonist/trader/traders /datum/antagonist/trader id = MODE_TRADE diff --git a/code/modules/antagonist/outsider/wizard.dm b/code/modules/antagonist/outsider/wizard.dm index 925135821d..510d34e5d1 100644 --- a/code/modules/antagonist/outsider/wizard.dm +++ b/code/modules/antagonist/outsider/wizard.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/wizard/wizards +var/global/datum/antagonist/wizard/wizards /datum/antagonist/wizard id = MODE_WIZARD diff --git a/code/modules/antagonist/station/cultist.dm b/code/modules/antagonist/station/cultist.dm index 972bfa00b6..e111513023 100644 --- a/code/modules/antagonist/station/cultist.dm +++ b/code/modules/antagonist/station/cultist.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/cultist/cult +var/global/datum/antagonist/cultist/cult /proc/iscultist(var/mob/player) if(!cult || !player.mind) diff --git a/code/modules/antagonist/station/infiltrator.dm b/code/modules/antagonist/station/infiltrator.dm index 36e3717e14..6d5aa20520 100644 --- a/code/modules/antagonist/station/infiltrator.dm +++ b/code/modules/antagonist/station/infiltrator.dm @@ -1,6 +1,6 @@ // Infiltrator is a variant of Traitor, except that the traitors are in a team and can communicate with a special headset. -var/datum/antagonist/traitor/infiltrator/infiltrators +var/global/datum/antagonist/traitor/infiltrator/infiltrators // Inherits most of its vars from the base datum. /datum/antagonist/traitor/infiltrator diff --git a/code/modules/antagonist/station/loyalist.dm b/code/modules/antagonist/station/loyalist.dm index ec27584426..992332528a 100644 --- a/code/modules/antagonist/station/loyalist.dm +++ b/code/modules/antagonist/station/loyalist.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/loyalists/loyalists +var/global/datum/antagonist/loyalists/loyalists /datum/antagonist/loyalists id = MODE_LOYALIST diff --git a/code/modules/antagonist/station/renegade.dm b/code/modules/antagonist/station/renegade.dm index 3d228e96d7..f092ddd5b2 100644 --- a/code/modules/antagonist/station/renegade.dm +++ b/code/modules/antagonist/station/renegade.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/renegade/renegades +var/global/datum/antagonist/renegade/renegades /datum/antagonist/renegade id = MODE_RENEGADE diff --git a/code/modules/antagonist/station/revolutionary.dm b/code/modules/antagonist/station/revolutionary.dm index 8f6a7c79e9..492dc40e86 100644 --- a/code/modules/antagonist/station/revolutionary.dm +++ b/code/modules/antagonist/station/revolutionary.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/revolutionary/revs +var/global/datum/antagonist/revolutionary/revs /datum/antagonist/revolutionary id = MODE_REVOLUTIONARY diff --git a/code/modules/antagonist/station/rogue_ai.dm b/code/modules/antagonist/station/rogue_ai.dm index e1b73b064b..02eeb7dd02 100644 --- a/code/modules/antagonist/station/rogue_ai.dm +++ b/code/modules/antagonist/station/rogue_ai.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/rogue_ai/malf +var/global/datum/antagonist/rogue_ai/malf /datum/antagonist/rogue_ai id = MODE_MALFUNCTION diff --git a/code/modules/antagonist/station/stowaway.dm b/code/modules/antagonist/station/stowaway.dm index 574fda0bca..cf31511e09 100644 --- a/code/modules/antagonist/station/stowaway.dm +++ b/code/modules/antagonist/station/stowaway.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/stowaway/stowaways +var/global/datum/antagonist/stowaway/stowaways /datum/antagonist/STOWAWAY id = MODE_STOWAWAY diff --git a/code/modules/antagonist/station/thug.dm b/code/modules/antagonist/station/thug.dm index f26d6441a8..0e4bbdb043 100644 --- a/code/modules/antagonist/station/thug.dm +++ b/code/modules/antagonist/station/thug.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/thug/thugs +var/global/datum/antagonist/thug/thugs /datum/antagonist/THUG id = MODE_THUG diff --git a/code/modules/antagonist/station/traitor.dm b/code/modules/antagonist/station/traitor.dm index 04dfeb8ffa..4b75418d96 100644 --- a/code/modules/antagonist/station/traitor.dm +++ b/code/modules/antagonist/station/traitor.dm @@ -1,4 +1,4 @@ -var/datum/antagonist/traitor/traitors +var/global/datum/antagonist/traitor/traitors // Inherits most of its vars from the base datum. /datum/antagonist/traitor diff --git a/code/modules/blob2/blobs/core.dm b/code/modules/blob2/blobs/core.dm index 300eb0490f..d96df3c5de 100644 --- a/code/modules/blob2/blobs/core.dm +++ b/code/modules/blob2/blobs/core.dm @@ -1,4 +1,4 @@ -var/list/blob_cores = list() +var/global/list/blob_cores = list() /obj/structure/blob/core name = "blob core" diff --git a/code/modules/blob2/blobs/node.dm b/code/modules/blob2/blobs/node.dm index 77a7cb91c8..7ec9dc9de4 100644 --- a/code/modules/blob2/blobs/node.dm +++ b/code/modules/blob2/blobs/node.dm @@ -1,4 +1,4 @@ -var/list/blob_nodes = list() +var/global/list/blob_nodes = list() /obj/structure/blob/node name = "blob node" diff --git a/code/modules/blob2/overmind/overmind.dm b/code/modules/blob2/overmind/overmind.dm index 6df0cba629..79f6684b74 100644 --- a/code/modules/blob2/overmind/overmind.dm +++ b/code/modules/blob2/overmind/overmind.dm @@ -1,4 +1,4 @@ -var/list/overminds = list() +var/global/list/overminds = list() /mob/observer/blob name = "Blob Overmind" diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm index bc881a0500..ef737142a5 100644 --- a/code/modules/busy_space/air_traffic.dm +++ b/code/modules/busy_space/air_traffic.dm @@ -1,6 +1,6 @@ //Cactus, Speedbird, Dynasty, oh my -var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller +var/global/datum/lore/atc_controller/atc = new/datum/lore/atc_controller /datum/lore/atc_controller var/delay_max = 25 MINUTES //How long between ATC traffic, max. Default is 25 mins. diff --git a/code/modules/busy_space/loremaster.dm b/code/modules/busy_space/loremaster.dm index 28dca0055b..b20d873ff5 100644 --- a/code/modules/busy_space/loremaster.dm +++ b/code/modules/busy_space/loremaster.dm @@ -1,6 +1,6 @@ //I AM THE LOREMASTER, ARE YOU THE GATEKEEPER? -var/datum/lore/loremaster/loremaster = new/datum/lore/loremaster +var/global/datum/lore/loremaster/loremaster = new/datum/lore/loremaster /datum/lore/loremaster var/list/organizations = list() diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm index 48ca8ca28b..1e6f4ed11c 100644 --- a/code/modules/client/preference_setup/global/setting_datums.dm +++ b/code/modules/client/preference_setup/global/setting_datums.dm @@ -1,6 +1,6 @@ -var/list/_client_preferences -var/list/_client_preferences_by_key -var/list/_client_preferences_by_type +var/global/list/_client_preferences +var/global/list/_client_preferences_by_key +var/global/list/_client_preferences_by_type /proc/get_client_preferences() if(!_client_preferences) diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/code/modules/client/preference_setup/loadout/gear_tweaks.dm index 344eaf09e0..efaf43d311 100644 --- a/code/modules/client/preference_setup/loadout/gear_tweaks.dm +++ b/code/modules/client/preference_setup/loadout/gear_tweaks.dm @@ -151,7 +151,7 @@ Custom Name */ -var/datum/gear_tweak/custom_name/gear_tweak_free_name = new() +var/global/datum/gear_tweak/custom_name/gear_tweak_free_name = new() /datum/gear_tweak/custom_name var/list/valid_custom_names @@ -182,7 +182,7 @@ var/datum/gear_tweak/custom_name/gear_tweak_free_name = new() /* Custom Description */ -var/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new() +var/global/datum/gear_tweak/custom_desc/gear_tweak_free_desc = new() /datum/gear_tweak/custom_desc var/list/valid_custom_desc diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index d10412663e..5e2b8fff5c 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -1,5 +1,5 @@ -var/list/loadout_categories = list() -var/list/gear_datums = list() +var/global/list/loadout_categories = list() +var/global/list/gear_datums = list() /datum/loadout_category var/category = "" diff --git a/code/modules/client/preference_setup/traits/traits.dm b/code/modules/client/preference_setup/traits/traits.dm index c715e2539a..be13fe1da8 100644 --- a/code/modules/client/preference_setup/traits/traits.dm +++ b/code/modules/client/preference_setup/traits/traits.dm @@ -1,6 +1,6 @@ -var/list/trait_datums = list() // Assoc list using name = instance. Traits are saved as a list of strings. -var/list/trait_type_to_ref = list() // Similar to above but uses paths, which is more reliable but more risky to save. -var/list/trait_categories = list() // The categories available for the trait menu. +var/global/list/trait_datums = list() // Assoc list using name = instance. Traits are saved as a list of strings. +var/global/list/trait_type_to_ref = list() // Similar to above but uses paths, which is more reliable but more risky to save. +var/global/list/trait_categories = list() // The categories available for the trait menu. /hook/startup/proc/populate_trait_list() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index cee7f69c79..ac0140afc3 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1,6 +1,6 @@ #define SAVE_RESET -1 -var/list/preferences_datums = list() +var/global/list/preferences_datums = list() /datum/preferences //doohickeys for savefiles diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm index 97b48b74ee..5e204c3083 100644 --- a/code/modules/client/preferences_spawnpoints.dm +++ b/code/modules/client/preferences_spawnpoints.dm @@ -1,4 +1,4 @@ -var/list/spawntypes = list() +var/global/list/spawntypes = list() /proc/populate_spawn_points() spawntypes = list() diff --git a/code/modules/client/ui_style.dm b/code/modules/client/ui_style.dm index bcf580bd47..f24d802b81 100644 --- a/code/modules/client/ui_style.dm +++ b/code/modules/client/ui_style.dm @@ -1,6 +1,6 @@ -/var/all_ui_styles = list( +var/global/all_ui_styles = list( "Midnight" = 'icons/mob/screen/midnight.dmi', "Orange" = 'icons/mob/screen/orange.dmi', "old" = 'icons/mob/screen/old.dmi', @@ -10,7 +10,7 @@ "Hologram" = 'icons/mob/screen/holo.dmi' ) -/var/all_ui_styles_robot = list( +var/global/all_ui_styles_robot = list( "Midnight" = 'icons/mob/screen1_robot.dmi', "Orange" = 'icons/mob/screen1_robot.dmi', "old" = 'icons/mob/screen1_robot.dmi', diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index bbfe887ddf..268f44e539 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -17,7 +17,7 @@ // If hooded, have [kit_icon]_suit_t in both files for the hood-up version. // If not using the default overlay, have [kit_icon]_light in both files for custom light overlays. -/var/list/custom_items = list() +var/global/list/custom_items = list() /datum/custom_item var/assoc_key diff --git a/code/modules/detectivework/forensics.dm b/code/modules/detectivework/forensics.dm index 9e7e0d2c88..4461ea9fdd 100644 --- a/code/modules/detectivework/forensics.dm +++ b/code/modules/detectivework/forensics.dm @@ -4,7 +4,7 @@ //This is the output of the stringpercent(print) proc, and means about 80% of //the print must be there for it to be complete. (Prints are 32 digits) -var/const/FINGERPRINT_COMPLETE = 6 +var/global/const/FINGERPRINT_COMPLETE = 6 /proc/is_complete_print(var/print) return stringpercent(print) <= FINGERPRINT_COMPLETE diff --git a/code/modules/economy/TradeDestinations.dm b/code/modules/economy/TradeDestinations.dm index 8225e34efc..bb202bc58d 100644 --- a/code/modules/economy/TradeDestinations.dm +++ b/code/modules/economy/TradeDestinations.dm @@ -1,6 +1,6 @@ -var/list/weighted_randomevent_locations = list() -var/list/weighted_mundaneevent_locations = list() +var/global/list/weighted_randomevent_locations = list() +var/global/list/weighted_mundaneevent_locations = list() /datum/trade_destination var/name = "" diff --git a/code/modules/effects/vfx/steam.dm b/code/modules/effects/vfx/steam.dm index cb1f4b5989..a85bee63bc 100644 --- a/code/modules/effects/vfx/steam.dm +++ b/code/modules/effects/vfx/steam.dm @@ -7,7 +7,7 @@ // will always spawn at the items location, even if it's moved. /* Example: -var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() -- creates new system +var/global/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() -- creates new system steam.set_up(5, 0, mob.loc) -- sets up variables OPTIONAL: steam.attach(mob) steam.start() -- spawns the effect diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm index 8651c933b1..5da686616a 100644 --- a/code/modules/emotes/definitions/_mob.dm +++ b/code/modules/emotes/definitions/_mob.dm @@ -1,4 +1,4 @@ -var/list/_default_mob_emotes = list( +var/global/list/_default_mob_emotes = list( /decl/emote/visible, /decl/emote/visible/scratch, /decl/emote/visible/drool, diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 55eccbe2ab..e760d43777 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -20,7 +20,7 @@ sleep(2400) */ -var/list/event_last_fired = list() +var/global/list/event_last_fired = list() //Always triggers an event when called, dynamically chooses events based on job population /proc/spawn_dynamic_event() diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index 6c8760cc11..c8e2dca06a 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -67,7 +67,7 @@ else return meteors_minor -/var/list/meteors_minor = list( +var/global/list/meteors_minor = list( /obj/effect/meteor/medium = 80, /obj/effect/meteor/dust = 30, /obj/effect/meteor/irradiated = 30, @@ -77,7 +77,7 @@ ///obj/effect/meteor/silver = 10, ) -/var/list/meteors_moderate = list( +var/global/list/meteors_moderate = list( /obj/effect/meteor/medium = 80, /obj/effect/meteor/big = 30, /obj/effect/meteor/dust = 30, @@ -88,7 +88,7 @@ /obj/effect/meteor/emp = 10, ) -/var/list/meteors_major = list( +var/global/list/meteors_major = list( /obj/effect/meteor/medium = 80, /obj/effect/meteor/big = 30, /obj/effect/meteor/dust = 30, diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 5d399bdfe3..b8548c99c8 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -1,5 +1,5 @@ -var/list/dreams = list( +var/global/list/dreams = list( "an ID card","a bottle","a familiar face","a crewmember","a toolbox","a Security Officer","the Site Manager", "voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness", "light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun", diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index be92f0d19b..1dbfa2d819 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -11,13 +11,13 @@ Gunshots/explosions/opening doors/less rare audio (done) */ -/mob/living/carbon/var - image/halimage - image/halbody - obj/halitem - hal_screwyhud = 0 //1 - critical, 2 - dead, 3 - oxygen indicator, 4 - toxin indicator - handling_hal = 0 - hal_crit = 0 +/mob/living/carbon + var/image/halimage + var/image/halbody + var/obj/halitem + var/hal_screwyhud = 0 //1 - critical, 2 - dead, 3 - oxygen indicator, 4 - toxin indicator + var/handling_hal = 0 + var/hal_crit = 0 /mob/living/carbon/proc/handle_hallucinations() if(handling_hal) return @@ -334,7 +334,7 @@ Gunshots/explosions/opening doors/less rare audio (done) qdel(O) return -var/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_magazine/s357,\ +var/global/list/non_fakeattack_weapons = list(/obj/item/gun/projectile, /obj/item/ammo_magazine/s357,\ /obj/item/gun/energy/crossbow, /obj/item/melee/energy/sword,\ /obj/item/storage/box/syndicate, /obj/item/storage/box/emps,\ /obj/item/cartridge/syndicate, /obj/item/clothing/under/chameleon,\ diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index 8090c68b4f..64ab230fe6 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -1,9 +1,9 @@ #define DRINK_ICON_FILE 'icons/pdrink.dmi' -/var/const/DRINK_FIZZ = "fizz" -/var/const/DRINK_ICE = "ice" -/var/const/DRINK_ICON_DEFAULT = "" -/var/const/DRINK_ICON_NOISY = "_noise" +var/global/const/DRINK_FIZZ = "fizz" +var/global/const/DRINK_ICE = "ice" +var/global/const/DRINK_ICON_DEFAULT = "" +var/global/const/DRINK_ICON_NOISY = "_noise" /obj/item/reagent_containers/food/drinks/glass2 name = "glass" // Name when empty diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm index 1c409d04cd..516084b588 100644 --- a/code/modules/food/food/lunch.dm +++ b/code/modules/food/food/lunch.dm @@ -1,4 +1,4 @@ -var/list/lunchables_lunches_ = list(/obj/item/reagent_containers/food/snacks/sandwich, +var/global/list/lunchables_lunches_ = list(/obj/item/reagent_containers/food/snacks/sandwich, /obj/item/reagent_containers/food/snacks/slice/meatbread/filled, /obj/item/reagent_containers/food/snacks/slice/tofubread/filled, /obj/item/reagent_containers/food/snacks/slice/creamcheesebread/filled, @@ -28,7 +28,7 @@ var/list/lunchables_lunches_ = list(/obj/item/reagent_containers/food/snacks/san /obj/item/reagent_containers/food/snacks/quicheslice/filled, /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose) -var/list/lunchables_snacks_ = list(/obj/item/reagent_containers/food/snacks/donut/plain/jelly, +var/global/list/lunchables_snacks_ = list(/obj/item/reagent_containers/food/snacks/donut/plain/jelly, /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly, /obj/item/reagent_containers/food/snacks/muffin, /obj/item/reagent_containers/food/snacks/popcorn, @@ -78,7 +78,7 @@ var/list/lunchables_snacks_ = list(/obj/item/reagent_containers/food/snacks/donu /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie ) -var/list/lunchables_drinks_ = list(/obj/item/reagent_containers/food/drinks/cans/cola, +var/global/list/lunchables_drinks_ = list(/obj/item/reagent_containers/food/drinks/cans/cola, /obj/item/reagent_containers/food/drinks/cans/waterbottle, /obj/item/reagent_containers/food/drinks/cans/decaf_cola, /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind, @@ -101,7 +101,7 @@ var/list/lunchables_drinks_ = list(/obj/item/reagent_containers/food/drinks/cans ) // This default list is a bit different, it contains items we don't want -var/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing, +var/global/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing, /datum/reagent/drink/doctor_delight, /datum/reagent/drink/dry_ramen, /datum/reagent/drink/hell_ramen, @@ -110,7 +110,7 @@ var/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing, // This default list is a bit different, it contains items we don't want -var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit, +var/global/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit, /datum/reagent/ethanol/atomicbomb, /datum/reagent/ethanol/beepsky_smash, /datum/reagent/ethanol/coffee, diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index c9cb3e8214..f0df593fca 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -1,7 +1,7 @@ // This system is used to grab a ghost from observers with the required preferences and // lack of bans set. See posibrain.dm for an example of how they are called/used. ~Z -var/list/ghost_traps +var/global/list/ghost_traps /proc/get_ghost_trap(var/trap_key) if(!ghost_traps) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 4f7a09fd49..e0eda96abd 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -363,7 +363,7 @@ icon = 'icons/obj/hydroponics_misc.dmi' icon_state = "" -var/list/fruit_icon_cache = list() +var/global/list/fruit_icon_cache = list() /obj/item/reagent_containers/food/snacks/fruit_slice/Initialize(var/ml, var/datum/seed/S) . = ..(ml) diff --git a/code/modules/icon generation/Uristrunes.dm b/code/modules/icon generation/Uristrunes.dm index 8dfe135a72..a90cb3cc6f 100644 --- a/code/modules/icon generation/Uristrunes.dm +++ b/code/modules/icon generation/Uristrunes.dm @@ -143,7 +143,7 @@ return base -var/list/rune_animation = list( +var/global/list/rune_animation = list( list(0.000, 5), list(0.020, 1), list(0.050, 1), @@ -168,7 +168,7 @@ var/list/rune_animation = list( list(0.125, 1), ) -/var/list/rune_cache = list() +var/global/list/rune_cache = list() /proc/get_rune(rune_bits, animated = 0) var/lookup = "[rune_bits]-[animated]" diff --git a/code/modules/integrated_electronics/_defines.dm b/code/modules/integrated_electronics/_defines.dm index 80b740d45a..a8cf8d6d21 100644 --- a/code/modules/integrated_electronics/_defines.dm +++ b/code/modules/integrated_electronics/_defines.dm @@ -36,7 +36,7 @@ // Data limits. #define IC_MAX_LIST_LENGTH 200 -var/list/all_integrated_circuits = list() +var/global/list/all_integrated_circuits = list() /proc/initialize_integrated_circuits_list() for(var/thing in typesof(/obj/item/integrated_circuit)) diff --git a/code/modules/lighting/lighting_corner.dm b/code/modules/lighting/lighting_corner.dm index 30230a69e0..888ae10d29 100644 --- a/code/modules/lighting/lighting_corner.dm +++ b/code/modules/lighting/lighting_corner.dm @@ -1,11 +1,11 @@ -/var/total_lighting_corners = 0 -/var/datum/lighting_corner/dummy/dummy_lighting_corner = new +var/global/total_lighting_corners = 0 +var/global/datum/lighting_corner/dummy/dummy_lighting_corner = new // Because we can control each corner of every lighting overlay. // And corners get shared between multiple turfs (unless you're on the corners of the map, then 1 corner doesn't). // For the record: these should never ever ever be deleted, even if the turf doesn't have dynamic lighting. // This list is what the code that assigns corners listens to, the order in this list is the order in which corners are added to the /turf/corners list. -/var/list/LIGHTING_CORNER_DIAGONAL = list(NORTHEAST, SOUTHEAST, SOUTHWEST, NORTHWEST) +var/global/list/LIGHTING_CORNER_DIAGONAL = list(NORTHEAST, SOUTHEAST, SOUTHWEST, NORTHWEST) /datum/lighting_corner var/list/turf/masters = list() diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm index 9efb4549a8..504e14e216 100644 --- a/code/modules/lighting/lighting_overlay.dm +++ b/code/modules/lighting/lighting_overlay.dm @@ -1,4 +1,4 @@ -/var/total_lighting_overlays = 0 +var/global/total_lighting_overlays = 0 /atom/movable/lighting_overlay name = "" mouse_opacity = 0 diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index a25de730a3..2d5e8abce7 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -1,4 +1,4 @@ -/var/total_lighting_sources = 0 +var/global/total_lighting_sources = 0 // This is where the fun begins. // These are the main datums that emit light. diff --git a/code/modules/maps/swapmaps.dm b/code/modules/maps/swapmaps.dm index 5ec962f5c9..9ff14e5505 100644 --- a/code/modules/maps/swapmaps.dm +++ b/code/modules/maps/swapmaps.dm @@ -494,19 +494,19 @@ atom // 'monster.dmi'="monster",\ // ... // 'item.dmi'="item") -var/list/swapmaps_iconcache +var/global/list/swapmaps_iconcache // preferred mode; sav or text -var/const/SWAPMAPS_SAV=0 -var/const/SWAPMAPS_TEXT=1 -var/swapmaps_mode=SWAPMAPS_SAV +var/global/const/SWAPMAPS_SAV=0 +var/global/const/SWAPMAPS_TEXT=1 +var/global/swapmaps_mode=SWAPMAPS_SAV -var/swapmaps_compiled_maxx -var/swapmaps_compiled_maxy -var/swapmaps_compiled_maxz -var/swapmaps_initialized -var/swapmaps_loaded -var/swapmaps_byname +var/global/swapmaps_compiled_maxx +var/global/swapmaps_compiled_maxy +var/global/swapmaps_compiled_maxz +var/global/swapmaps_initialized +var/global/swapmaps_loaded +var/global/swapmaps_byname /proc/InitializeSwapMaps() if(swapmaps_initialized) return diff --git a/code/modules/materials/materials/_materials.dm b/code/modules/materials/materials/_materials.dm index 1729551f03..1ab3114cbf 100644 --- a/code/modules/materials/materials/_materials.dm +++ b/code/modules/materials/materials/_materials.dm @@ -36,7 +36,7 @@ */ // Assoc list containing all material datums indexed by name. -var/list/name_to_material +var/global/list/name_to_material //Returns the material the object is made of, if applicable. //Will we ever need to return more than one value here? Or should we just return the "dominant" material. diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 2183d6a136..edd7da3dc7 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -1,4 +1,4 @@ -var/list/mining_overlay_cache = list() +var/global/list/mining_overlay_cache = list() /**********************Mineral deposits**************************/ /turf/unsimulated/mineral diff --git a/code/modules/mob/gender.dm b/code/modules/mob/gender.dm index 0e9bf244b5..06f2fa5933 100644 --- a/code/modules/mob/gender.dm +++ b/code/modules/mob/gender.dm @@ -1,5 +1,5 @@ -/var/list/gender_datums = list() +var/global/list/gender_datums = list() /hook/startup/proc/populate_gender_datum_list() for(var/type in typesof(/datum/gender)) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 2c086026dd..9d912c9cb8 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -1,4 +1,4 @@ -var/list/holder_mob_icon_cache = list() +var/global/list/holder_mob_icon_cache = list() //Helper object for picking dionaea (and other creatures) up. /obj/item/holder diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 2139b78e50..3534a3a482 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -1,5 +1,5 @@ //The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot. -var/list/slot_equipment_priority = list( \ +var/global/list/slot_equipment_priority = list( \ slot_back,\ slot_wear_id,\ slot_w_uniform,\ diff --git a/code/modules/mob/living/carbon/alien/diona/diona.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm index 9bcbf1c4fe..710cb39c25 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona.dm @@ -1,4 +1,4 @@ -var/list/_nymph_default_emotes = list( +var/global/list/_nymph_default_emotes = list( /decl/emote/visible, /decl/emote/visible/scratch, /decl/emote/visible/drool, diff --git a/code/modules/mob/living/carbon/alien/emote.dm b/code/modules/mob/living/carbon/alien/emote.dm index cb7ab9b7b0..1bfa2957b1 100644 --- a/code/modules/mob/living/carbon/alien/emote.dm +++ b/code/modules/mob/living/carbon/alien/emote.dm @@ -1,4 +1,4 @@ -var/list/_alien_default_emotes = list( +var/global/list/_alien_default_emotes = list( /decl/emote/visible, /decl/emote/visible/scratch, /decl/emote/visible/drool, diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index ea691bae4e..4fb3e6c917 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -1,4 +1,4 @@ -var/list/_brain_default_emotes = list( +var/global/list/_brain_default_emotes = list( /decl/emote/audible/alarm, /decl/emote/audible/alert, /decl/emote/audible/notice, diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 1ab9df5813..d4a894050c 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -1,4 +1,4 @@ -var/list/_human_default_emotes = list( +var/global/list/_human_default_emotes = list( /decl/emote/visible/blink, /decl/emote/audible/synth, /decl/emote/audible/synth/ping, diff --git a/code/modules/mob/living/carbon/human/species/species_helpers.dm b/code/modules/mob/living/carbon/human/species/species_helpers.dm index 3152312f1c..6db19fa655 100644 --- a/code/modules/mob/living/carbon/human/species/species_helpers.dm +++ b/code/modules/mob/living/carbon/human/species/species_helpers.dm @@ -1,4 +1,4 @@ -var/list/stored_shock_by_ref = list() +var/global/list/stored_shock_by_ref = list() /mob/living/proc/apply_stored_shock_to(var/mob/living/target) if(stored_shock_by_ref["\ref[src]"]) diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm index 1691d87bb2..192928785e 100644 --- a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm +++ b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm @@ -1,7 +1,7 @@ // This is something of an intermediary species used for species that // need to emulate the appearance of another race. Currently it is only // used for slimes but it may be useful for changelings later. -var/list/wrapped_species_by_ref = list() +var/global/list/wrapped_species_by_ref = list() /datum/species/shapeshifter diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index c42644a80e..71657c63fd 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -1,4 +1,4 @@ -var/datum/species/shapeshifter/promethean/prometheans +var/global/datum/species/shapeshifter/promethean/prometheans // Species definition follows. /datum/species/shapeshifter/promethean diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm index b04a387139..83388b1255 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm @@ -2,11 +2,11 @@ //TODO: Make these simple_animals /* //Commented out as reference for future reproduction methods, or addition later if needed. - Mech -var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone -var/const/MAX_IMPREGNATION_TIME = 150 +var/global/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone +var/global/const/MAX_IMPREGNATION_TIME = 150 -var/const/MIN_ACTIVE_TIME = 200 //time between being dropped and going idle -var/const/MAX_ACTIVE_TIME = 400 +var/global/const/MIN_ACTIVE_TIME = 200 //time between being dropped and going idle +var/global/const/MAX_ACTIVE_TIME = 400 /obj/item/clothing/mask/facehugger name = "alien" diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 025610a405..c785624b95 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -1,4 +1,4 @@ -var/list/department_radio_keys = list( +var/global/list/department_radio_keys = list( ":r" = "right ear", ".r" = "right ear", ":l" = "left ear", ".l" = "left ear", ":i" = "intercom", ".i" = "intercom", @@ -58,7 +58,7 @@ var/list/department_radio_keys = list( ) -var/list/channel_to_radio_key = new +var/global/list/channel_to_radio_key = new /proc/get_radio_key_from_channel(var/channel) var/key = channel_to_radio_key[channel] if(!key) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index d5c2ef9095..7f5449f344 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -1,7 +1,7 @@ #define AI_CHECK_WIRELESS 1 #define AI_CHECK_RADIO 2 -var/list/ai_verbs_default = list( +var/global/list/ai_verbs_default = list( // /mob/living/silicon/ai/proc/ai_recall_shuttle, /mob/living/silicon/ai/proc/ai_emergency_message, /mob/living/silicon/ai/proc/ai_goto_location, diff --git a/code/modules/mob/living/silicon/ai/icons.dm b/code/modules/mob/living/silicon/ai/icons.dm index 5f12bd384b..94298cc650 100644 --- a/code/modules/mob/living/silicon/ai/icons.dm +++ b/code/modules/mob/living/silicon/ai/icons.dm @@ -1,5 +1,5 @@ -var/datum/ai_icon/default_ai_icon = new/datum/ai_icon/blue() -var/list/datum/ai_icon/ai_icons +var/global/datum/ai_icon/default_ai_icon = new/datum/ai_icon/blue() +var/global/list/datum/ai_icon/ai_icons /datum/ai_icon var/name diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm index 220458c522..b8b62be7a5 100644 --- a/code/modules/mob/living/silicon/emote.dm +++ b/code/modules/mob/living/silicon/emote.dm @@ -1,4 +1,4 @@ -var/list/_silicon_default_emotes = list( +var/global/list/_silicon_default_emotes = list( /decl/emote/audible/synth, /decl/emote/audible/synth/ping, /decl/emote/audible/synth/buzz, diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 74a9887ab7..c6d7da16db 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -2,7 +2,7 @@ // Recruiting observers to play as pAIs -var/datum/paiController/paiController // Global handler for pAI candidates +var/global/datum/paiController/paiController // Global handler for pAI candidates /datum/paiCandidate var/name diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 57c03ddfb4..5ef62fe422 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -1,4 +1,4 @@ -var/list/pai_emotions = list( +var/global/list/pai_emotions = list( "Happy" = 1, "Cat" = 2, "Extremely Happy" = 3, diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index b31e0ee944..a5b99494b9 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -1,4 +1,4 @@ -var/list/mob_hat_cache = list() +var/global/list/mob_hat_cache = list() /proc/get_hat_icon(var/obj/item/hat, var/offset_x = 0, var/offset_y = 0) var/t_state = hat.icon_state if(hat.item_state_slots && hat.item_state_slots[slot_head_str]) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 54b06ff35a..330bde8e21 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -1,4 +1,4 @@ -var/list/_robot_default_emotes = list( +var/global/list/_robot_default_emotes = list( /decl/emote/audible/clap, /decl/emote/visible/bow, /decl/emote/visible/salute, diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index be8f47e4c0..69506769a4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -1,4 +1,4 @@ -var/list/_cat_default_emotes = list( +var/global/list/_cat_default_emotes = list( /decl/emote/visible, /decl/emote/visible/scratch, /decl/emote/visible/drool, diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index 1400b22167..430c2a9a77 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -1,4 +1,4 @@ -var/list/_slime_default_emotes = list( +var/global/list/_slime_default_emotes = list( /decl/emote/audible/moan, /decl/emote/visible/twitch, /decl/emote/visible/sway, diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index e1850bd445..b2693e28f4 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -315,7 +315,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp return 0 //converts intent-strings into numbers and back -var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) +var/global/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) /proc/intent_numeric(argument) if(istext(argument)) switch(argument) @@ -597,7 +597,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) //TODO: Integrate defence zones and targeting body parts with the actual organ system, move these into organ definitions. //The base miss chance for the different defence zones -var/list/global/base_miss_chance = list( +var/global/list/global/base_miss_chance = list( "head" = 40, "chest" = 10, "groin" = 20, @@ -613,7 +613,7 @@ var/list/global/base_miss_chance = list( //Used to weight organs when an organ is hit randomly (i.e. not a directed, aimed attack). //Also used to weight the protection value that armour provides for covering that body part when calculating protection from full-body effects. -var/list/global/organ_rel_size = list( +var/global/list/global/organ_rel_size = list( "head" = 25, "chest" = 70, "groin" = 30, diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm index a24da0e4ba..830b7b14ed 100644 --- a/code/modules/mob/new_player/skill.dm +++ b/code/modules/mob/new_player/skill.dm @@ -1,22 +1,21 @@ -var/global/const - SKILL_NONE = 0 - SKILL_BASIC = 1 - SKILL_ADEPT = 2 - SKILL_EXPERT = 3 - SKILL_PROF = 4 +var/global/const/SKILL_NONE = 0 +var/global/const/SKILL_BASIC = 1 +var/global/const/SKILL_ADEPT = 2 +var/global/const/SKILL_EXPERT = 3 +var/global/const/SKILL_PROF = 4 -/datum/skill/var - ID = "none" // ID of the skill, used in code - name = "None" // name of the skill - desc = "Placeholder skill" // detailed description of the skill - field = "Misc" // the field under which the skill will be listed - secondary = 0 // secondary skills only have two levels and cost significantly less +/datum/skill + var/ID = "none" // ID of the skill, used in code + var/name = "None" // name of the skill + var/desc = "Placeholder skill" // detailed description of the skill + var/field = "Misc" // the field under which the skill will be listed + var/secondary = 0 // secondary skills only have two levels and cost significantly less var/global/list/SKILLS = null -var/list/SKILL_ENGINEER = list("field" = "Engineering", "EVA" = SKILL_BASIC, "construction" = SKILL_ADEPT, "electrical" = SKILL_BASIC, "engines" = SKILL_ADEPT) -var/list/SKILL_ORGAN_ROBOTICIST = list("field" = "Science", "devices" = SKILL_ADEPT, "electrical" = SKILL_BASIC, "computer" = SKILL_ADEPT, "anatomy" = SKILL_BASIC) -var/list/SKILL_SECURITY_OFFICER = list("field" = "Security", "combat" = SKILL_BASIC, "weapons" = SKILL_ADEPT, "law" = SKILL_ADEPT, "forensics" = SKILL_BASIC) -var/list/SKILL_CHEMIST = list("field" = "Science", "chemistry" = SKILL_ADEPT, "science" = SKILL_ADEPT, "medical" = SKILL_BASIC, "devices" = SKILL_BASIC) +var/global/list/SKILL_ENGINEER = list("field" = "Engineering", "EVA" = SKILL_BASIC, "construction" = SKILL_ADEPT, "electrical" = SKILL_BASIC, "engines" = SKILL_ADEPT) +var/global/list/SKILL_ORGAN_ROBOTICIST = list("field" = "Science", "devices" = SKILL_ADEPT, "electrical" = SKILL_BASIC, "computer" = SKILL_ADEPT, "anatomy" = SKILL_BASIC) +var/global/list/SKILL_SECURITY_OFFICER = list("field" = "Security", "combat" = SKILL_BASIC, "weapons" = SKILL_ADEPT, "law" = SKILL_ADEPT, "forensics" = SKILL_BASIC) +var/global/list/SKILL_CHEMIST = list("field" = "Science", "chemistry" = SKILL_ADEPT, "science" = SKILL_ADEPT, "medical" = SKILL_BASIC, "devices" = SKILL_BASIC) var/global/list/SKILL_PRE = list("Engineer" = SKILL_ENGINEER, "Roboticist" = SKILL_ORGAN_ROBOTICIST, "Security Officer" = SKILL_SECURITY_OFFICER, "Chemist" = SKILL_CHEMIST) /datum/skill/management diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 01db6036e9..01b4498bea 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -27,9 +27,9 @@ /* General message handling stuff */ -var/list/comm_message_listeners = list() //We first have to initialize list then we can use it. -var/datum/comm_message_listener/global_message_listener = new //May be used by admins -var/last_message_id = 0 +var/global/list/comm_message_listeners = list() //We first have to initialize list then we can use it. +var/global/datum/comm_message_listener/global_message_listener = new //May be used by admins +var/global/last_message_id = 0 /proc/get_comm_message_id() last_message_id = last_message_id + 1 diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm index 9a2a4d4dcc..e4bd3a836e 100644 --- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm +++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm @@ -1,4 +1,4 @@ -var/warrant_uid = 0 +var/global/warrant_uid = 0 /datum/datacore var/list/warrants = list() diff --git a/code/modules/multiz/basic.dm b/code/modules/multiz/basic.dm index f690e8c790..17bfc4467b 100644 --- a/code/modules/multiz/basic.dm +++ b/code/modules/multiz/basic.dm @@ -1,5 +1,5 @@ // If you add a more comprehensive system, just untick this file. -var/list/z_levels = list()// Each bit re... haha just kidding this is a list of bools now +var/global/list/z_levels = list()// Each bit re... haha just kidding this is a list of bools now // If the height is more than 1, we mark all contained levels as connected. INITIALIZE_IMMEDIATE(/obj/effect/landmark/map_data) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 979b1ea53a..814739f33f 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -4,12 +4,12 @@ //Blood levels. These are percentages based on the species blood_volume var. //Retained for archival/reference purposes - KK /* -var/const/BLOOD_VOLUME_SAFE = 85 -var/const/BLOOD_VOLUME_OKAY = 75 -var/const/BLOOD_VOLUME_BAD = 60 -var/const/BLOOD_VOLUME_SURVIVE = 40 +var/global/const/BLOOD_VOLUME_SAFE = 85 +var/global/const/BLOOD_VOLUME_OKAY = 75 +var/global/const/BLOOD_VOLUME_BAD = 60 +var/global/const/BLOOD_VOLUME_SURVIVE = 40 */ -var/const/CE_STABLE_THRESHOLD = 0.5 +var/global/const/CE_STABLE_THRESHOLD = 0.5 /mob/living/carbon/human/var/datum/reagents/vessel // Container for blood and BLOOD ONLY. Do not transfer other chems here. /mob/living/carbon/human/var/var/pale = 0 // Should affect how mob sprite is drawn, but currently doesn't. diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index aa372d610d..fd4a5cd9b0 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -1,4 +1,4 @@ -var/list/organ_cache = list() +var/global/list/organ_cache = list() /obj/item/organ name = "organ" diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index df152dc2c5..093d4d0e3c 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -195,8 +195,8 @@ var/global/list/limb_icon_cache = list() // damage amount to represent the pain of the injuries involved. // Global scope, used in code below. -var/list/flesh_hud_colours = list("#02BA08","#9ECF19","#DEDE10","#FFAA00","#FF0000","#AA0000","#660000") -var/list/robot_hud_colours = list("#CFCFCF","#AFAFAF","#8F8F8F","#6F6F6F","#4F4F4F","#2F2F2F","#000000") +var/global/list/flesh_hud_colours = list("#02BA08","#9ECF19","#DEDE10","#FFAA00","#FF0000","#AA0000","#660000") +var/global/list/robot_hud_colours = list("#CFCFCF","#AFAFAF","#8F8F8F","#6F6F6F","#4F4F4F","#2F2F2F","#000000") /obj/item/organ/external/proc/get_damage_hud_image(var/min_dam_state) diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index c03193b639..c5dd558d1b 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -1,8 +1,8 @@ -var/list/all_robolimbs = list() -var/list/robolimb_data = list() -var/list/chargen_robolimbs = list() -var/datum/robolimb/basic_robolimb -var/const/standard_monitor_styles = "blank=ipc_blank;\ +var/global/list/all_robolimbs = list() +var/global/list/robolimb_data = list() +var/global/list/chargen_robolimbs = list() +var/global/datum/robolimb/basic_robolimb +var/global/const/standard_monitor_styles = "blank=ipc_blank;\ pink=ipc_pink;\ green=ipc_green;\ red=ipc_red;\ diff --git a/code/modules/overmap/ships/engines/engine.dm b/code/modules/overmap/ships/engines/engine.dm index a5d3bc7016..0a60eb192d 100644 --- a/code/modules/overmap/ships/engines/engine.dm +++ b/code/modules/overmap/ships/engines/engine.dm @@ -1,6 +1,6 @@ //Engine component object -var/list/ship_engines = list() +var/global/list/ship_engines = list() /datum/ship_engine var/name = "ship engine" var/obj/machinery/holder //actual engine object diff --git a/code/modules/overmap/turfs.dm b/code/modules/overmap/turfs.dm index 6647d16a4d..bf01ef5f97 100644 --- a/code/modules/overmap/turfs.dm +++ b/code/modules/overmap/turfs.dm @@ -87,7 +87,7 @@ var/global/list/map_sectors = list() GLOB.overmap_event_handler.on_turf_exited(src, O, newloc) //list used to track which zlevels are being 'moved' by the proc below -var/list/moving_levels = list() +var/global/list/moving_levels = list() //Proc to 'move' stars in spess //yes it looks ugly, but it should only fire when state actually change. //null direction stops movement diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 61c2c5e28e..6aa67f03b0 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -1,8 +1,8 @@ -var/list/obj/machinery/photocopier/faxmachine/allfaxes = list() -var/list/admin_departments = list("[using_map.boss_name]", "Sif Governmental Authority", "Supply") -var/list/alldepartments = list() +var/global/list/obj/machinery/photocopier/faxmachine/allfaxes = list() +var/global/list/admin_departments = list("[using_map.boss_name]", "Sif Governmental Authority", "Supply") +var/global/list/alldepartments = list() -var/list/adminfaxes = list() //cache for faxes that have been sent to admins +var/global/list/adminfaxes = list() //cache for faxes that have been sent to admins /obj/machinery/photocopier/faxmachine name = "fax machine" diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm index f16604f051..bab5a601ea 100644 --- a/code/modules/pda/cart.dm +++ b/code/modules/pda/cart.dm @@ -1,4 +1,4 @@ -var/list/command_cartridges = list( +var/global/list/command_cartridges = list( /obj/item/cartridge/captain, /obj/item/cartridge/hop, /obj/item/cartridge/hos, @@ -9,36 +9,36 @@ var/list/command_cartridges = list( /obj/item/cartridge/lawyer // Internal Affaris, ) -var/list/security_cartridges = list( +var/global/list/security_cartridges = list( /obj/item/cartridge/security, /obj/item/cartridge/detective, /obj/item/cartridge/hos ) -var/list/engineering_cartridges = list( +var/global/list/engineering_cartridges = list( /obj/item/cartridge/engineering, /obj/item/cartridge/atmos, /obj/item/cartridge/ce ) -var/list/medical_cartridges = list( +var/global/list/medical_cartridges = list( /obj/item/cartridge/medical, /obj/item/cartridge/chemistry, /obj/item/cartridge/cmo ) -var/list/research_cartridges = list( +var/global/list/research_cartridges = list( /obj/item/cartridge/signal/science, /obj/item/cartridge/rd ) -var/list/cargo_cartridges = list( +var/global/list/cargo_cartridges = list( /obj/item/cartridge/quartermaster, // This also covers cargo-techs, apparently, /obj/item/cartridge/miner, /obj/item/cartridge/hop ) -var/list/civilian_cartridges = list( +var/global/list/civilian_cartridges = list( /obj/item/cartridge/janitor, /obj/item/cartridge/service, /obj/item/cartridge/hop diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index a021a9d3ef..719d7ba8e9 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -1,4 +1,4 @@ -var/datum/planet/sif/planet_sif = null +var/global/datum/planet/sif/planet_sif = null /datum/planet/sif name = "Sif" diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 7d71843b6c..7058f36363 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -21,7 +21,7 @@ If d1 = 0 and d2 = dir, it's a O-X cable, getting from the center of the tile to If d1 = dir1 and d2 = dir2, it's a full X-X cable, getting from dir1 to dir2 By design, d1 is the smallest direction and d2 is the highest */ -var/list/possible_cable_coil_colours = list( +var/global/list/possible_cable_coil_colours = list( "White" = COLOR_WHITE, "Silver" = COLOR_SILVER, "Gray" = COLOR_GRAY, diff --git a/code/modules/power/fusion/fusion_reactions.dm b/code/modules/power/fusion/fusion_reactions.dm index b49fa564bc..a4d3303f3d 100644 --- a/code/modules/power/fusion/fusion_reactions.dm +++ b/code/modules/power/fusion/fusion_reactions.dm @@ -1,4 +1,4 @@ -var/list/fusion_reactions +var/global/list/fusion_reactions /decl/fusion_reaction var/p_react = "" // Primary reactant. diff --git a/code/modules/random_map/mazes/maze_cell.dm b/code/modules/random_map/mazes/maze_cell.dm index 0b4fa1ac86..da5013c55a 100644 --- a/code/modules/random_map/mazes/maze_cell.dm +++ b/code/modules/random_map/mazes/maze_cell.dm @@ -1,4 +1,4 @@ -var/maze_cell_count = 0 +var/global/maze_cell_count = 0 /datum/maze_cell var/name diff --git a/code/modules/reagents/Chemistry-Logging.dm b/code/modules/reagents/Chemistry-Logging.dm index 4c7b2343ad..e3b87a2b67 100644 --- a/code/modules/reagents/Chemistry-Logging.dm +++ b/code/modules/reagents/Chemistry-Logging.dm @@ -1,5 +1,5 @@ -/var/list/chemical_reaction_logs = list() +var/global/list/chemical_reaction_logs = list() /proc/log_chemical_reaction(atom/A, decl/chemical_reaction/R, multiplier) if(!A || !R) diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 46444e97ae..56ee515a34 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -228,7 +228,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() /datum/feedback_variable/proc/get_parsed() return list(variable,value,details) -var/obj/machinery/blackbox_recorder/blackbox +var/global/obj/machinery/blackbox_recorder/blackbox /obj/machinery/blackbox_recorder icon = 'icons/obj/stationobjs.dmi' diff --git a/code/modules/scripting/AST/AST Nodes.dm b/code/modules/scripting/AST/AST Nodes.dm index 1bc6eb5cd9..206da45957 100644 --- a/code/modules/scripting/AST/AST Nodes.dm +++ b/code/modules/scripting/AST/AST Nodes.dm @@ -12,8 +12,7 @@ Articles: - */ -var - const + /* Constants: Operator Precedence OOP_OR - Logical or @@ -27,16 +26,16 @@ var OOP_UNARY - Unary Operators OOP_GROUP - Parentheses */ - OOP_OR = 1 //|| - OOP_AND = OOP_OR + 1 //&& - OOP_BIT = OOP_AND + 1 //&, | - OOP_EQUAL = OOP_BIT + 1 //==, != - OOP_COMPARE = OOP_EQUAL + 1 //>, <, >=, <= - OOP_ADD = OOP_COMPARE + 1 //+, - - OOP_MULTIPLY= OOP_ADD + 1 //*, /, % - OOP_POW = OOP_MULTIPLY+ 1 //^ - OOP_UNARY = OOP_POW + 1 //! - OOP_GROUP = OOP_UNARY + 1 //() +var/global/const/OOP_OR = 1 //|| +var/global/const/OOP_AND = OOP_OR + 1 //&& +var/global/const/OOP_BIT = OOP_AND + 1 //&, | +var/global/const/OOP_EQUAL = OOP_BIT + 1 //==, != +var/global/const/OOP_COMPARE = OOP_EQUAL + 1 //>, <, >=, <= +var/global/const/OOP_ADD = OOP_COMPARE + 1 //+, - +var/global/const/OOP_MULTIPLY= OOP_ADD + 1 //*, /, % +var/global/const/OOP_POW = OOP_MULTIPLY+ 1 //^ +var/global/const/OOP_UNARY = OOP_POW + 1 //! +var/global/const/OOP_GROUP = OOP_UNARY + 1 //() /* Class: node diff --git a/code/modules/scripting/Options.dm b/code/modules/scripting/Options.dm index b113b857be..a839cf9183 100644 --- a/code/modules/scripting/Options.dm +++ b/code/modules/scripting/Options.dm @@ -1,15 +1,14 @@ /* File: Options */ -var/const //Ascii values of characters - ascii_A =65 - ascii_Z =90 - ascii_a =97 - ascii_z =122 - ascii_DOLLAR = 36 // $ - ascii_ZERO=48 - ascii_NINE=57 - ascii_UNDERSCORE=95 // _ +var/global/const/ascii_A =65 +var/global/const/ascii_Z =90 +var/global/const/ascii_a =97 +var/global/const/ascii_z =122 +var/global/const/ascii_DOLLAR = 36 // $ +var/global/const/ascii_ZERO=48 +var/global/const/ascii_NINE=57 +var/global/const/ascii_UNDERSCORE=95 // _ /* Class: n_scriptOptions diff --git a/code/modules/scripting/Parser/Keywords.dm b/code/modules/scripting/Parser/Keywords.dm index cc68164877..2965b45274 100644 --- a/code/modules/scripting/Parser/Keywords.dm +++ b/code/modules/scripting/Parser/Keywords.dm @@ -3,14 +3,14 @@ /* File: Keywords */ -var/const/KW_FAIL = 0 //Fatal error; stop parsing entire script. -var/const/KW_PASS = 1 //OK -var/const/KW_ERR = 2 //Non-fatal error, keyword couldn't be handled properly. Ignore keyword but continue on. -var/const/KW_WARN = 3 //Warning +var/global/const/KW_FAIL = 0 //Fatal error; stop parsing entire script. +var/global/const/KW_PASS = 1 //OK +var/global/const/KW_ERR = 2 //Non-fatal error, keyword couldn't be handled properly. Ignore keyword but continue on. +var/global/const/KW_WARN = 3 //Warning /* -var/const/Class: n_Keyword -var/const/Represents a special statement in the code triggered by a keyword. +var/global/const/Class: n_Keyword +var/global/const/Represents a special statement in the code triggered by a keyword. */ /* diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index 57114bdd46..a78b51b332 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -1,4 +1,4 @@ -/var/security_level = 0 +var/global/security_level = 0 //0 = code green //1 = code yellow //2 = code violet @@ -8,8 +8,8 @@ //6 = code delta //config.alert_desc_blue_downto -/var/datum/announcement/priority/security/security_announcement_up = new(do_log = 0, do_newscast = 1, new_sound = sound('sound/effects/alert_levels/alert_raise.ogg')) -/var/datum/announcement/priority/security/security_announcement_down = new(do_log = 0, do_newscast = 1) +var/global/datum/announcement/priority/security/security_announcement_up = new(do_log = 0, do_newscast = 1, new_sound = sound('sound/effects/alert_levels/alert_raise.ogg')) +var/global/datum/announcement/priority/security/security_announcement_down = new(do_log = 0, do_newscast = 1) /proc/set_security_level(var/level) switch(level) diff --git a/code/modules/spells/spell_code.dm b/code/modules/spells/spell_code.dm index 1e152f3ddb..df9e0ff75b 100644 --- a/code/modules/spells/spell_code.dm +++ b/code/modules/spells/spell_code.dm @@ -1,4 +1,4 @@ -var/list/spells = typesof(/spell) //needed for the badmin verb for now +var/global/list/spells = typesof(/spell) //needed for the badmin verb for now /spell var/name = "Spell" diff --git a/code/modules/vchat/vchat_client.dm b/code/modules/vchat/vchat_client.dm index ab98c37adb..1c763155c5 100644 --- a/code/modules/vchat/vchat_client.dm +++ b/code/modules/vchat/vchat_client.dm @@ -325,9 +325,9 @@ GLOBAL_LIST_EMPTY(bicon_cache) // Cache of the tag results, not the icons /proc/is_valid_tochat_target(target) return !istype(target, /savefile) && (ismob(target) || islist(target) || isclient(target) || target == world) -var/to_chat_filename -var/to_chat_line -var/to_chat_src +var/global/to_chat_filename +var/global/to_chat_line +var/global/to_chat_src //This proc is only really used if the SSchat subsystem is unavailable (not started yet) /proc/to_chat_immediate(target, time, message) diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index a4f33d8f05..99100030a5 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -1,4 +1,4 @@ -var/list/ventcrawl_machinery = list( +var/global/list/ventcrawl_machinery = list( /obj/machinery/atmospherics/unary/vent_pump, /obj/machinery/atmospherics/unary/vent_scrubber ) diff --git a/code/modules/xgm/xgm_gas_data.dm b/code/modules/xgm/xgm_gas_data.dm index 4ee3e1c501..c74020df49 100644 --- a/code/modules/xgm/xgm_gas_data.dm +++ b/code/modules/xgm/xgm_gas_data.dm @@ -1,4 +1,4 @@ -/var/datum/xgm_gas_data/gas_data +var/global/datum/xgm_gas_data/gas_data /datum/xgm_gas_data //Simple list of all the gas IDs. diff --git a/code/names.dm b/code/names.dm index ab101d76c6..0481848b82 100644 --- a/code/names.dm +++ b/code/names.dm @@ -1,16 +1,16 @@ -var/list/ai_names = file2list("config/names/ai.txt") -var/list/wizard_first = file2list("config/names/wizardfirst.txt") -var/list/wizard_second = file2list("config/names/wizardsecond.txt") -var/list/ninja_titles = file2list("config/names/ninjatitle.txt") -var/list/ninja_names = file2list("config/names/ninjaname.txt") -var/list/commando_names = file2list("config/names/death_commando.txt") -var/list/first_names_male = file2list("config/names/first_male.txt") -var/list/first_names_female = file2list("config/names/first_female.txt") -var/list/last_names = file2list("config/names/last.txt") -var/list/clown_names = file2list("config/names/clown.txt") +var/global/list/ai_names = file2list("config/names/ai.txt") +var/global/list/wizard_first = file2list("config/names/wizardfirst.txt") +var/global/list/wizard_second = file2list("config/names/wizardsecond.txt") +var/global/list/ninja_titles = file2list("config/names/ninjatitle.txt") +var/global/list/ninja_names = file2list("config/names/ninjaname.txt") +var/global/list/commando_names = file2list("config/names/death_commando.txt") +var/global/list/first_names_male = file2list("config/names/first_male.txt") +var/global/list/first_names_female = file2list("config/names/first_female.txt") +var/global/list/last_names = file2list("config/names/last.txt") +var/global/list/clown_names = file2list("config/names/clown.txt") -var/list/verbs = file2list("config/names/verbs.txt") -var/list/adjectives = file2list("config/names/adjectives.txt") +var/global/list/verbs = file2list("config/names/verbs.txt") +var/global/list/adjectives = file2list("config/names/adjectives.txt") //loaded on startup because of " //would include in rsc if ' was used \ No newline at end of file diff --git a/code/unit_tests/unit_test.dm b/code/unit_tests/unit_test.dm index e775f6f763..9af93254f5 100644 --- a/code/unit_tests/unit_test.dm +++ b/code/unit_tests/unit_test.dm @@ -1,6 +1,6 @@ -var/all_unit_tests_passed = 1 -var/failed_unit_tests = 0 -var/total_unit_tests = 0 +var/global/all_unit_tests_passed = 1 +var/global/failed_unit_tests = 0 +var/global/total_unit_tests = 0 /datum/unit_test var/name = "template" diff --git a/maps/cynosure/cynosure_jobs.dm b/maps/cynosure/cynosure_jobs.dm index d874f1f6cd..2857057591 100644 --- a/maps/cynosure/cynosure_jobs.dm +++ b/maps/cynosure/cynosure_jobs.dm @@ -1,8 +1,8 @@ // Pilots -var/const/EXPLORER =(1<<14) +var/global/const/EXPLORER =(1<<14) -var/const/access_explorer = 43 +var/global/const/access_explorer = 43 /datum/access/explorer id = access_explorer diff --git a/maps/cynosure/cynosure_presets.dm b/maps/cynosure/cynosure_presets.dm index b2074f21f9..b8ed4dbe8c 100644 --- a/maps/cynosure/cynosure_presets.dm +++ b/maps/cynosure/cynosure_presets.dm @@ -1,7 +1,7 @@ -var/const/NETWORK_BASEMENT_FLOOR = "Basement Floor" -var/const/NETWORK_GROUND_FLOOR = "Ground Floor" -var/const/NETWORK_SECOND_FLOOR = "Second Floor" -var/const/NETWORK_SUPPLY = "Supply" +var/global/const/NETWORK_BASEMENT_FLOOR = "Basement Floor" +var/global/const/NETWORK_GROUND_FLOOR = "Ground Floor" +var/global/const/NETWORK_SECOND_FLOOR = "Second Floor" +var/global/const/NETWORK_SUPPLY = "Supply" // // Cameras diff --git a/maps/southern_cross/southern_cross_jobs.dm b/maps/southern_cross/southern_cross_jobs.dm index 2f379dcb2e..cc515186fd 100644 --- a/maps/southern_cross/southern_cross_jobs.dm +++ b/maps/southern_cross/southern_cross_jobs.dm @@ -1,11 +1,11 @@ // Pilots -var/const/SAR =(1<<11) -var/const/PILOT =(1<<13) -var/const/EXPLORER =(1<<14) +var/global/const/SAR =(1<<11) +var/global/const/PILOT =(1<<13) +var/global/const/EXPLORER =(1<<14) -var/const/access_pilot = 67 -var/const/access_explorer = 43 +var/global/const/access_pilot = 67 +var/global/const/access_explorer = 43 /datum/access/pilot id = access_pilot diff --git a/maps/southern_cross/southern_cross_presets.dm b/maps/southern_cross/southern_cross_presets.dm index f5a86e3c07..eb9bd6201f 100644 --- a/maps/southern_cross/southern_cross_presets.dm +++ b/maps/southern_cross/southern_cross_presets.dm @@ -1,8 +1,8 @@ -var/const/NETWORK_THIRD_DECK = "Third Deck" -var/const/NETWORK_SECOND_DECK = "Second Deck" -var/const/NETWORK_FIRST_DECK = "First Deck" -var/const/NETWORK_SUPPLY = "Supply" -var/const/NETWORK_MAIN_OUTPOST = "Main Outpost" +var/global/const/NETWORK_THIRD_DECK = "Third Deck" +var/global/const/NETWORK_SECOND_DECK = "Second Deck" +var/global/const/NETWORK_FIRST_DECK = "First Deck" +var/global/const/NETWORK_SUPPLY = "Supply" +var/global/const/NETWORK_MAIN_OUTPOST = "Main Outpost" // // Cameras diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 1d46820859..755a8ddc5f 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -1,6 +1,6 @@ -var/datum/map/using_map = new USING_MAP_DATUM -var/list/all_maps = list() +var/global/datum/map/using_map = new USING_MAP_DATUM +var/global/list/all_maps = list() /hook/startup/proc/initialise_map_list() for(var/type in typesof(/datum/map) - /datum/map) diff --git a/tools/Redirector/Configurations.dm b/tools/Redirector/Configurations.dm index b76b0b9c07..7c6fccd592 100644 --- a/tools/Redirector/Configurations.dm +++ b/tools/Redirector/Configurations.dm @@ -3,11 +3,11 @@ (2012) */ -var/list/config_stream = list() -var/list/servers = list() -var/list/servernames = list() -var/list/adminfiles = list() -var/list/adminkeys = list() +var/global/list/config_stream = list() +var/global/list/servers = list() +var/global/list/servernames = list() +var/global/list/adminfiles = list() +var/global/list/adminkeys = list() proc/gen_configs() diff --git a/tools/Redirector/Redirector.dm b/tools/Redirector/Redirector.dm index 988f9c9c09..0d017f70fc 100644 --- a/tools/Redirector/Redirector.dm +++ b/tools/Redirector/Redirector.dm @@ -9,11 +9,11 @@ #define ADMINS 1 #define PLAYERS 0 -var/player_weight = 1 // players are more likely to join a server with less players -var/admin_weight = 5 // admins are more likely to join a server with less admins +var/global/player_weight = 1 // players are more likely to join a server with less players +var/global/admin_weight = 5 // admins are more likely to join a server with less admins -var/player_substr = "players=" // search for this substring to locate # of players -var/admin_substr = "admins=" // search for this to locate # of admins +var/global/player_substr = "players=" // search for this substring to locate # of players +var/global/admin_substr = "admins=" // search for this to locate # of admins /world name = "TGstation Redirector"