mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-28 22:48:38 +01:00
Lynx Fixes Runtimes
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user