cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00: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-15 15:24:42 -07:00
committed by GitHub
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

14
code/modules/projectiles/ammunition.dm
View File

@@ -221,16 +221,16 @@
. += "There [(stored_ammo.len == 1)? "is" : "are"] [stored_ammo.len] round\s left!"
//magazine icon state caching
/var/global/list/magazine_icondata_keys = list()
/var/global/list/magazine_icondata_states = list()
GLOBAL_LIST_EMPTY(magazine_icondata_keys)
GLOBAL_LIST_EMPTY(magazine_icondata_states)
/proc/initialize_magazine_icondata(var/obj/item/ammo_magazine/M)
var/typestr = M.type
if(!(typestr in magazine_icondata_keys) || !(typestr in magazine_icondata_states))
if(!(typestr in GLOB.magazine_icondata_keys) || !(typestr in GLOB.magazine_icondata_states))
magazine_icondata_cache_add(M)
M.icon_keys = magazine_icondata_keys[typestr]
M.ammo_states = magazine_icondata_states[typestr]
M.icon_keys = GLOB.magazine_icondata_keys[typestr]
M.ammo_states = GLOB.magazine_icondata_states[typestr]
/proc/magazine_icondata_cache_add(var/obj/item/ammo_magazine/M)
var/list/icon_keys = list()
@@ -242,8 +242,8 @@
icon_keys += i
ammo_states += ammo_state
magazine_icondata_keys[M.type] = icon_keys
magazine_icondata_states[M.type] = ammo_states
GLOB.magazine_icondata_keys[M.type] = icon_keys
GLOB.magazine_icondata_states[M.type] = ammo_states
/*
* Ammo Boxes

21
code/modules/projectiles/guns/projectile/pistol.dm
View File

@@ -341,26 +341,9 @@
load_method = SINGLE_CASING
max_shells = 1 //literally just a barrel
var/list/ammo_types = list( //CHOMPEdit why is this global?
/obj/item/ammo_casing/a357 = ".357",
/obj/item/ammo_casing/a9mm = "9mm",
/obj/item/ammo_casing/a45 = ".45",
/obj/item/ammo_casing/a10mm = "10mm",
/obj/item/ammo_casing/a12g = "12g",
/obj/item/ammo_casing/a12g = "12g",
/obj/item/ammo_casing/a12g/pellet = "12g",
/obj/item/ammo_casing/a12g/pellet = "12g",
/obj/item/ammo_casing/a12g/pellet = "12g",
/obj/item/ammo_casing/a12g/beanbag = "12g",
/obj/item/ammo_casing/a12g/stunshell = "12g",
/obj/item/ammo_casing/a12g/flash = "12g",
/obj/item/ammo_casing/a762 = "7.62mm",
/obj/item/ammo_casing/a545 = "5.45mm"
)
/obj/item/gun/projectile/pirate/Initialize(mapload)
ammo_type = pick(ammo_types)
desc += " Uses [ammo_types[ammo_type]] rounds."
ammo_type = pick(GLOB.global_ammo_types)
desc += " Uses [GLOB.global_ammo_types[ammo_type]] rounds."
var/obj/item/ammo_casing/ammo = ammo_type
caliber = initial(ammo.caliber)