From 2f481de07d726019c2287df428cf70de4d321f9c Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Sun, 30 Jul 2017 22:51:03 -0700 Subject: [PATCH] Bugfix. --- code/datums/uplink/uplink_items.dm | 5 +++-- code/datums/uplink/visible_weapons.dm | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm index 32125a8f4c..94b1281dd3 100644 --- a/code/datums/uplink/uplink_items.dm +++ b/code/datums/uplink/uplink_items.dm @@ -86,8 +86,9 @@ var/datum/uplink/uplink = new() for(var/antag_role in antag_roles) var/datum/antagonist/antag = all_antag_types[antag_role] - if(antag.is_antagonist(U.uplink_owner)) - return 1 + if(!isnull(antag)) + if(antag.is_antagonist(U.uplink_owner)) + return 1 return 0 /datum/uplink_item/proc/cost(var/telecrystals, obj/item/device/uplink/U) diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index 70930a50da..ba9ce3660a 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -103,14 +103,14 @@ name = "Anti-Materiel Rifle (14.5mm)" item_cost = DEFAULT_TELECRYSTAL_AMOUNT path = /obj/item/weapon/gun/projectile/heavysniper - antag_roles = list("Mercenary") + antag_roles = list("mercenary") /datum/uplink_item/item/visible_weapons/heavysnipertraitor name = "Anti-Materiel Rifle (14.5mm)" desc = "A convenient collapsible rifle for covert assassination. Comes with 4 shots and its own secure carrying case." item_cost = DEFAULT_TELECRYSTAL_AMOUNT path = /obj/item/weapon/storage/secure/briefcase/rifle - antag_roles = list("Traitor") + antag_roles = list("traitor") /datum/uplink_item/item/visible_weapons/tommygun name = "Tommygun (.45)" // We're keeping this because it's CLASSY. -Spades