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

Merge pull request #4119 from Citadel-Station-13/upstream-merge-33053

Browse Source 
[MIRROR] Adds null checks to uplink item generation for ssticker mode, so spawned uplinks work pre-game
This commit is contained in:
deathride58
2017-11-26 02:19:34 +00:00
committed by GitHub
parent 73bc0fa700 6442a3a751
commit d3b3c54e70
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/uplink/uplink_item.dm
+4 -4
View File
@@ -23,12 +23,12 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
if(!istype(I))
continue
if(I.include_modes.len)
if(!gamemode && SSticker && !(SSticker.mode.type in I.include_modes))
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.type in I.exclude_modes))
if(!gamemode && SSticker && SSticker.mode && (SSticker.mode.type in I.exclude_modes))
continue
if(gamemode && (gamemode in I.exclude_modes))
continue
@@ -1382,7 +1382,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
cant_discount = TRUE
/datum/uplink_item/badass/surplus/spawn_item(turf/loc, obj/item/device/uplink/U)
var/list/uplink_items = get_uplink_items(SSticker.mode)
var/list/uplink_items = get_uplink_items(SSticker && SSticker.mode? SSticker.mode : null)
var/crate_value = 50
var/obj/structure/closet/crate/C = new(loc)
@@ -1410,7 +1410,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
cant_discount = TRUE
/datum/uplink_item/badass/random/spawn_item(turf/loc, obj/item/device/uplink/U)
var/list/uplink_items = get_uplink_items(SSticker.mode)
var/list/uplink_items = get_uplink_items(SSticker && SSticker.mode? SSticker.mode : null)
var/list/possible_items = list()
for(var/category in uplink_items)
for(var/item in uplink_items[category])