From 6a298f0b87b4aecda86656953e493a0477f6356a Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 19 Aug 2020 02:24:26 +0200 Subject: [PATCH] [MIRROR] Fixes a runtime caused by examining a modular computer with no primary ID slot (#389) * Fixes a runtime caused by examining a modular computer with no primary ID slot (#53009) * Fixes a runtime caused by examining a modular computer with no primary ID slot Co-authored-by: zxaber <37497534+zxaber@users.noreply.github.com> --- .../modular_computers/computers/_modular_computer_shared.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/modular_computers/computers/_modular_computer_shared.dm b/code/modules/modular_computers/computers/_modular_computer_shared.dm index f0583a9af14..77888fdf01b 100644 --- a/code/modules/modular_computers/computers/_modular_computer_shared.dm +++ b/code/modules/modular_computers/computers/_modular_computer_shared.dm @@ -47,9 +47,9 @@ var/obj/item/computer_hardware/card_slot/card_slot2 = get_modular_computer_part(MC_CARD2) var/multiple_slots = istype(card_slot) && istype(card_slot2) if(card_slot) - if(card_slot.stored_card || card_slot2.stored_card) - var/obj/item/card/id/first_ID = card_slot.stored_card - var/obj/item/card/id/second_ID = card_slot2.stored_card + if(card_slot?.stored_card || card_slot2?.stored_card) + var/obj/item/card/id/first_ID = card_slot?.stored_card + var/obj/item/card/id/second_ID = card_slot2?.stored_card var/multiple_cards = istype(first_ID) && istype(second_ID) if(user_is_adjacent) . += "It has [multiple_slots ? "two slots" : "a slot"] for identification cards installed[multiple_cards ? " which contain [first_ID] and [second_ID]" : ", one of which contains [first_ID ? first_ID : second_ID]"]."