cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-21 03:52:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into wilderness-additions

Browse Source 
# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm
This commit is contained in:
Spades
2017-07-08 01:26:47 -04:00
parent 19a6895e3c c130fb913e
commit b5f86eece2
9 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/random_vr.dm
+2 -2
View File
@@ -184,9 +184,9 @@
var/mob = pick(
prob(10);/mob/living/simple_animal/retaliate/gaslamp,
prob(10);/mob/living/simple_animal/otie/feral,
prob(5);/mob/living/simple_animal/hostile/dino,
prob(5);/mob/living/simple_animal/hostile/dino/virgo3b,
prob(1);/mob/living/simple_animal/hostile/bear,
prob(1);/mob/living/simple_animal/hostile/dragon)
prob(1);/mob/living/simple_animal/hostile/dragon/virgo3b)
if (istype(mob, /mob/living)) // This is just to prevent runtime errors in case some dev is a dumbass and puts invalid items into this.
var/mob/living/simple_animal/this_mob = mob
this_mob.faction = src.faction