Tweaks and tidying

This commit is contained in:
Casey
2023-07-03 06:21:45 -04:00
committed by CHOMPStation2
parent b4547e8f25
commit 19550009ce
59 changed files with 9044 additions and 288 deletions

View File

@@ -139,9 +139,17 @@
prob_fall = 30
//guard = 20
mobs_to_pick_from = list(
<<<<<<< HEAD
/mob/living/simple_mob/animal/space/jelly = 1,
/mob/living/simple_mob/mechanical/viscerator = 1,
/mob/living/simple_mob/vore/aggressive/corrupthound = 1
=======
/mob/living/simple_mob/vore/jelly = 6,
/mob/living/simple_mob/mechanical/viscerator = 6,
/mob/living/simple_mob/vore/aggressive/corrupthound = 3,
/mob/living/simple_mob/vore/oregrub = 2,
/mob/living/simple_mob/vore/oregrub/lava = 1
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks
)
/obj/structure/old_roboprinter

View File

@@ -72,7 +72,7 @@
prob_fall = 50
//guard = 20
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/space/jelly = 6,
/mob/living/simple_mob/vore/jelly = 6,
/mob/living/simple_mob/mechanical/viscerator = 6,
/mob/living/simple_mob/vore/aggressive/corrupthound = 3,
/mob/living/simple_mob/vore/oregrub = 2,