Merge pull request #1890 from Citadel-Station-13/upstream-merge-28989

[MIRROR] Fixes cartridges not linking with their host PDAs on creation
This commit is contained in:
LetterJay
2017-07-06 09:26:40 -05:00
committed by GitHub
+4 -3
View File
@@ -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