From e51a5f18b54a6980bf9ae63219538b39e79ec44f Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 10 Sep 2018 07:03:30 -0400 Subject: [PATCH] Update pai.dm --- code/modules/mob/living/silicon/pai/pai.dm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 2165287dbd..b04aec0276 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -27,17 +27,6 @@ var/chassis = "pai-repairbot" // A record of your chosen chassis. var/global/list/possible_chassis = list( -<<<<<<< HEAD - "Drone" = "repairbot", - "Cat" = "cat", - "Mouse" = "mouse", - "Monkey" = "monkey", - "Corgi" = "borgi", - "Fox" = "fox", - "Parrot" = "parrot", - "Rabbit" = "rabbit", - "Bear" = "bear" //VOREStation Edit -======= "Drone" = "pai-repairbot", "Cat" = "pai-cat", "Mouse" = "pai-mouse", @@ -45,8 +34,8 @@ "Corgi" = "pai-borgi", "Fox" = "pai-fox", "Parrot" = "pai-parrot", - "Rabbit" = "pai-rabbit" ->>>>>>> e714515... Merge pull request #5443 from PrismaticGynoid/somemorepaifixes + "Rabbit" = "pai-rabbit", + "Bear" = "bear" //VOREStation Edit ) var/global/list/possible_say_verbs = list(