cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 09:00:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Turn more unmanaged global vars into GLOB (#20446)

Browse Source 
Turned a ton of unmanaged globals into managed globals.
Refactored some UT output.
Removed some unused things, including vars.
Added a test to ensure people don't keep adding new unmanaged vars.
This commit is contained in:
Fluffy
2025-02-17 23:34:02 +00:00
committed by GitHub
parent eff1fb22de
commit 7265630dde
377 changed files with 1893 additions and 2288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Logging.dm
+3 -4
View File
@@ -1,5 +1,4 @@
/var/list/chemical_reaction_logs = list()
GLOBAL_LIST_EMPTY(chemical_reaction_logs)
/proc/log_chemical_reaction(atom/A, datum/chemical_reaction/R, multiplier)
if(!A || !R)
@@ -8,7 +7,7 @@
var/turf/T = get_turf(A)
var/logstr = "[usr ? key_name(usr) : "EVENT"] mixed [R.name] ([R.result]) (x[multiplier]) in \the [A] at [T ? "[T.x],[T.y],[T.z]" : "*null*"]"
chemical_reaction_logs += "\[[time_stamp()]\] [logstr]"
GLOB.chemical_reaction_logs += "\[[time_stamp()]\] [logstr]"
if(R.log_is_important)
message_admins(logstr)
@@ -22,7 +21,7 @@
return
var/html = ""
for(var/entry in chemical_reaction_logs)
for(var/entry in GLOB.chemical_reaction_logs)
html += "[entry]<br>"
usr << browse(html, "window=chemlogs")
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
+3 -3
View File
@@ -219,12 +219,12 @@
if(vampire)
if(vampire.status & VAMP_ISTHRALL)
if(prob(10))
thralls.remove_antagonist(M.mind)
GLOB.thralls.remove_antagonist(M.mind)
else
vampire.frenzy += removed * 5
M.take_organ_damage(0, removed * 6)
if(cult.is_antagonist(M.mind) && prob(10))
cult.remove_antagonist(M.mind)
if(GLOB.cult.is_antagonist(M.mind) && prob(10))
GLOB.cult.remove_antagonist(M.mind)
if(alien && alien == IS_UNDEAD)
M.adjust_fire_stacks(10)
M.IgniteMob()
code/modules/reagents/reagent_containers/food/lunch.dm
+42 -42
View File
@@ -1,4 +1,4 @@
var/list/lunchables_lunches_ = list(
GLOBAL_LIST_INIT(lunchables_lunches_, list(
/obj/item/reagent_containers/food/snacks/sandwich,
/obj/item/reagent_containers/food/snacks/meatbreadslice/filled,
/obj/item/reagent_containers/food/snacks/tofubreadslice/filled,
@@ -33,9 +33,9 @@ var/list/lunchables_lunches_ = list(
/obj/item/reagent_containers/food/snacks/batwings,
/obj/item/reagent_containers/food/snacks/salad/earthenroot,
/obj/item/reagent_containers/food/snacks/pepperoniroll
)
))
var/list/lunchables_snacks_ = list(
GLOBAL_LIST_INIT(lunchables_snacks_, list(
/obj/item/reagent_containers/food/snacks/donut/jelly,
/obj/item/reagent_containers/food/snacks/donut/cherryjelly,
/obj/item/reagent_containers/food/snacks/muffin,
@@ -82,9 +82,9 @@ var/list/lunchables_snacks_ = list(
/obj/item/reagent_containers/food/snacks/stuffed_meatball,
/obj/item/reagent_containers/food/snacks/grilled_peppers,
/obj/item/reagent_containers/food/snacks/salmiak
)
))
var/list/lunchables_drinks_ = list(
GLOBAL_LIST_INIT(lunchables_drinks_, list(
/obj/item/reagent_containers/food/drinks/cans/cola,
/obj/item/reagent_containers/food/drinks/waterbottle,
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind,
@@ -119,16 +119,16 @@ var/list/lunchables_drinks_ = list(
/obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi,
/obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn,
/obj/item/reagent_containers/food/drinks/cans/zorasoda/buzz
)
))
var/list/lunchables_vaurca_ = list(
GLOBAL_LIST_INIT(lunchables_vaurca_, list(
/obj/item/reagent_containers/food/snacks/koiswaffles,
/obj/item/reagent_containers/food/snacks/koisburger,
/obj/item/reagent_containers/food/snacks/soup/kois,
/obj/item/reagent_containers/food/snacks/koissteak
)
))
var/list/lunchables_vaurca_snack_ = list(
GLOBAL_LIST_INIT(lunchables_vaurca_snack_, list(
/obj/item/reagent_containers/food/snacks/donut/kois,
/obj/item/reagent_containers/food/snacks/koiskebab3,
/obj/item/reagent_containers/food/snacks/friedkois,
@@ -138,28 +138,28 @@ var/list/lunchables_vaurca_snack_ = list(
/obj/item/reagent_containers/food/snacks/koisbar_clean,
/obj/item/storage/box/fancy/vkrexitaffy,
/obj/item/reagent_containers/food/snacks/koisrouladeslice/filled
)
))
var/list/lunchables_utensil_ = list(
GLOBAL_LIST_INIT(lunchables_utensil_, list(
/obj/item/material/kitchen/utensil/fork/chopsticks,
/obj/item/material/kitchen/utensil/fork/chopsticks/bamboo,
/obj/item/material/kitchen/utensil/fork/plastic,
/obj/item/material/kitchen/utensil/spoon/plastic,
/obj/item/material/kitchen/utensil/knife/plastic
)
))
// This default list is a bit different, it contains items we don't want
var/list/lunchables_drink_reagents_ = list(
GLOBAL_LIST_INIT(lunchables_drink_reagents_, list(
/singleton/reagent/drink/nothing,
/singleton/reagent/drink/doctorsdelight,
/singleton/reagent/drink/dry_ramen,
/singleton/reagent/drink/hell_ramen,
/singleton/reagent/drink/hot_ramen,
/singleton/reagent/drink/nuka_cola
)
))
// This default list is a bit different, it contains items we don't want
var/list/lunchables_alcohol_reagents_ = list(
GLOBAL_LIST_INIT(lunchables_alcohol_reagents_, list(
/singleton/reagent/alcohol,
/singleton/reagent/alcohol/acid_spit,
/singleton/reagent/alcohol/atomicbomb,
@@ -174,49 +174,49 @@ var/list/lunchables_alcohol_reagents_ = list(
/singleton/reagent/alcohol/threemileisland,
/singleton/reagent/alcohol/toxins_special,
/singleton/reagent/alcohol/nmshaan_liquor/darmadhirbrew
)
))
/proc/lunchables_lunches()
if(!(lunchables_lunches_[lunchables_lunches_[1]]))
lunchables_lunches_ = init_lunchable_list(lunchables_lunches_)
return lunchables_lunches_
if(!(GLOB.lunchables_lunches_[GLOB.lunchables_lunches_[1]]))
GLOB.lunchables_lunches_ = init_lunchable_list(GLOB.lunchables_lunches_)
return GLOB.lunchables_lunches_
/proc/lunchables_vaurca()
if(!(lunchables_vaurca_[lunchables_vaurca_[1]]))
lunchables_vaurca_ = init_lunchable_list(lunchables_vaurca_)
return lunchables_vaurca_
if(!(GLOB.lunchables_vaurca_[GLOB.lunchables_vaurca_[1]]))
GLOB.lunchables_vaurca_ = init_lunchable_list(GLOB.lunchables_vaurca_)
return GLOB.lunchables_vaurca_
/proc/lunchables_vaurca_snack()
if(!(lunchables_vaurca_snack_[lunchables_vaurca_snack_[1]]))
lunchables_vaurca_snack_ = init_lunchable_list(lunchables_vaurca_snack_)
return lunchables_vaurca_snack_
if(!(GLOB.lunchables_vaurca_snack_[GLOB.lunchables_vaurca_snack_[1]]))
GLOB.lunchables_vaurca_snack_ = init_lunchable_list(GLOB.lunchables_vaurca_snack_)
return GLOB.lunchables_vaurca_snack_
/proc/lunchables_snacks()
if(!(lunchables_snacks_[lunchables_snacks_[1]]))
lunchables_snacks_ = init_lunchable_list(lunchables_snacks_)
return lunchables_snacks_
if(!(GLOB.lunchables_snacks_[GLOB.lunchables_snacks_[1]]))
GLOB.lunchables_snacks_ = init_lunchable_list(GLOB.lunchables_snacks_)
return GLOB.lunchables_snacks_
/proc/lunchables_drinks()
if(!(lunchables_drinks_[lunchables_drinks_[1]]))
lunchables_drinks_ = init_lunchable_list(lunchables_drinks_)
return lunchables_drinks_
if(!(GLOB.lunchables_drinks_[GLOB.lunchables_drinks_[1]]))
GLOB.lunchables_drinks_ = init_lunchable_list(GLOB.lunchables_drinks_)
return GLOB.lunchables_drinks_
/proc/lunchables_utensil()
if(!(lunchables_utensil_[lunchables_utensil_[1]]))
lunchables_utensil_ = init_lunchable_list(lunchables_utensil_)
return lunchables_utensil_
if(!(GLOB.lunchables_utensil_[GLOB.lunchables_utensil_[1]]))
GLOB.lunchables_utensil_ = init_lunchable_list(GLOB.lunchables_utensil_)
return GLOB.lunchables_utensil_
/proc/lunchables_drink_reagents()
if(!(lunchables_drink_reagents_[lunchables_drink_reagents_[1]]))
lunchables_drink_reagents_ = init_lunchable_reagent_list(lunchables_drink_reagents_, /singleton/reagent/drink)
lunchables_drink_reagents_["Water"] = /singleton/reagent/water //We do it here because it is not considered a 'drink'
lunchables_drink_reagents_ = sortList(lunchables_drink_reagents_)
return lunchables_drink_reagents_
if(!(GLOB.lunchables_drink_reagents_[GLOB.lunchables_drink_reagents_[1]]))
GLOB.lunchables_drink_reagents_ = init_lunchable_reagent_list(GLOB.lunchables_drink_reagents_, /singleton/reagent/drink)
GLOB.lunchables_drink_reagents_["Water"] = /singleton/reagent/water //We do it here because it is not considered a 'drink'
GLOB.lunchables_drink_reagents_ = sortList(GLOB.lunchables_drink_reagents_)
return GLOB.lunchables_drink_reagents_
/proc/lunchables_alcohol_reagents()
if(!(lunchables_alcohol_reagents_[lunchables_alcohol_reagents_[1]]))
lunchables_alcohol_reagents_ = init_lunchable_reagent_list(lunchables_alcohol_reagents_, /singleton/reagent/alcohol)
return lunchables_alcohol_reagents_
if(!(GLOB.lunchables_alcohol_reagents_[GLOB.lunchables_alcohol_reagents_[1]]))
GLOB.lunchables_alcohol_reagents_ = init_lunchable_reagent_list(GLOB.lunchables_alcohol_reagents_, /singleton/reagent/alcohol)
return GLOB.lunchables_alcohol_reagents_
/proc/lunchables_all_drink_reagents()
return sortList(lunchables_drink_reagents() + lunchables_alcohol_reagents())
code/modules/reagents/reagent_containers/food/snacks/cultural/skrell.dm
+6 -6
View File
@@ -9,16 +9,16 @@
/obj/item/reagent_containers/food/snacks/lortl/Initialize()
. = ..()
if(!fruit_icon_cache["rind-#B1E4BE"])
if(!GLOB.fruit_icon_cache["rind-#B1E4BE"])
var/image/I = image(icon,"fruit_rind")
I.color = "#B1E4BE"
fruit_icon_cache["rind-#B1E4BE"] = I
AddOverlays(fruit_icon_cache["rind-#B1E4BE"])
if(!fruit_icon_cache["slice-#B1E4BE"])
GLOB.fruit_icon_cache["rind-#B1E4BE"] = I
AddOverlays(GLOB.fruit_icon_cache["rind-#B1E4BE"])
if(!GLOB.fruit_icon_cache["slice-#B1E4BE"])
var/image/I = image(icon,"fruit_slice")
I.color = "#9FE4B0"
fruit_icon_cache["slice-#B1E4BE"] = I
AddOverlays(fruit_icon_cache["slice-#B1E4BE"])
GLOB.fruit_icon_cache["slice-#B1E4BE"] = I
AddOverlays(GLOB.fruit_icon_cache["slice-#B1E4BE"])
/obj/item/reagent_containers/food/snacks/soup/qilvo
name = "qilvo"