mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
Tweaks and tidying
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user