cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 00:26:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

next set of globals (#19131)

Browse Source
This commit is contained in:
Kashargul
2026-02-09 00:36:52 +01:00
committed by GitHub
parent bc0df9f988
commit fa113ea3f5
101 changed files with 473 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
+1 -1
View File
@@ -80,7 +80,7 @@
to_chat(user, "No input found please hang up and try your call again.")
return
var/list/tempnetwork = splittext(input, ",")
tempnetwork = difflist(tempnetwork,restricted_camera_networks,1)
tempnetwork = difflist(tempnetwork, GLOB.restricted_camera_networks, 1)
if(tempnetwork.len < 1)
to_chat(user, "No network found please hang up and try your call again.")
return
code/game/objects/items/weapons/storage/misc.dm
+3 -3
View File
@@ -2,7 +2,7 @@
* Donut Box
*/
var/list/random_weighted_donuts = list(
GLOBAL_LIST_INIT(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,
@@ -26,7 +26,7 @@ var/list/random_weighted_donuts = list(
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles = 3,
/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 3,
/obj/item/reagent_containers/food/snacks/donut/chaos = 1
)
))
/obj/item/storage/box/donut
icon = 'icons/obj/food_donuts.dmi'
@@ -43,7 +43,7 @@ var/list/random_weighted_donuts = list(
/obj/item/storage/box/donut/Initialize(mapload)
if(!empty)
for(var/i in 1 to 6)
var/type_to_spawn = pickweight(random_weighted_donuts)
var/type_to_spawn = pickweight(GLOB.random_weighted_donuts)
new type_to_spawn(src)
. = ..()
update_icon()
code/game/objects/items/weapons/tanks/tanks.dm
+4 -4
View File
@@ -1,6 +1,6 @@
#define TANK_IDEAL_PRESSURE 1015 //Arbitrary.
var/list/global/tank_gauge_cache = list()
GLOBAL_LIST_EMPTY(tank_gauge_cache)
/obj/item/tank
name = "tank"
@@ -377,9 +377,9 @@ var/list/global/tank_gauge_cache = list()
cut_overlays()
add_bomb_overlay()
var/indicator = "[gauge_icon][(gauge_pressure == -1) ? "overload" : gauge_pressure]"
if(!tank_gauge_cache[indicator])
tank_gauge_cache[indicator] = image(icon, indicator)
add_overlay(tank_gauge_cache[indicator])
if(!GLOB.tank_gauge_cache[indicator])
GLOB.tank_gauge_cache[indicator] = image(icon, indicator)
add_overlay(GLOB.tank_gauge_cache[indicator])
code/game/objects/structures/girders.dm
+3 -3
View File
@@ -238,7 +238,7 @@
to_chat(user, span_notice("There isn't enough material here to construct a wall."))
return FALSE
var/datum/material/M = name_to_material[S.default_type]
var/datum/material/M = GLOB.name_to_material[S.default_type]
if(!istype(M))
return FALSE
@@ -279,7 +279,7 @@
to_chat(user, span_notice("There isn't enough material here to reinforce the girder."))
return 0
var/datum/material/M = name_to_material[S.default_type]
var/datum/material/M = GLOB.name_to_material[S.default_type]
if(!istype(M) || M.integrity < 50)
to_chat(user, "You cannot reinforce \the [src] with that; it is too soft.")
return 0
@@ -412,7 +412,7 @@
var/turf/simulated/wall/new_T = get_turf(src) // Ref to the wall we just built.
// Apparently set_material(...) for walls requires refs to the material singletons and not strings.
// This is different from how other material objects with their own set_material(...) do it, but whatever.
var/datum/material/M = name_to_material[the_rcd.material_to_use]
var/datum/material/M = GLOB.name_to_material[the_rcd.material_to_use]
new_T.set_material(M, the_rcd.make_rwalls ? M : null, girder_material)
new_T.add_hiddenprint(user)
qdel(src)