cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into final_shuttle_touches_and_stuff

Browse Source 
# Conflicts:
#	icons/turf/shuttle.dmi
This commit is contained in:
alberyk
2022-01-17 22:20:15 -03:00
parent e92d839fbf 5bcf84cb23
commit 8cd6f9ca66
84 changed files with 2321 additions and 4654 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/randomstock.dm
+2 -2
View File
@@ -106,13 +106,13 @@ var/list/global/random_stock_large = list()
var/list/infest_mobs_moderate = list(
/mob/living/simple_animal/bee/standalone = 1,
/mob/living/simple_animal/hostile/diyaab = 1,
/mob/living/simple_animal/hostile/retaliate/diyaab = 1,
/mob/living/simple_animal/hostile/viscerator = 1,
/mob/living/simple_animal/hostile/scarybat = 1)
var/list/infest_mobs_severe = list(
/mob/living/simple_animal/hostile/giant_spider/hunter = 1,
/mob/living/simple_animal/hostile/shantak = 0.7,
/mob/living/simple_animal/hostile/retaliate/shantak = 0.7,
/mob/living/simple_animal/hostile/bear = 0.5,
/mob/living/simple_animal/hostile/carp = 1.5,
/mob/living/simple_animal/hostile/carp/russian = 0.3,