From 7e4aef46d98d2e80d7ec39a9bfb41346f3685d4e Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 3 Nov 2019 04:23:31 +0100
Subject: [PATCH] Unmodularize and update pAI/Intellicards very slighty.
---
code/game/objects/items/devices/aicard.dm | 11 +++++++--
code/game/objects/items/devices/paicard.dm | 6 +++--
code/modules/crafting/recipes/recipes_misc.dm | 10 +-------
.../modules/crafting/recipes/recipes_robot.dm | 22 ++++++++++++++----
code/modules/mob/living/silicon/ai/death.dm | 2 ++
.../mob/living/silicon/pai/software.dm | 8 ++++---
icons/obj/aicards.dmi | Bin 3069 -> 3905 bytes
.../code/game/objects/items/devices/aicard.dm | 4 ----
modular_citadel/icons/aicards.dmi | Bin 1033 -> 0 bytes
modular_citadel/icons/obj/aicards.dmi | Bin 439 -> 0 bytes
10 files changed, 39 insertions(+), 24 deletions(-)
delete mode 100644 modular_citadel/code/game/objects/items/devices/aicard.dm
delete mode 100644 modular_citadel/icons/aicards.dmi
delete mode 100644 modular_citadel/icons/obj/aicards.dmi
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 679dbecd10..7c21ac9144 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -17,6 +17,11 @@
desc = "A stylish upgrade (?) to the intelliCard."
icon_state = "aitater"
+/obj/item/aicard/aispook
+ name = "intelliLantern"
+ desc = "A spoOoOoky upgrade to the intelliCard."
+ icon_state = "aispook"
+
/obj/item/aicard/suicide_act(mob/living/user)
user.visible_message("[user] is trying to upload [user.p_them()]self into [src]! That's not going to work out well!")
return BRUTELOSS
@@ -26,16 +31,18 @@
if(!proximity || !target)
return
if(AI) //AI is on the card, implies user wants to upload it.
- target.transfer_ai(AI_TRANS_FROM_CARD, user, AI, src)
log_combat(user, AI, "carded", src)
+ target.transfer_ai(AI_TRANS_FROM_CARD, user, AI, src)
else //No AI on the card, therefore the user wants to download one.
target.transfer_ai(AI_TRANS_TO_CARD, user, null, src)
+ if(AI)
+ log_combat(user, AI, "carded", src)
update_icon() //Whatever happened, update the card's state (icon, name) to match.
/obj/item/aicard/update_icon()
cut_overlays()
if(AI)
- name = "[initial(name)]- [AI.name]"
+ name = "[initial(name)] - [AI.name]"
if(AI.stat == DEAD)
icon_state = "[initial(icon_state)]-404"
else
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 1f69db1bbc..7dc2f1d60b 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -148,9 +148,11 @@
if(10)
src.add_overlay("pai-null")
if(11)
- src.add_overlay(mutable_appearance('modular_citadel/icons/obj/aicards.dmi', "pai-exclamation")) // CITADEL EDIT
+ src.add_overlay("pai-exclamation")
if(12)
- src.add_overlay(mutable_appearance('modular_citadel/icons/obj/aicards.dmi', "pai-question")) // CITADEL EDIT
+ src.add_overlay("pai-question")
+ if(13)
+ src.add_overlay("pai-sunglasses")
/obj/item/paicard/proc/alertUpdate()
visible_message("[src] flashes a message across its screen, \"Additional personalities available for download.\"", "[src] bleeps electronically.")
diff --git a/code/modules/crafting/recipes/recipes_misc.dm b/code/modules/crafting/recipes/recipes_misc.dm
index f05c7bd94b..fdfb959fe6 100644
--- a/code/modules/crafting/recipes/recipes_misc.dm
+++ b/code/modules/crafting/recipes/recipes_misc.dm
@@ -4,7 +4,7 @@
/datum/crafting_recipe/showercurtain
name = "Shower Curtains"
- reqs = list(/obj/item/stack/sheet/cloth = 2,
+ reqs = list(/obj/item/stack/sheet/cloth = 2,
/obj/item/stack/sheet/plastic = 2,
/obj/item/stack/rods = 1)
result = /obj/structure/curtain
@@ -197,14 +197,6 @@
/obj/item/bikehorn = 1)
category = CAT_MISC
-/datum/crafting_recipe/aitater
- name = "intelliTater"
- result = /obj/item/aicard/aitater
- time = 30
- reqs = list(/obj/item/aicard = 1,
- /obj/item/reagent_containers/food/snacks/grown/potato = 1)
- category = CAT_MISC
-
/datum/crafting_recipe/mousetrap
name = "Mouse Trap"
result = /obj/item/assembly/mousetrap
diff --git a/code/modules/crafting/recipes/recipes_robot.dm b/code/modules/crafting/recipes/recipes_robot.dm
index ae5bca7779..2b8ee0fe3a 100644
--- a/code/modules/crafting/recipes/recipes_robot.dm
+++ b/code/modules/crafting/recipes/recipes_robot.dm
@@ -77,8 +77,22 @@
time = 40
category = CAT_ROBOT
-/datum/crafting_recipe/potatos
- name = "Potat-OS"
- reqs = list(/obj/item/stack/cable_coil = 1, /obj/item/stack/rods = 1, /obj/item/reagent_containers/food/snacks/grown/potato = 1, /obj/item/aicard = 1 )
- result = /obj/item/aicard/potato
+/datum/crafting_recipe/aitater
+ name = "intelliTater"
+ result = /obj/item/aicard/aitater
+ time = 30
+ tools = list(TOOL_WIRECUTTER)
+ reqs = list(/obj/item/aicard = 1,
+ /obj/item/reagent_containers/food/snacks/grown/potato = 1,
+ /obj/item/stack/cable_coil = 5)
+ category = CAT_ROBOT
+
+/datum/crafting_recipe/aispook
+ name = "intelliLantern"
+ result = /obj/item/aicard/aispook
+ time = 30
+ tools = list(TOOL_WIRECUTTER)
+ reqs = list(/obj/item/aicard = 1,
+ /obj/item/reagent_containers/food/snacks/grown/pumpkin = 1,
+ /obj/item/stack/cable_coil = 5)
category = CAT_ROBOT
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index 301d2bd218..f72e03350e 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -36,6 +36,8 @@
if(istype(loc, /obj/item/aicard/aitater))
loc.icon_state = "aitater-404"
+ else if(istype(loc, /obj/item/aicard/aispook))
+ loc.icon_state = "aispook-404"
else if(istype(loc, /obj/item/aicard))
loc.icon_state = "aicard-404"
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 0e8d37a807..9882d028d1 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -140,7 +140,7 @@
radio.attack_self(src)
if("image")
- var/newImage = input("Select your new display image.", "Display Image", "Happy") in list("Happy", "Cat", "Extremely Happy", "Face", "Laugh", "Off", "Sad", "Angry", "What" , "Exclamation" ,"Question") // CITADEL EDIT
+ var/newImage = input("Select your new display image.", "Display Image", "Happy") in list("Happy", "Cat", "Extremely Happy", "Face", "Laugh", "Off", "Sad", "Angry", "What" , "Exclamation" ,"Question", "Sunglasses")
var/pID = 1
switch(newImage)
@@ -164,10 +164,12 @@
pID = 9
if("Null")
pID = 10
- if("Exclamation") // CITADEL EDIT
+ if("Exclamation")
pID = 11
- if("Question") // CITADEL EDIT
+ if("Question")
pID = 12
+ if("Sunglasses")
+ pID = 13
card.setEmotion(pID)
if("signaller")
diff --git a/icons/obj/aicards.dmi b/icons/obj/aicards.dmi
index e03e5d9567e53f53bcdecbb19f89499e778bb2b3..8e846c3796863d1f63ad7fbf55bae4f943e0c67a 100644
GIT binary patch
delta 3772
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
delta 2955
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
Ddy@Du
diff --git a/modular_citadel/icons/obj/aicards.dmi b/modular_citadel/icons/obj/aicards.dmi
deleted file mode 100644
index f956a6e88da6a66b51af7b439c6c23cc66bb9bfa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 439
zcmV;o0Z9IdP)|F!l10D%81um694e|AVihyVZp0d!JMQvg8b*k%9#0E&84Sad{Xb7OL8aCB*J
zZU6vyoKseCa&`CgQ*iP1