Lynx Fixes Runtimes

This commit is contained in:
Neerti
2019-03-30 18:51:00 -04:00
committed by VirgoBot
parent 056f921ce7
commit 5967a92f02
4 changed files with 28 additions and 0 deletions
@@ -36,7 +36,11 @@
/mob/living/carbon/human/promethean/Initialize(var/new_loc)
return ..(new_loc, SPECIES_PROMETHEAN)
<<<<<<< HEAD
/mob/living/carbon/human/zaddat/Initialize(var/new_loc) //VOREStation Edit - Fixes a Polaris bug
=======
/mob/living/carbon/human/zaddat/Initialize(var/new_loc)
>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
return ..(new_loc, SPECIES_ZADDAT)
/mob/living/carbon/human/monkey/Initialize(var/new_loc)