Merge branch 'master' into shep-dev-aurora-cooking-port

This commit is contained in:
Rykka
2020-07-28 04:04:39 -04:00
67 changed files with 1251 additions and 452 deletions

View File

@@ -53,6 +53,7 @@
/mob/living/simple_mob/vore/aggressive/mimic,
/mob/living/simple_mob/vore/aggressive/rat,
/mob/living/simple_mob/vore/aggressive/rat/tame,
/mob/living/simple_mob/otie/zorgoia, //CHOMPstation edit
// /mob/living/simple_mob/otie;0.5
))
return ..()