Two pAI fixes

This commit is contained in:
Anewbe
2018-07-27 19:52:31 -04:00
committed by VirgoBot
parent 115bfa2dc3
commit 4f83e7670c
8 changed files with 27 additions and 4 deletions
+3
View File
@@ -95,6 +95,9 @@ var/list/holder_mob_icon_cache = list()
/obj/item/weapon/holder/drone
origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 5)
/obj/item/weapon/holder/pai
origin_tech = list(TECH_DATA = 2)
/obj/item/weapon/holder/mouse
w_class = ITEMSIZE_TINY
+17 -3
View File
@@ -1,12 +1,14 @@
/mob/living/silicon/pai
name = "pAI"
icon = 'icons/mob/pai.dmi'
icon_state = "repairbot"
icon_state = "pai-repairbot"
emote_type = 2 // pAIs emotes are heard, not seen, so they can be seen through a container (eg. person)
pass_flags = 1
mob_size = MOB_SMALL
holder_type = /obj/item/weapon/holder/pai
can_pull_size = ITEMSIZE_SMALL
can_pull_mobs = MOB_PULL_SMALLER
@@ -23,8 +25,9 @@
var/obj/item/device/radio/radio // Our primary radio
var/obj/item/device/communicator/integrated/communicator // Our integrated communicator.
var/chassis = "repairbot" // A record of your chosen chassis.
var/chassis = "pai-repairbot" // A record of your chosen chassis.
var/global/list/possible_chassis = list(
<<<<<<< HEAD
"Drone" = "repairbot",
"Cat" = "cat",
"Mouse" = "mouse",
@@ -34,6 +37,16 @@
"Parrot" = "parrot",
"Rabbit" = "rabbit",
"Bear" = "bear" //VOREStation Edit
=======
"Drone" = "pai-repairbot",
"Cat" = "pai-cat",
"Mouse" = "pai-mouse",
"Monkey" = "pai-monkey",
"Corgi" = "pai-borgi",
"Fox" = "pai-fox",
"Parrot" = "pai-parrot",
"Rabbit" = "pai-rabbit"
>>>>>>> e714515... Merge pull request #5443 from PrismaticGynoid/somemorepaifixes
)
var/global/list/possible_say_verbs = list(
@@ -431,7 +444,8 @@
var/obj/item/weapon/holder/H = ..(grabber, self_drop)
if(!istype(H))
return
H.icon_state = "pai-[icon_state]"
H.icon_state = "[chassis]"
grabber.update_inv_l_hand()
grabber.update_inv_r_hand()
return H
@@ -126,6 +126,6 @@ var/global/list/default_pai_software = list()
else if(href_list["image"])
var/img = text2num(href_list["image"])
if(1 <= img && img <= 9)
if(1 <= img && img <= (pai_emotions.len))
card.setEmotion(img)
return 1