From cdb3158af54833e4225cf629556150be203853ad Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 6 Jul 2017 09:06:29 -0500 Subject: [PATCH] Fixes cartridges not linking with their host PDAs on creation --- code/game/objects/items/devices/PDA/cart.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index fc94e03c39..879860b7b5 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -48,9 +48,10 @@ var/mob/living/simple_animal/bot/active_bot var/list/botlist = list() -/obj/item/weapon/cartridge/Initialize(var/obj/item/device/pda/pda) - ..() - if(pda) +/obj/item/weapon/cartridge/Initialize() + . = ..() + var/obj/item/device/pda/pda = loc + if(istype(pda)) host_pda = pda /obj/item/weapon/cartridge/engineering