cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

big resync + merge conflicts

Browse Source
This commit is contained in:
Raeschen
2023-07-05 10:12:39 +02:00
parent 19550009ce
commit 3e0a0c0c98
8 changed files with 1861 additions and 4612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maps/expedition_vr/aerostat/_aerostat.dm
View File

@@ -139,17 +139,11 @@
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