Properly defines a few global vars (#7948)

Co-authored-by: Selis <selis@xynolabs.com>
This commit is contained in:
Raeschen
2024-03-27 23:55:55 +01:00
committed by GitHub
co-authored by Selis
parent 2fbb251fca
commit 29b08a0d33
21 changed files with 92 additions and 88 deletions
@@ -1,13 +1,15 @@
var/global_vantag_hud = 0
GLOBAL_VAR_INIT(global_vantag_hud, 0)
/client/proc/toggle_vantag_hud_global(var/mob/target as mob)
/client/proc/toggle_vantag_hud_global(mob/target as mob)
set category = "Fun"
set name = "Toggle Global Event HUD"
set desc = "Give everyone the Event HUD."
global_vantag_hud = !global_vantag_hud
if(global_vantag_hud)
GLOB.global_vantag_hud = !GLOB.global_vantag_hud
if(GLOB.global_vantag_hud)
for(var/mob/living/L in living_mob_list)
if(L.ckey)
L.vantag_hud = TRUE
L.recalculate_vis()
L.recalculate_vis()
to_chat(src, "<span class='warning'>Global Event HUD has been turned [GLOB.global_vantag_hud ? "on" : "off"].</span>")
@@ -1,4 +1,4 @@
var/datum/gear_tweak/item_tf_spawn/gear_tweak_item_tf_spawn = new()
GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new())
/datum/gear_tweak/item_tf_spawn
@@ -5,7 +5,7 @@
/datum/spawnpoint/stationgateway/New()
..()
turfs = latejoin_gatewaystation
turfs = GLOB.latejoin_gatewaystation
/datum/spawnpoint/vore
display_name = "Vorespawn - Prey"
@@ -31,4 +31,4 @@
/datum/spawnpoint/plainspath/New()
..()
turfs = latejoin_plainspath
turfs = GLOB.latejoin_plainspath
@@ -34,30 +34,30 @@
/datum/event/meteor_wave/meatyores/proc/get_meatyores()
switch(severity)
if(EVENT_LEVEL_MAJOR)
return meatyores_major
return GLOB.meatyores_major
if(EVENT_LEVEL_MODERATE)
return meatyores_moderate
return GLOB.meatyores_moderate
else
return meatyores_minor
return GLOB.meatyores_minor
var/list/meatyores_minor = list(
GLOBAL_LIST_INIT(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,
)
))
var/list/meatyores_moderate = list(
GLOBAL_LIST_INIT(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,
)
))
var/list/meatyores_major = list(
GLOBAL_LIST_INIT(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 @@ var/list/meatyores_major = list(
/obj/effect/meteor/emp/meatyore = 30,
/obj/effect/meteor/flaming/meatyore = 10,
/obj/effect/meteor/tunguska/meatyore = 1,
)
))
@@ -1,5 +1,5 @@
/*
var/list/dreams = 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",
@@ -111,7 +111,7 @@
if(items_taken >= voracity)
break
if(items_taken) //Lazy coder sound design moment.
Recycled_Items = Recycled_Items + items_taken
GLOB.Recycled_Items = GLOB.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)
var/Recycled_Items = 0
GLOBAL_VAR_INIT(Recycled_Items, 0)