cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 16:48:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] var/global/list -> GLOB. conversion (#11193)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-07-16 00:24:42 +02:00
committed by GitHub
co-authored by Cameron Lennox Kashargul
parent 6f8cbcf612
commit 2c9453b5c3
423 changed files with 2496 additions and 2498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/random_map/drop/drop_types.dm
-2
View File
@@ -1,5 +1,3 @@
var/global/list/datum/supply_drop_loot/supply_drop
/proc/supply_drop_random_loot_types()
if(!supply_drop)
supply_drop = init_subtypes(/datum/supply_drop_loot)
code/modules/random_map/random_map.dm
+5 -8
View File
@@ -1,7 +1,4 @@
// Generates cave systems for the asteroid, and places ore tiles.
var/global/list/random_maps = list()
var/global/list/map_count = list()
/datum/random_map
// Strings.
@@ -37,12 +34,12 @@ var/global/list/map_count = list()
/datum/random_map/New(var/seed, var/tx, var/ty, var/tz, var/tlx, var/tly, var/do_not_apply, var/do_not_announce)
// Store this for debugging.
if(!map_count[descriptor])
map_count[descriptor] = 1
if(!GLOB.map_count[descriptor])
GLOB.map_count[descriptor] = 1
else
map_count[descriptor]++
name = "[descriptor] #[map_count[descriptor]]"
if(preserve_map) random_maps[name] = src
GLOB.map_count[descriptor]++
name = "[descriptor] #[GLOB.map_count[descriptor]]"
if(preserve_map) GLOB.random_maps[name] = src
// Get origins for applying the map later.
set_origins(tx, ty, tz)
code/modules/random_map/random_map_verbs.dm
+11 -11
View File
@@ -5,10 +5,10 @@
if(!check_rights_for(src, R_HOLDER)) return
var/choice = tgui_input_list(usr, "Choose a map to display.", "Map Choice", random_maps)
var/choice = tgui_input_list(usr, "Choose a map to display.", "Map Choice", GLOB.random_maps)
if(!choice)
return
var/datum/random_map/M = random_maps[choice]
var/datum/random_map/M = GLOB.random_maps[choice]
if(istype(M))
M.display_map(usr)
@@ -19,11 +19,11 @@
if(!check_rights_for(src, R_HOLDER)) return
var/choice = tgui_input_list(usr, "Choose a map to delete.", "Map Choice", random_maps)
var/choice = tgui_input_list(usr, "Choose a map to delete.", "Map Choice", GLOB.random_maps)
if(!choice)
return
var/datum/random_map/M = random_maps[choice]
random_maps[choice] = null
var/datum/random_map/M = GLOB.random_maps[choice]
GLOB.random_maps[choice] = null
if(istype(M))
message_admins("[key_name_admin(usr)] has deleted [M.name].")
log_admin("[key_name(usr)] has deleted [M.name].")
@@ -60,10 +60,10 @@
if(!check_rights_for(src, R_HOLDER)) return
var/choice = tgui_input_list(usr, "Choose a map to apply.", "Map Choice", random_maps)
var/choice = tgui_input_list(usr, "Choose a map to apply.", "Map Choice", GLOB.random_maps)
if(!choice)
return
var/datum/random_map/M = random_maps[choice]
var/datum/random_map/M = GLOB.random_maps[choice]
if(istype(M))
var/tx = tgui_input_number(usr, "X? (default to current turf)")
var/ty = tgui_input_number(usr, "Y? (default to current turf)")
@@ -85,17 +85,17 @@
if(!check_rights_for(src, R_HOLDER)) return
var/choice = tgui_input_list(usr, "Choose a map as base.", "Map Choice", random_maps)
var/choice = tgui_input_list(usr, "Choose a map as base.", "Map Choice", GLOB.random_maps)
if(!choice)
return
var/datum/random_map/base_map = random_maps[choice]
var/datum/random_map/base_map = GLOB.random_maps[choice]
choice = null
choice = tgui_input_list(usr, "Choose a map to overlay.", "Map Choice", random_maps)
choice = tgui_input_list(usr, "Choose a map to overlay.", "Map Choice", GLOB.random_maps)
if(!choice)
return
var/datum/random_map/overlay_map = random_maps[choice]
var/datum/random_map/overlay_map = GLOB.random_maps[choice]
if(istype(base_map) && istype(overlay_map))
var/tx = tgui_input_number(usr, "X? (default to 1)")