Merge pull request #12086 from AnturK/loneop

Nukeop Outfits,Uplink gamemode override, Lone Operative event.
This commit is contained in:
Remie Richards
2015-10-13 23:02:51 +01:00
7 changed files with 179 additions and 36 deletions
+21 -6
View File
@@ -1,6 +1,6 @@
var/list/uplink_items = list()
/proc/get_uplink_items()
/proc/get_uplink_items(var/gamemode_override=null)
// If not already initialized..
if(!uplink_items.len)
@@ -13,10 +13,6 @@ var/list/uplink_items = list()
var/datum/uplink_item/I = new item()
if(!I.item)
continue
if(I.gamemodes.len && ticker && !(ticker.mode.type in I.gamemodes))
continue
if(I.excludefrom.len && ticker && (ticker.mode.type in I.excludefrom))
continue
if(I.last)
last += I
continue
@@ -33,7 +29,26 @@ var/list/uplink_items = list()
uplink_items[I.category] += I
return uplink_items
//Filtered version
var/list/filtered_uplink_items = list()
for(var/category in uplink_items)
for(var/datum/uplink_item/I in uplink_items[category])
if(I.gamemodes.len)
if(!gamemode_override && ticker && !(ticker.mode.type in I.gamemodes))
continue
if(gamemode_override && !(gamemode_override in I.gamemodes))
continue
if(I.excludefrom.len)
if(!gamemode_override && ticker && (ticker.mode.type in I.excludefrom))
continue
if(gamemode_override && (gamemode_override in I.excludefrom))
continue
if(!filtered_uplink_items[I.category])
filtered_uplink_items[I.category] = list()
filtered_uplink_items[category] += I
return filtered_uplink_items
// You can change the order of the list by putting datums before/after one another OR
// you can use the last variable to make sure it appears last, well have the category appear last.