From 14ba039d81e2eef99b4e43de67add90ce660b1d5 Mon Sep 17 00:00:00 2001 From: Citinited Date: Wed, 30 May 2018 21:45:23 +0100 Subject: [PATCH] GLOB --- code/__HELPERS/global_lists.dm | 13 ++++++------- code/_globalvars/lists/objects.dm | 2 -- code/datums/pipe_datums.dm | 2 ++ code/game/objects/items/weapons/rpd.dm | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 2af41d294db..367028b3936 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -49,14 +49,13 @@ whitelisted_species += S.name init_subtypes(/datum/crafting_recipe, crafting_recipes) - -//RPD stuff - var/list/pipe_list = list() - init_subtypes(/datum/pipes/atmospheric, pipe_list) - init_subtypes(/datum/pipes/disposal, pipe_list) - for(var/I in pipe_list) + var/list/temp_pipe_list = list() + init_subtypes(/datum/pipes/atmospheric, temp_pipe_list) + init_subtypes(/datum/pipes/disposal, temp_pipe_list) + for(var/I in temp_pipe_list) var/datum/pipes/P = I - construction_pipe_list += list(list("pipename" = P.pipename, "pipeid" = P.pipeid, "atmosordisposals" = P.pipetype, "category" = P.category, "orientations" = P.orientations, "icon" = P.previewicon, "bendy" = P.bendy)) + GLOB.construction_pipe_list += list(list("pipename" = P.pipename, "pipeid" = P.pipeid, "atmosordisposals" = P.pipetype, "category" = P.category, "orientations" = P.orientations, "icon" = P.previewicon, "bendy" = P.bendy)) + return 1 /* // Uncomment to debug chemical reaction list. diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 62bc1716c36..82d4c113997 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -44,5 +44,3 @@ var/global/list/poi_list = list() //list of points of interest for observe/f var/global/list/active_jammers = list() // List of active radio jammers var/global/list/active_diseases = list() //List of Active disease in all mobs; purely for quick referencing. - -var/global/list/construction_pipe_list = list() //List of all pipe datums diff --git a/code/datums/pipe_datums.dm b/code/datums/pipe_datums.dm index 95850555a6e..14d42510fb6 100644 --- a/code/datums/pipe_datums.dm +++ b/code/datums/pipe_datums.dm @@ -3,6 +3,8 @@ #define RPD_ATMOS 1 #define RPD_DISPOSAL 2 +GLOBAL_LIST_EMPTY(construction_pipe_list) //List of all pipe datums + /datum/pipes var/pipename //What the pipe is called in the interface var/pipeid //Use the pipe define for this diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index b74ff4ba594..98639030b3a 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -144,7 +144,7 @@ var/list/pipemenu = list( data["iconrotation"] = iconrotation data["mainmenu"] = mainmenu data["mode"] = mode - data["pipelist"] = construction_pipe_list + data["pipelist"] = GLOB.construction_pipe_list data["pipemenu"] = pipemenu data["pipetype"] = pipetype data["whatdpipe"] = whatdpipe