cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 21:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Gitkraken Error. Oops </3

Browse Source
This commit is contained in:
Rykka
2019-08-31 06:32:58 -06:00
parent 83447b6d76
commit 981fa2febb
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,13 +35,8 @@
"Fox" = "pai-fox",
"Parrot" = "pai-parrot",
"Rabbit" = "pai-rabbit",
<<<<<<< Updated upstream
"Bear" = "pai-bear" //VOREStation Edit
"Fennec" = "pai-fennec" // VOREStation Edit - Rykka
=======
"Bear" = "pai-bear", //VOREStation Edit
"Fennec" = "pai-fen" // VOREStation Edit - Rykka
>>>>>>> Stashed changes
)
var/global/list/possible_say_verbs = list(