diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm
index 6a5cd842ff..3db262d3df 100644
--- a/code/game/gamemodes/newobjective.dm
+++ b/code/game/gamemodes/newobjective.dm
@@ -1045,7 +1045,7 @@ datum
return 20
AI
steal_target = /obj/structure/AIcore
- explanation_text = "Steal a finished AI, either by intellicard or stealing the whole construct."
+ explanation_text = "Steal a finished AI, either by intelliCore or stealing the whole construct."
weight = 50
get_points(var/job)
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 34a9ebd58c..0934f14776 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -202,8 +202,8 @@
transfer.loc = get_turf(src)
transfer.create_eyeobj()
transfer.cancel_camera()
- user << "Transfer successful: [transfer.name] ([rand(1000,9999)].exe) downloaded to host terminal. Local copy wiped."
- transfer << "You have been uploaded to a stationary terminal. Remote device connection restored."
+ user << "Transfer successful: [transfer.name] placed within stationary core."
+ transfer << "You have been transferred into a stationary core. Remote device connection restored."
if(card)
card.clear()
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index cf657e1c10..c495100418 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -18,8 +18,8 @@
return
// Transfer over the AI.
- transfer << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
- user << "Transfer successful: [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
+ transfer << "You have been transferred into a stationary terminal. Sadly, there is no remote access from here."
+ user << "Transfer successful: [transfer.name] placed within stationary terminal."
transfer.loc = src
transfer.cancel_camera()
diff --git a/code/game/machinery/computer3/component.dm b/code/game/machinery/computer3/component.dm
index 47d5e29853..44540a9299 100644
--- a/code/game/machinery/computer3/component.dm
+++ b/code/game/machinery/computer3/component.dm
@@ -41,7 +41,7 @@
*/
/obj/item/part/computer/ai_holder
- name = "intelliCard computer module"
+ name = "intelliCore computer module"
desc = "Contains a specialized nacelle for dealing with highly sensitive equipment without interference."
attackby_types = list(/obj/item/device/aicard)
@@ -81,8 +81,8 @@
return
// Transfer over the AI.
- transfer << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
- user << "Transfer successful: [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
+ transfer << "You have been transferred into a mobile terminal. Sadly, there is no remote access from here."
+ user << "Transfer successful: [transfer.name] placed within mobile terminal."
transfer.loc = src
transfer.cancel_camera()
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index c609d38c4a..5a7a028054 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -1,9 +1,10 @@
/obj/item/device/aicard
- name = "inteliCard"
+ name = "intelliCore"
+ desc = "Used to preserve and transport an AI."
icon = 'icons/obj/pda.dmi'
icon_state = "aicard" // aicard-full
item_state = "aicard"
- w_class = ITEMSIZE_SMALL
+ w_class = ITEMSIZE_NORMAL
slot_flags = SLOT_BELT
show_messages = 0
@@ -57,12 +58,12 @@
var/user = usr
if (href_list["wipe"])
- var/confirm = alert("Are you sure you want to wipe this card's memory? This cannot be undone once started.", "Confirm Wipe", "Yes", "No")
+ var/confirm = alert("Are you sure you want to disable this core's power? This cannot be undone once started.", "Confirm Shutdown", "Yes", "No")
if(confirm == "Yes" && (CanUseTopic(user, state) == STATUS_INTERACTIVE))
- admin_attack_log(user, carded_ai, "Wiped using \the [src.name]", "Was wiped with \the [src.name]", "used \the [src.name] to wipe")
+ admin_attack_log(user, carded_ai, "Purged using \the [src.name]", "Was purged with \the [src.name]", "used \the [src.name] to purge")
flush = 1
carded_ai.suiciding = 1
- carded_ai << "Your core files are being wiped!"
+ carded_ai << "Your power has been disabled!"
while (carded_ai && carded_ai.stat != 2)
carded_ai.adjustOxyLoss(2)
carded_ai.updatehealth()
@@ -93,22 +94,22 @@
/obj/item/device/aicard/proc/grab_ai(var/mob/living/silicon/ai/ai, var/mob/living/user)
if(!ai.client)
- user << "ERROR: AI [ai.name] is offline. Unable to download."
+ user << "ERROR: AI [ai.name] is offline. Unable to transfer."
return 0
if(carded_ai)
- user << "Transfer failed: Existing AI found on remote terminal. Remove existing AI to install a new one."
+ user << "Transfer failed: Existing AI found on remote device. Remove existing AI to install a new one."
return 0
- user.visible_message("\The [user] starts downloading \the [ai] into \the [src]...", "You start downloading \the [ai] into \the [src]...")
- ai << "\The [user] is downloading you into \the [src]!"
+ user.visible_message("\The [user] starts transferring \the [ai] into \the [src]...", "You start transferring \the [ai] into \the [src]...")
+ ai << "\The [user] is transferring you into \the [src]!"
if(do_after(user, 100))
if(istype(ai.loc, /turf/))
new /obj/structure/AIcore/deactivated(get_turf(ai))
ai.carded = 1
- admin_attack_log(user, ai, "Carded with [src.name]", "Was carded with [src.name]", "used the [src.name] to card")
+ admin_attack_log(user, ai, "Extracted with [src.name]", "Was extracted with [src.name]", "used the [src.name] to extract")
src.name = "[initial(name)] - [ai.name]"
ai.loc = src
@@ -119,9 +120,9 @@
carded_ai = ai
if(ai.client)
- ai << "You have been downloaded to a mobile storage device. Remote access lost."
+ ai << "You have been transferred into a mobile core. Remote access lost."
if(user.client)
- user << "Transfer successful: [ai.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
+ user << "Transfer successful: [ai.name] extracted from current device and placed within mobile core."
ai.canmove = 1
update_icon()
diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm
index ccfc307993..c60bdb1e70 100644
--- a/code/modules/clothing/spacesuits/rig/modules/computer.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm
@@ -36,8 +36,8 @@
activates_on_touch = 1
engage_string = "Eject AI"
- activate_string = "Enable Dataspike"
- deactivate_string = "Disable Dataspike"
+ activate_string = "Enable Core Transfer"
+ deactivate_string = "Disable Core Transfer"
interface_name = "integrated intelligence system"
interface_desc = "A socket that supports a range of artificial intelligence systems."
@@ -168,7 +168,7 @@
if(user)
user << "You cannot eject your currently stored AI. Purge it manually."
return 0
- user << "You purge the remaining scraps of data from your previous AI, freeing it for use."
+ user << "You purge the previous AI from your Integrated Intelligence System, freeing it for use."
if(integrated_ai)
integrated_ai.ghostize()
qdel(integrated_ai)
diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm
index 6383e55e34..0ce81678be 100644
--- a/code/modules/mob/living/silicon/ai/latejoin.dm
+++ b/code/modules/mob/living/silicon/ai/latejoin.dm
@@ -10,18 +10,18 @@ var/global/list/empty_playable_ai_cores = list()
return 1
-/mob/living/silicon/ai/verb/wipe_core()
- set name = "Wipe Core"
+/mob/living/silicon/ai/verb/store_core()
+ set name = "Store Core"
set category = "OOC"
- set desc = "Wipe your core. This is functionally equivalent to cryo or robotic storage, freeing up your job slot."
+ set desc = "Enter intelligence storage. This is functionally equivalent to cryo or robotic storage, freeing up your job slot."
if(ticker && ticker.mode && ticker.mode.name == "AI malfunction")
usr << "You cannot use this verb in malfunction. If you need to leave, please adminhelp."
return
// Guard against misclicks, this isn't the sort of thing we want happening accidentally
- if(alert("WARNING: This will immediately wipe your core and ghost you, removing your character from the round permanently (similar to cryo and robotic storage). Are you entirely sure you want to do this?",
- "Wipe Core", "No", "No", "Yes") != "Yes")
+ if(alert("WARNING: This will immediately empty your core and ghost you, removing your character from the round permanently (similar to cryo and robotic storage). Are you entirely sure you want to do this?",
+ "Store Core", "No", "No", "Yes") != "Yes")
return
// We warned you.
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index c052a76d3e..bbf8bc1e8e 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -347,7 +347,7 @@
character.loc = C.loc
- AnnounceCyborg(character, rank, "has been downloaded to the empty core in \the [character.loc.loc]")
+ AnnounceCyborg(character, rank, "has been transferred to the empty core in \the [character.loc.loc]")
ticker.mode.latespawn(character)
qdel(C)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 6f1add522a..76f30baf99 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -659,9 +659,9 @@ other types of metals and chemistry for reagents).
sort_string = "VABAI"
/datum/design/item/intellicard
- name = "'intelliCard', AI preservation and transportation system"
- desc = "Allows for the construction of an intelliCard."
- id = "intellicard"
+ name = "'intelliCore', AI preservation and transportation system"
+ desc = "Allows for the construction of an intelliCore."
+ id = "intellicore"
req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4)
materials = list("glass" = 1000, "gold" = 200)
build_path = /obj/item/device/aicard
diff --git a/html/changelogs/PrismaticGynoid-intelliCores.yml b/html/changelogs/PrismaticGynoid-intelliCores.yml
new file mode 100644
index 0000000000..96e2f631b7
--- /dev/null
+++ b/html/changelogs/PrismaticGynoid-intelliCores.yml
@@ -0,0 +1,4 @@
+author: PrismaticGynoid
+delete-after: True
+changes:
+ - tweak: "Replaces intelliCards with intelliCores."
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index 28158e4838..abdf2bdca9 100644
Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi
index 55de85a668..c8abdbc431 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 64da680c7f..b764be7e73 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/nano/templates/aicard.tmpl b/nano/templates/aicard.tmpl
index be860a52ac..40a192a165 100644
--- a/nano/templates/aicard.tmpl
+++ b/nano/templates/aicard.tmpl
@@ -1,5 +1,5 @@
@@ -89,11 +89,11 @@ Used In File(s): \code\game\objects\items\devices\aicard.dm
| {{:helper.link("Disabled", null, {'wireless' : 1}, data.wireless ? null : 'redButton' )}} |
{{if data.flushing}}
- | AI wipe in progress... |
+ | AI shutdown in progress... |
{{else}}
- | Wipe AI |
- {{:helper.link("Wipe", 'radiation', {'wipe' : 1}, null, 'redButton')}} |
+ AI Power |
+ {{:helper.link("Shutdown", 'radiation', {'wipe' : 1}, null, 'redButton')}} |
{{/if}}