shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unmodularize and update pAI/Intellicards very slighty.

Browse Source
This commit is contained in:
Ghommie
2019-11-03 04:23:31 +01:00
parent d249a38489
commit 7e4aef46d9
10 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/crafting/recipes/recipes_misc.dm
View File

@@ -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

22
code/modules/crafting/recipes/recipes_robot.dm
View File

@@ -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

2
code/modules/mob/living/silicon/ai/death.dm
View File

@@ -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"

8
code/modules/mob/living/silicon/pai/software.dm
View File

@@ -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")