From 7fa5ccbd0e114bb134f9be7b01624b35ee389eb9 Mon Sep 17 00:00:00 2001 From: Sishen Date: Wed, 29 Jul 2020 16:14:01 -0600 Subject: [PATCH] fixes slapping uplinks with non uplink items giving runtimes --- code/datums/components/uplink.dm | 13 ++++++++----- code/game/objects/items/granters.dm | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index 2270ecc090..d27cd10c66 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -103,11 +103,14 @@ GLOBAL_LIST_EMPTY(uplinks) if(istype(I, /obj/item/stack/telecrystal)) LoadTC(user, I) if(active) - var/datum/component/uplink/hidden_uplink = I.GetComponent(/datum/component/uplink) - var/amt = hidden_uplink.telecrystals - hidden_uplink.telecrystals -= amt - src.telecrystals += amt - to_chat(user, "You connect the [I] to your uplink, siphoning [amt] telecrystals before quickly undoing the connection.") + if(I.GetComponent(/datum/component/uplink)) + var/datum/component/uplink/hidden_uplink = I.GetComponent(/datum/component/uplink) + var/amt = hidden_uplink.telecrystals + hidden_uplink.telecrystals -= amt + src.telecrystals += amt + to_chat(user, "You connect the [I] to your uplink, siphoning [amt] telecrystals before quickly undoing the connection.") + else + return for(var/category in uplink_items) for(var/item in uplink_items[category]) var/datum/uplink_item/UI = uplink_items[category][item] diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index aa1c7ff6a2..1554142c8c 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -488,7 +488,7 @@ remarks = list("Sweep the legs...", "Chop the throat...", "Punch the lungs...", "Get the gold...", "Where are my sick gloves..?") /obj/item/book/granter/martial/krav_maga/onlearned(mob/living/carbon/user) - ..() + . = ..() if(oneuse == TRUE) desc = "It's completely blank." name = "empty scroll"