cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update pai.dm

Browse Source
This commit is contained in:
Spades
2018-09-10 07:03:30 -04:00
committed by GitHub
parent 4f83e7670c
commit e51a5f18b5
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/mob/living/silicon/pai/pai.dm
View File

@@ -27,17 +27,6 @@
var/chassis = "pai-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(
<<<<<<< HEAD
"Drone" = "repairbot",
"Cat" = "cat",
"Mouse" = "mouse",
"Monkey" = "monkey",
"Corgi" = "borgi",
"Fox" = "fox",
"Parrot" = "parrot",
"Rabbit" = "rabbit",
"Bear" = "bear" //VOREStation Edit
=======
"Drone" = "pai-repairbot", "Drone" = "pai-repairbot",
"Cat" = "pai-cat", "Cat" = "pai-cat",
"Mouse" = "pai-mouse", "Mouse" = "pai-mouse",
@@ -45,8 +34,8 @@
"Corgi" = "pai-borgi", "Corgi" = "pai-borgi",
"Fox" = "pai-fox", "Fox" = "pai-fox",
"Parrot" = "pai-parrot", "Parrot" = "pai-parrot",
"Rabbit" = "pai-rabbit" "Rabbit" = "pai-rabbit",
>>>>>>> e714515... Merge pull request #5443 from PrismaticGynoid/somemorepaifixes "Bear" = "bear" //VOREStation Edit
) )
var/global/list/possible_say_verbs = list( var/global/list/possible_say_verbs = list(