shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes noslip shoes not showing up in nuke ops uplink (#35621)

Browse Source 
* Fixes noslip shoes not showing up for nuke ops

* Updates other references to GLOB.uplink_items

* Removes unnecessary SSticker checks
This commit is contained in:
YPOQ
2018-02-19 13:47:55 -07:00
committed by CitadelStationBot
parent fef23bd7cc
commit 87d8be5287
2 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/techweb/all_nodes.dm
+5 -5
View File
@@ -874,11 +874,11 @@
/datum/techweb_node/syndicate_basic/New() //Crappy way of making syndicate gear decon supported until there's another way.
. = ..()
boost_item_paths = list()
for(var/cat in GLOB.uplink_items)
var/list/l = cat
for(var/i in l)
var/datum/uplink_item/UI = i
boost_item_paths[UI.item] = 0 //allows deconning to unlock.
for(var/path in GLOB.uplink_items)
var/datum/uplink_item/UI = new path
if(!UI.item)
continue
boost_item_paths[UI.item] = 0 //allows deconning to unlock.
//HELPERS
/proc/total_techweb_exports()
code/modules/uplink/uplink_items.dm
+20 -39
View File
@@ -1,45 +1,31 @@
GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/proc/initialize_global_uplink_items()
GLOB.uplink_items = list()
for(var/item in subtypesof(/datum/uplink_item))
var/datum/uplink_item/I = new item()
if(!I.item)
continue
if(!GLOB.uplink_items[I.category])
GLOB.uplink_items[I.category] = list()
GLOB.uplink_items[I.category][I.name] = I
GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/proc/get_uplink_items(var/datum/game_mode/gamemode = null, allow_sales = TRUE)
if(!GLOB.uplink_items.len)
initialize_global_uplink_items()
var/list/filtered_uplink_items = list()
var/list/sale_items = list()
for(var/category in GLOB.uplink_items)
for(var/item in GLOB.uplink_items[category])
var/datum/uplink_item/I = GLOB.uplink_items[category][item]
if(!istype(I))
for(var/path in GLOB.uplink_items)
var/datum/uplink_item/I = new path
if(!I.item)
continue
if(I.include_modes.len)
if(!gamemode && SSticker.mode && !(SSticker.mode.type in I.include_modes))
continue
if(I.include_modes.len)
if(!gamemode && SSticker && SSticker.mode && !(SSticker.mode.type in I.include_modes))
continue
if(gamemode && !(gamemode in I.include_modes))
continue
if(I.exclude_modes.len)
if(!gamemode && SSticker && SSticker.mode && (SSticker.mode.type in I.exclude_modes))
continue
if(gamemode && (gamemode in I.exclude_modes))
continue
if(I.player_minimum && I.player_minimum > GLOB.joined_player_list.len)
if(gamemode && !(gamemode in I.include_modes))
continue
if(I.exclude_modes.len)
if(!gamemode && SSticker.mode && (SSticker.mode.type in I.exclude_modes))
continue
if(gamemode && (gamemode in I.exclude_modes))
continue
if(I.player_minimum && I.player_minimum > GLOB.joined_player_list.len)
continue
if(!filtered_uplink_items[category])
filtered_uplink_items[category] = list()
filtered_uplink_items[category][item] = new I.type()
if(I.limited_stock < 0 && !I.cant_discount && I.item && I.cost > 1)
sale_items += I
if(!filtered_uplink_items[I.category])
filtered_uplink_items[I.category] = list()
filtered_uplink_items[I.category][I.name] = I
if(I.limited_stock < 0 && !I.cant_discount && I.item && I.cost > 1)
sale_items += I
if(allow_sales)
for(var/i in 1 to 3)
var/datum/uplink_item/I = pick_n_take(sale_items)
@@ -110,11 +96,6 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
to_chat(user, "[A] materializes onto the floor.")
return A
/datum/uplink_item/Destroy()
if(src in GLOB.uplink_items)
GLOB.uplink_items -= src //Take us out instead of leaving a null!
return ..()
//Discounts (dynamically filled above)
/datum/uplink_item/discounts
category = "Discounted Gear"