Unfolded pAIs can be picked up

Because who doesn't want a robotic cat on their head? Adds in the missing code to allow pAIs to actually be picked up, and held sprites for the newer 4 chassis options.
This commit is contained in:
PrismaticGynoid
2018-07-25 19:51:48 -07:00
parent cf6ae83965
commit 176ecaae60
7 changed files with 23 additions and 11 deletions

View File

@@ -95,6 +95,9 @@ var/list/holder_mob_icon_cache = list()
/obj/item/weapon/holder/drone /obj/item/weapon/holder/drone
origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 5) 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 /obj/item/weapon/holder/mouse
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY

View File

@@ -1,12 +1,14 @@
/mob/living/silicon/pai /mob/living/silicon/pai
name = "pAI" name = "pAI"
icon = 'icons/mob/pai.dmi' 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) emote_type = 2 // pAIs emotes are heard, not seen, so they can be seen through a container (eg. person)
pass_flags = 1 pass_flags = 1
mob_size = MOB_SMALL mob_size = MOB_SMALL
holder_type = /obj/item/weapon/holder/pai
can_pull_size = ITEMSIZE_SMALL can_pull_size = ITEMSIZE_SMALL
can_pull_mobs = MOB_PULL_SMALLER can_pull_mobs = MOB_PULL_SMALLER
@@ -23,16 +25,16 @@
var/obj/item/device/radio/radio // Our primary radio var/obj/item/device/radio/radio // Our primary radio
var/obj/item/device/communicator/integrated/communicator // Our integrated communicator. 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( var/global/list/possible_chassis = list(
"Drone" = "repairbot", "Drone" = "pai-repairbot",
"Cat" = "cat", "Cat" = "pai-cat",
"Mouse" = "mouse", "Mouse" = "pai-mouse",
"Monkey" = "monkey", "Monkey" = "pai-monkey",
"Corgi" = "borgi", "Corgi" = "pai-borgi",
"Fox" = "fox", "Fox" = "pai-fox",
"Parrot" = "parrot", "Parrot" = "pai-parrot",
"Rabbit" = "rabbit" "Rabbit" = "pai-rabbit"
) )
var/global/list/possible_say_verbs = list( var/global/list/possible_say_verbs = list(
@@ -416,7 +418,8 @@
var/obj/item/weapon/holder/H = ..(grabber, self_drop) var/obj/item/weapon/holder/H = ..(grabber, self_drop)
if(!istype(H)) if(!istype(H))
return return
H.icon_state = "pai-[icon_state]"
H.icon_state = "[chassis]"
grabber.update_inv_l_hand() grabber.update_inv_l_hand()
grabber.update_inv_r_hand() grabber.update_inv_r_hand()
return H return H

View File

@@ -0,0 +1,6 @@
author: PrismaticGynoid
delete-after: True
changes:
- tweak: "pAIs can now be picked up while unfolded, and can display more than 9 emotions."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 KiB

After

Width:  |  Height:  |  Size: 187 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB