diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 57cdb09cae..6203388ec1 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. **/ -GLOBAL_REAL(Failsafe, /datum/controller/failsafe) // CHOMPEdit - Managed Globals +var/datum/controller/failsafe/Failsafe /datum/controller/failsafe // This thing pretty much just keeps poking the master controller name = "Failsafe" diff --git a/code/game/birthday.dm b/code/game/birthday.dm index 186a18b9be..727dbdf8b9 100644 --- a/code/game/birthday.dm +++ b/code/game/birthday.dm @@ -1,21 +1,21 @@ /mob/living/carbon/human/proc/consider_birthday() - if(!bday_month || !bday_day) //If we don't have one of these set, don't worry about it + if(!bday_month || !bday_day) //If we don't have one of these set, don't worry about it return - if(real_name != client.prefs.real_name) //let's not celebrate the birthday of that weird mob we got dropped into + if(real_name != client.prefs.real_name) //let's not celebrate the birthday of that weird mob we got dropped into return - if(!(client.prefs.last_birthday_notification < GLOB.world_time_year)) //you only get notified once a year // CHOMPEdit - Managed Globals + if(!(client.prefs.last_birthday_notification < world_time_year)) //you only get notified once a year return - if((GLOB.world_time_month == bday_month) && (GLOB.world_time_day == bday_day)) //it is your birthday // CHOMPEdit - Managed Globals + if((world_time_month == bday_month) && (world_time_day == bday_day)) //it is your birthday birthday(1) - else if(GLOB.world_time_month > bday_month) //your birthday was in a previous month // CHOMPEdit - Managed Globals + else if(world_time_month > bday_month) //your birthday was in a previous month birthday() - else if((GLOB.world_time_month == bday_month) && (GLOB.world_time_day > bday_day)) //your birthday was earlier this month // CHOMPEdit - Managed Globals + else if((world_time_month == bday_month) && (world_time_day > bday_day)) //your birthday was earlier this month birthday() /mob/living/carbon/human/proc/birthday(var/birthday = 0) var/msg var/lastyear = client.prefs.last_birthday_notification - client.prefs.last_birthday_notification = GLOB.world_time_year //We only want to ask once a year per character, this persists, update early in case of shenanigans // CHOMPEdit - Managed Globals + client.prefs.last_birthday_notification = world_time_year //We only want to ask once a year per character, this persists, update early in case of shenanigans if(birthday) //woo msg = "Today is your birthday! Do you want to increase your character's listed age?" /* //Chomp DISABLE - Absolutely not. @@ -30,7 +30,7 @@ if(lastyear == 0) //We've never been asked, so let's just assume you were keeping track before now and only add 1 age += 1 else - var/howmuch = GLOB.world_time_year - lastyear // CHOMPEdit - Managed Globals + var/howmuch = world_time_year - lastyear age += howmuch to_chat(src, "You are now [age]! Happy birthday!") client.prefs.age = age //Set the age on the character sheet diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index af541d3320..7f69c7211a 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -1,6 +1,6 @@ #define WHITELISTFILE "data/whitelist.txt" -GLOBAL_LIST_EMPTY(whitelist) // CHOMPEdit - Managed Globals +var/list/whitelist = list() /hook/startup/proc/loadWhitelist() if(config.usewhitelist) @@ -8,17 +8,17 @@ GLOBAL_LIST_EMPTY(whitelist) // CHOMPEdit - Managed Globals return 1 /proc/load_whitelist() - GLOB.whitelist = file2list(WHITELISTFILE) // CHOMPEdit - Managed Globals - if(!GLOB.whitelist.len) GLOB.whitelist = null // CHOMPEdit - Managed Globals + whitelist = file2list(WHITELISTFILE) + if(!whitelist.len) whitelist = null /proc/check_whitelist(mob/M /*, var/rank*/) if(!config.usewhitelist) //CHOMPedit: I guess this is an override for the blanket whitelist system. return 1 //CHOMPedit - if(!GLOB.whitelist) // CHOMPEdit - Managed Globals + if(!whitelist) return 0 - return ("[M.ckey]" in GLOB.whitelist) // CHOMPEdit - Managed Globals + return ("[M.ckey]" in whitelist) -GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals +/var/list/alien_whitelist = list() /hook/startup/proc/loadAlienWhitelist() if(config.usealienwhitelist) @@ -40,10 +40,10 @@ GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals if(key != ckey(key)) warning("Alien whitelist entry appears to have key, not ckey: [line]") // The key contains invalid ckey characters continue - var/list/our_whitelists = GLOB.alien_whitelist[key] // Try to see if we have one already and add to it // CHOMPEdit - Managed Globals + var/list/our_whitelists = alien_whitelist[key] // Try to see if we have one already and add to it if(!our_whitelists) // Guess this is their first/only whitelist entry our_whitelists = list() - GLOB.alien_whitelist[key] = our_whitelists // CHOMPEdit - Managed Globals + alien_whitelist[key] = our_whitelists our_whitelists += left_and_right[2] /proc/is_alien_whitelisted(mob/M, var/datum/species/species) @@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals return TRUE //Search the whitelist - var/list/our_whitelists = GLOB.alien_whitelist[M.ckey] // CHOMPEdit - Managed Globals + var/list/our_whitelists = alien_whitelist[M.ckey] if("All" in our_whitelists) return TRUE if(species.name in our_whitelists) @@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals return TRUE //Search the whitelist - var/list/our_whitelists = GLOB.alien_whitelist[M.ckey] // CHOMPEdit - Managed Globals + var/list/our_whitelists = alien_whitelist[M.ckey] if("All" in our_whitelists) return TRUE if(language.name in our_whitelists) @@ -105,8 +105,8 @@ GLOBAL_LIST_EMPTY(alien_whitelist) // CHOMPEdit - Managed Globals return 1 //If we have a loaded file, search it - if(GLOB.alien_whitelist) // CHOMPEdit - Managed Globals - for (var/s in GLOB.alien_whitelist) // CHOMPEdit - Managed Globals + if(alien_whitelist) + for (var/s in alien_whitelist) if(findtext(s,"[M.ckey] - [module]")) return 1 if(findtext(s,"[M.ckey] - All")) diff --git a/code/game/jobs/whitelist_vr.dm b/code/game/jobs/whitelist_vr.dm index 50accc847e..ef65050feb 100644 --- a/code/game/jobs/whitelist_vr.dm +++ b/code/game/jobs/whitelist_vr.dm @@ -1,4 +1,4 @@ -GLOBAL_LIST_EMPTY(job_whitelist) // CHOMPEdit - Managed Globals +var/list/job_whitelist = list() /hook/startup/proc/loadJobWhitelist() if(config.use_jobwhitelist) // CHOMPedit @@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(job_whitelist) // CHOMPEdit - Managed Globals if (!text) log_misc("Failed to load config/jobwhitelist.txt") else - GLOB.job_whitelist = splittext(text, "\n") // CHOMPEdit - Managed Globals + job_whitelist = splittext(text, "\n") /proc/is_job_whitelisted(mob/M, var/rank) if(!config.use_jobwhitelist) // CHOMPedit @@ -22,10 +22,10 @@ GLOBAL_LIST_EMPTY(job_whitelist) // CHOMPEdit - Managed Globals return 1 if(check_rights(R_ADMIN, 0) || check_rights(R_DEBUG, 0) || check_rights(R_EVENT, 0)) // CHOMPedit return 1 - if(!GLOB.job_whitelist) // CHOMPEdit - Managed Globals + if(!job_whitelist) return 0 if(M && rank) - for (var/s in GLOB.job_whitelist) // CHOMPEdit - Managed Globals + for (var/s in job_whitelist) if(findtext(s,"[lowertext(M.ckey)] - [lowertext(rank)]")) return 1 if(findtext(s,"[M.ckey] - All")) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 0fbf4e0ba7..d2f8043b15 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -28,7 +28,7 @@ // delete_me = 1 return //VOREStation Add end - if("Observer-Start") // Ghosts are the only thing that use the latejoin list afaik and it complains if there's nothing in the list. + if("Observer-Start") // Ghosts are the only thing that use the latejoin list afaik and it complains if there's nothing in the list. latejoin += src simulated = TRUE return @@ -39,11 +39,11 @@ return //CHOMPEdit Begin if("JoinLateStationGateway") - GLOB.latejoin_gatewaystation += loc + latejoin_gatewaystation += loc delete_me = 1 return if("JoinLateSifPlains") - GLOB.latejoin_plainspath += loc + latejoin_plainspath += loc delete_me = 1 return //CHOMPEdit End diff --git a/code/game/turfs/flooring/seasonal.dm b/code/game/turfs/flooring/seasonal.dm index 68d89a0219..27bbbefcfa 100644 --- a/code/game/turfs/flooring/seasonal.dm +++ b/code/game/turfs/flooring/seasonal.dm @@ -1,25 +1,23 @@ -// CHOMPEdit Start - Managed Globals -GLOBAL_VAR(world_time_season) -GLOBAL_VAR(world_time_year) -GLOBAL_VAR(world_time_month) -GLOBAL_VAR(world_time_day) -// CHOMPEdit End +var/world_time_season +var/world_time_year +var/world_time_month +var/world_time_day /proc/setup_season() - GLOB.world_time_month = text2num(time2text(world.timeofday, "MM")) // get the current month // CHOMPEdit - Managed Globals - switch(GLOB.world_time_month) // CHOMPEdit - Managed Globals + world_time_month = text2num(time2text(world.timeofday, "MM")) // get the current month + switch(world_time_month) if(1 to 2) - GLOB.world_time_season = "winter" // CHOMPEdit - Managed Globals + world_time_season = "winter" if(3 to 5) - GLOB.world_time_season = "spring" // CHOMPEdit - Managed Globals + world_time_season = "spring" if(6 to 8) - GLOB.world_time_season = "summer" // CHOMPEdit - Managed Globals + world_time_season = "summer" if(9 to 11) - GLOB.world_time_season = "autumn" // CHOMPEdit - Managed Globals + world_time_season = "autumn" if(12) - GLOB.world_time_season = "winter" // CHOMPEdit - Managed Globals - GLOB.world_time_day = text2num(time2text(world.timeofday, "DD")) // CHOMPEdit - Managed Globals - GLOB.world_time_year = text2num(time2text(world.timeofday, "YYYY")) // CHOMPEdit - Managed Globals + world_time_season = "winter" + world_time_day = text2num(time2text(world.timeofday, "DD")) + world_time_year = text2num(time2text(world.timeofday, "YYYY")) /turf/simulated/floor/outdoors/grass/seasonal name = "grass" @@ -38,9 +36,9 @@ GLOBAL_VAR(world_time_day) var/tree_types = list() var/snow_chance = 10 -/turf/simulated/floor/outdoors/grass/seasonal/Initialize() //There are A LOT of chompedits here, I guess. +/turf/simulated/floor/outdoors/grass/seasonal/Initialize() //There are A LOT of chompedits here, I guess. - switch(GLOB.world_time_season) + switch(world_time_season) if("spring") tree_types = list( /obj/structure/flora/tree/bigtree, @@ -193,7 +191,7 @@ GLOBAL_VAR(world_time_day) /turf/simulated/floor/outdoors/grass/seasonal/proc/update_desc() - switch(GLOB.world_time_season) // CHOMPEdit - Managed Globals + switch(world_time_season) if("spring") desc = "Lush green grass, flourishing! Little flowers peek out from between the blades here and there!" if("summer") @@ -207,10 +205,10 @@ GLOBAL_VAR(world_time_day) /turf/simulated/floor/outdoors/grass/seasonal/update_icon(update_neighbors) . = ..() update_desc() - switch(GLOB.world_time_season) // CHOMPEdit - Managed Globals + switch(world_time_season) if("spring") if(prob(50)) - var/cache_key = "[GLOB.world_time_season]-overlay[rand(1,19)]" // CHOMPEdit - Managed Globals + var/cache_key = "[world_time_season]-overlay[rand(1,19)]" if(!overlays_cache[cache_key]) var/image/I = image(icon = src.icon, icon_state = cache_key, layer = ABOVE_TURF_LAYER) // Icon should be abstracted out I.plane = TURF_PLANE @@ -222,7 +220,7 @@ GLOBAL_VAR(world_time_day) return if("autumn") if(prob(33)) - var/cache_key = "[GLOB.world_time_season]-overlay[rand(1,6)]" // CHOMPEdit - Managed Globals + var/cache_key = "[world_time_season]-overlay[rand(1,6)]" if(!overlays_cache[cache_key]) var/image/I = image(icon = src.icon, icon_state = cache_key, layer = ABOVE_TURF_LAYER) // Icon should be abstracted out I.plane = TURF_PLANE @@ -277,14 +275,14 @@ GLOBAL_VAR(world_time_day) /turf/simulated/floor/water/seasonal/Initialize() . = ..() - switch(GLOB.world_time_season) // CHOMPEdit - Managed Globals + switch(world_time_season) if("winter") if(prob(99)) ChangeTurf(/turf/simulated/floor/outdoors/ice) /turf/simulated/floor/water/deep/seasonal/Initialize() . = ..() - switch(GLOB.world_time_season) // CHOMPEdit - Managed Globals + switch(world_time_season) if("winter") if(prob(75)) ChangeTurf(/turf/simulated/floor/outdoors/ice) diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm index 7ef6f008e4..b1ab0fb2cb 100644 --- a/code/game/turfs/simulated/floor_icon.dm +++ b/code/game/turfs/simulated/floor_icon.dm @@ -25,7 +25,7 @@ var/image/no_ceiling_image = null icon_state = flooring.icon_base //VOREStation Addition Start if(flooring.check_season) - icon_state = "[icon_state]-[GLOB.world_time_season]" //VOREStation Addition End // CHOMPEdit - Managed Globals + icon_state = "[icon_state]-[world_time_season]" //VOREStation Addition End if(flooring.has_base_range) icon_state = "[icon_state][rand(0,flooring.has_base_range)]" flooring_override = icon_state diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 87b8d3f45e..c13cc226c7 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -264,7 +264,7 @@ var/list/gear_datums = list() if(!description) var/obj/O = path description = initial(O.desc) - gear_tweaks = list(gear_tweak_free_name, gear_tweak_free_desc, GLOB.gear_tweak_item_tf_spawn, GLOB.gear_tweak_free_matrix_recolor) //CHOMPEdit - Item TF spawnpoints + gear_tweaks = list(gear_tweak_free_name, gear_tweak_free_desc, gear_tweak_item_tf_spawn, GLOB.gear_tweak_free_matrix_recolor) //CHOMPEdit - Item TF spawnpoints /datum/gear_data var/path diff --git a/code/modules/events/roaming_wildlife.dm b/code/modules/events/roaming_wildlife.dm index bdd6576d1d..55ef610664 100644 --- a/code/modules/events/roaming_wildlife.dm +++ b/code/modules/events/roaming_wildlife.dm @@ -10,7 +10,7 @@ for(var/obj/effect/landmark/C in landmarks_list) if(istype(C, /obj/effect/landmark/wildlife)) var/obj/effect/landmark/wildlife/WLLM = C - if(GLOB.world_time_season == "winter" && WLLM.wildlife_type == 1) //fish forbidden in winter because ice now aparently // CHOMPEdit - Managed Globals + if(world_time_season == "winter" && WLLM.wildlife_type == 1) //fish forbidden in winter because ice now aparently continue possible_spawns.Add(C) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 8db52b3251..d738788001 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -322,7 +322,7 @@ //VOREStatation Edit Start: shell restrictions //CHOMPstaton change to blacklist if(shell) modules.Add(robot_module_types) - modules.Remove(GLOB.shell_module_blacklist) // CHOMPEdit - Managed Globals + modules.Remove(shell_module_blacklist) //CHOMPedit Add if(crisis || security_level == SEC_LEVEL_RED || crisis_override) to_chat(src, span_red("Crisis mode active. Combat module available.")) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm index cb50a4e17a..f8d3608cbe 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm @@ -153,7 +153,7 @@ /mob/living/simple_mob/vore/squirrel/Initialize() . = ..() if(do_seasons) - switch(GLOB.world_time_season) // CHOMPEdit - Managed Globals + switch(world_time_season) if("spring") if(prob(1)) winterize() diff --git a/code/modules/mob/login_ch.dm b/code/modules/mob/login_ch.dm index 83cd29a5c3..ad6a186e6a 100644 --- a/code/modules/mob/login_ch.dm +++ b/code/modules/mob/login_ch.dm @@ -1,6 +1,6 @@ /mob/Login() . = ..() set_listening(LISTENING_PLAYER) - if(GLOB.global_vantag_hud) + if(global_vantag_hud) vantag_hud = TRUE - recalculate_vis() + recalculate_vis() \ No newline at end of file diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index c8f55c6401..bf7f1ceaae 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -705,7 +705,7 @@ stat(null, "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)") if(ticker && ticker.current_state != GAME_STATE_PREGAME) stat("Station Time", stationtime2text()) - var/date = "[stationdate2text()], [capitalize(GLOB.world_time_season)]" // CHOMPEdit - Managed Globals + var/date = "[stationdate2text()], [capitalize(world_time_season)]" stat("Station Date", date) stat("Round Duration", roundduration2text()) diff --git a/modular_chomp/code/game/objects/effects/step_triggers.dm b/modular_chomp/code/game/objects/effects/step_triggers.dm index 5961fe54c7..24ce748321 100644 --- a/modular_chomp/code/game/objects/effects/step_triggers.dm +++ b/modular_chomp/code/game/objects/effects/step_triggers.dm @@ -1,5 +1,5 @@ -GLOBAL_LIST_EMPTY(mapped_autostrips) -GLOBAL_LIST_EMPTY(mapped_autostrips_mob) +var/static/list/mapped_autostrips = list() +var/static/list/mapped_autostrips_mob = list() /* This should actually be refactored if it ever needs to be used again into just being @@ -74,8 +74,8 @@ But for now, for what it's been used for, it works. /obj/effect/step_trigger/autostrip/proc/initMappedLink() . = FALSE - target = GLOB.mapped_autostrips[targetid] - Mtarget = GLOB.mapped_autostrips_mob[targetid] + target = mapped_autostrips[targetid] + Mtarget = mapped_autostrips_mob[targetid] if(target) . = TRUE @@ -93,11 +93,11 @@ But for now, for what it's been used for, it works. /obj/effect/autostriptarget/Initialize(mapload) . = ..() if(targetid) - GLOB.mapped_autostrips[targetid] = src + mapped_autostrips[targetid] = src /obj/effect/autostriptarget/mob name = "Autostrip target to send mobs to." /obj/effect/autostriptarget/mob/Initialize(mapload) if(targetid) - GLOB.mapped_autostrips_mob[targetid] = src + mapped_autostrips_mob[targetid] = src \ No newline at end of file diff --git a/modular_chomp/code/global.dm b/modular_chomp/code/global.dm index f147c3a5e9..288ccc10df 100644 --- a/modular_chomp/code/global.dm +++ b/modular_chomp/code/global.dm @@ -1,11 +1,11 @@ -GLOBAL_LIST_INIT(shell_module_blacklist, list( +var/list/shell_module_blacklist = list( "Sci-borg", "Research" - )) -GLOBAL_LIST_EMPTY(latejoin_gatewaystation) -GLOBAL_LIST_EMPTY(latejoin_plainspath) + ) +var/list/latejoin_gatewaystation = list() +var/list/latejoin_plainspath = list() -GLOBAL_LIST_INIT(talk_sound_map, rlist( +var/list/talk_sound_map = rlist( list( "beep-boop", "goon speak 1", @@ -40,12 +40,12 @@ GLOBAL_LIST_INIT(talk_sound_map, rlist( goon_speak_skelly_sound, xeno_speak_sound // CHOMPedit ) - )) + ) /proc/get_talk_sound(var/voice_sound) if(!voice_sound) - return GLOB.talk_sound_map[1] - return GLOB.talk_sound_map[2][voice_sound] + return talk_sound_map[1] + return talk_sound_map[2][voice_sound] /proc/rlist(var/list/keys,var/list/values) //short for reversible list generator var/list/rlist = list(list(),list(),FALSE,0) @@ -78,4 +78,4 @@ GLOBAL_LIST_INIT(talk_sound_map, rlist( rlist[1] //Values rlist[2] -*/ +*/ \ No newline at end of file diff --git a/modular_chomp/code/modules/admin/verbs/randomverbs.dm b/modular_chomp/code/modules/admin/verbs/randomverbs.dm index 00a5fece3a..ba90e28194 100644 --- a/modular_chomp/code/modules/admin/verbs/randomverbs.dm +++ b/modular_chomp/code/modules/admin/verbs/randomverbs.dm @@ -1,15 +1,13 @@ -GLOBAL_VAR_INIT(global_vantag_hud, 0) +var/global_vantag_hud = 0 -/client/proc/toggle_vantag_hud_global(mob/target as mob) +/client/proc/toggle_vantag_hud_global(var/mob/target as mob) set category = "Fun" set name = "Toggle Global Event HUD" set desc = "Give everyone the Event HUD." - GLOB.global_vantag_hud = !GLOB.global_vantag_hud - if(GLOB.global_vantag_hud) + global_vantag_hud = !global_vantag_hud + if(global_vantag_hud) for(var/mob/living/L in living_mob_list) if(L.ckey) L.vantag_hud = TRUE - L.recalculate_vis() - - to_chat(src, "Global Event HUD has been turned [GLOB.global_vantag_hud ? "on" : "off"].") + L.recalculate_vis() \ No newline at end of file diff --git a/modular_chomp/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/modular_chomp/code/modules/client/preference_setup/loadout/gear_tweaks.dm index 52c4fd2f93..9e74ccabf1 100644 --- a/modular_chomp/code/modules/client/preference_setup/loadout/gear_tweaks.dm +++ b/modular_chomp/code/modules/client/preference_setup/loadout/gear_tweaks.dm @@ -1,4 +1,4 @@ -GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new()) +var/datum/gear_tweak/item_tf_spawn/gear_tweak_item_tf_spawn = new() /datum/gear_tweak/item_tf_spawn @@ -98,4 +98,4 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol if(istype(I)) I.add_atom_colour(metadata, FIXED_COLOUR_PRIORITY) else - I.color = metadata // fuck off underwear + I.color = metadata // fuck off underwear \ No newline at end of file diff --git a/modular_chomp/code/modules/client/preferences_spawnpoints.dm b/modular_chomp/code/modules/client/preferences_spawnpoints.dm index 3cc84be358..1a4f88fe68 100644 --- a/modular_chomp/code/modules/client/preferences_spawnpoints.dm +++ b/modular_chomp/code/modules/client/preferences_spawnpoints.dm @@ -5,7 +5,7 @@ /datum/spawnpoint/stationgateway/New() ..() - turfs = GLOB.latejoin_gatewaystation + turfs = latejoin_gatewaystation /datum/spawnpoint/vore display_name = "Vorespawn - Prey" @@ -31,4 +31,4 @@ /datum/spawnpoint/plainspath/New() ..() - turfs = GLOB.latejoin_plainspath + turfs = latejoin_plainspath diff --git a/modular_chomp/code/modules/event/meatyores.dm b/modular_chomp/code/modules/event/meatyores.dm index d4413680e1..d84c917cfb 100644 --- a/modular_chomp/code/modules/event/meatyores.dm +++ b/modular_chomp/code/modules/event/meatyores.dm @@ -34,30 +34,30 @@ /datum/event/meteor_wave/meatyores/proc/get_meatyores() switch(severity) if(EVENT_LEVEL_MAJOR) - return GLOB.meatyores_major + return meatyores_major if(EVENT_LEVEL_MODERATE) - return GLOB.meatyores_moderate + return meatyores_moderate else - return GLOB.meatyores_minor + return meatyores_minor -GLOBAL_LIST_INIT(meatyores_minor, list( +var/list/meatyores_minor = list( /obj/effect/meteor/medium/meatyore = 80, /obj/effect/meteor/dust/meatyore = 30, /obj/effect/meteor/irradiated/meatyore = 30, /obj/effect/meteor/big/meatyore = 30, /obj/effect/meteor/flaming/meatyore = 10, -)) +) -GLOBAL_LIST_INIT(meatyores_moderate, list( +var/list/meatyores_moderate = list( /obj/effect/meteor/medium/meatyore = 80, /obj/effect/meteor/big/meatyore = 30, /obj/effect/meteor/dust/meatyore = 30, /obj/effect/meteor/irradiated/meatyore = 30, /obj/effect/meteor/flaming/meatyore = 10, /obj/effect/meteor/emp/meatyore = 10, -)) +) -GLOBAL_LIST_INIT(meatyores_major, list( +var/list/meatyores_major = list( /obj/effect/meteor/medium/meatyore = 80, /obj/effect/meteor/big/meatyore = 30, /obj/effect/meteor/dust/meatyore = 30, @@ -65,4 +65,4 @@ GLOBAL_LIST_INIT(meatyores_major, list( /obj/effect/meteor/emp/meatyore = 30, /obj/effect/meteor/flaming/meatyore = 10, /obj/effect/meteor/tunguska/meatyore = 1, -)) +) diff --git a/modular_chomp/code/modules/flufftext/Dreaming.dm b/modular_chomp/code/modules/flufftext/Dreaming.dm index acd56d8c18..5bbe80603c 100644 --- a/modular_chomp/code/modules/flufftext/Dreaming.dm +++ b/modular_chomp/code/modules/flufftext/Dreaming.dm @@ -1,5 +1,5 @@ /* - dreams = list( +var/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/modular_chomp/code/modules/recycling/v_garbosystem.dm b/modular_chomp/code/modules/recycling/v_garbosystem.dm index 4ce4dfaef5..55c302db69 100644 --- a/modular_chomp/code/modules/recycling/v_garbosystem.dm +++ b/modular_chomp/code/modules/recycling/v_garbosystem.dm @@ -111,7 +111,7 @@ if(items_taken >= voracity) break if(items_taken) //Lazy coder sound design moment. - GLOB.Recycled_Items = GLOB.Recycled_Items + items_taken + Recycled_Items = Recycled_Items + items_taken playsound(src, 'sound/items/poster_being_created.ogg', 50, 1) playsound(src, 'sound/items/electronic_assembly_emptying.ogg', 50, 1) playsound(src, 'sound/effects/metalscrape2.ogg', 50, 1) @@ -142,4 +142,4 @@ if(grinder) return grinder.attack_hand(user) -GLOBAL_VAR_INIT(Recycled_Items, 0) +var/Recycled_Items = 0