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

Adds null checks to uplink item generation for ssticker mode, so spawned uplinks work pre-game

Browse Source
This commit is contained in:
kevinz000
2017-11-24 20:33:24 -08:00
committed by CitadelStationBot
parent ff94b3e1e1
commit 9bb564a138
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/uplink/uplink_item.dm
+12 -2
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
@@ -1381,8 +1381,13 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
exclude_modes = list(/datum/game_mode/nuclear)
cant_discount = TRUE
<<<<<<< HEAD:code/modules/uplink/uplink_item.dm
/datum/uplink_item/badass/surplus/spawn_item(turf/loc, obj/item/device/uplink/U)
var/list/uplink_items = get_uplink_items(SSticker.mode)
=======
/datum/uplink_item/badass/surplus/spawn_item(turf/loc, datum/component/uplink/U)
var/list/uplink_items = get_uplink_items(SSticker && SSticker.mode? SSticker.mode : null)
>>>>>>> 63b7e4a... Adds null checks to uplink item generation for ssticker mode, so spawned uplinks work pre-game (#33053):code/datums/uplink_items.dm
var/crate_value = 50
var/obj/structure/closet/crate/C = new(loc)
@@ -1409,8 +1414,13 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
cost = 0
cant_discount = TRUE
<<<<<<< HEAD:code/modules/uplink/uplink_item.dm
/datum/uplink_item/badass/random/spawn_item(turf/loc, obj/item/device/uplink/U)
var/list/uplink_items = get_uplink_items(SSticker.mode)
=======
/datum/uplink_item/badass/random/spawn_item(turf/loc, datum/component/uplink/U)
var/list/uplink_items = get_uplink_items(SSticker && SSticker.mode? SSticker.mode : null)
>>>>>>> 63b7e4a... Adds null checks to uplink item generation for ssticker mode, so spawned uplinks work pre-game (#33053):code/datums/uplink_items.dm
var/list/possible_items = list()
for(var/category in uplink_items)
for(var/item in uplink_items[category])