diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 25d575f7dad..93659e645ef 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -35,10 +35,15 @@ "Fox" = "pai-fox", "Parrot" = "pai-parrot", "Rabbit" = "pai-rabbit", - "Bear" = "pai-bear", //VOREStation Edit - "Fennec" = "pai-fen", // VOREStation Edit - Rykka - "Fennec" = "pai-typezero" //VOREStation Edit + //VOREStation Addition Start + "Bear" = "pai-bear", + "Fennec" = "pai-fen", + "Type Zero" = "pai-typezero", + "Raccoon" = "pai-raccoon", //TFF 22/11/19 - CHOMPStation port of pAI additions, + "Rat" = "rat", + "Panther" = "panther" ) + //VOREStation Addition End var/global/list/possible_say_verbs = list( "Robotic" = list("states","declares","queries"), @@ -46,7 +51,8 @@ "Beep" = list("beeps","beeps loudly","boops"), "Chirp" = list("chirps","chirrups","cheeps"), "Feline" = list("purrs","yowls","meows"), - "Canine" = list("yaps","barks","woofs") + "Canine" = list("yaps","barks","woofs"), + "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit - TFF 22/11/19 - CHOMPStation port of pAI additions, ) var/obj/item/weapon/pai_cable/cable // The cable we produce and use when door or camera jacking @@ -320,6 +326,8 @@ close_up() +//VOREStation Removal Start - TFF 22/11/19 - Refactored in pai_vr.dm +/* /mob/living/silicon/pai/proc/choose_chassis() set category = "pAI Commands" set name = "Choose Chassis" @@ -336,6 +344,8 @@ chassis = possible_chassis[choice] verbs |= /mob/living/proc/hide +//VOREStation Removal End +*/ /mob/living/silicon/pai/proc/choose_verbs() set category = "pAI Commands" diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index c5de247595b..def701a486e 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -1,6 +1,11 @@ /mob/living/silicon/pai var/people_eaten = 0 icon = 'icons/mob/pai_vr.dmi' + //TFF 22/11/19 - CHOMPStation port of pAI additions. + var/global/list/wide_chassis = list( + "rat", + "panther" + ) /mob/living/silicon/pai/proc/pai_nom(var/mob/living/T in oview(1)) set name = "pAI Nom" @@ -31,6 +36,14 @@ else if(people_eaten && resting) icon_state = "[chassis]_rest_full" + //TFF 22/11/19 - CHOMPStation port of pAI additions. + if(chassis in wide_chassis) + icon = 'icons/mob/pai_vr64x64.dmi' + pixel_x = -16 + else + icon = 'icons/mob/pai_vr.dmi' + pixel_x = 0 + /mob/living/silicon/pai/update_icons() //And other functions cause this to occur, such as digesting someone. ..() update_fullness_pai() @@ -42,3 +55,22 @@ icon_state = "[chassis]_full" else if(people_eaten && resting) icon_state = "[chassis]_rest_full" + + //TFF 22/11/19 - CHOMPStation port of pAI additions. + if(chassis in wide_chassis) + icon = 'icons/mob/pai_vr64x64.dmi' + pixel_x = -16 + else + icon = 'icons/mob/pai_vr.dmi' + pixel_x = 0 +//proc override to avoid pAI players being invisible while the chassis selection window is open +/mob/living/silicon/pai/proc/choose_chassis() + set category = "pAI Commands" + set name = "Choose Chassis" + var/choice + + choice = input(usr,"What would you like to use for your mobile chassis icon?") as null|anything in possible_chassis + if(!choice) return + chassis = possible_chassis[choice] + verbs |= /mob/living/proc/hide + update_icon() diff --git a/icons/mob/pai_vr.dmi b/icons/mob/pai_vr.dmi index 09b85049158..a631425ae98 100644 Binary files a/icons/mob/pai_vr.dmi and b/icons/mob/pai_vr.dmi differ diff --git a/icons/mob/pai_vr64x64.dmi b/icons/mob/pai_vr64x64.dmi new file mode 100644 index 00000000000..f9c99e51eb2 Binary files /dev/null and b/icons/mob/pai_vr64x64.dmi differ