From 631a544ddbe22cb85b06d9b6414a8d833eb76e6b Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 25 Apr 2020 13:22:53 -0700 Subject: [PATCH] Merge pull request #7036 from atlantiscze/2020_04_24_IntellicoreFix Fixes Intellicore grabbing AI multiple times --- code/game/objects/items/devices/aicard.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 05260e3d2f1..f20e340f342 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -115,6 +115,9 @@ show_message(span("critical", "\The [user] is transferring you into \the [src]!")) if(do_after(user, 100)) + if(carded_ai) + to_chat(user, "Transfer failed: Existing AI found on remote device. Remove existing AI to install a new one.") + return 0 if(istype(ai.loc, /turf/)) new /obj/structure/AIcore/deactivated(get_turf(ai))