cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolves compile errors with the exception of map errors.

Browse Source
This commit is contained in:
Cameron653
2019-01-12 21:09:29 -05:00
parent fb6f5e33ca
commit 9dd973221d
140 changed files with 1223 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
code/game/objects/random/random.dm
View File

@@ -1531,24 +1531,24 @@ var/list/multi_point_spawns
icon_state = "chicken_white"
/obj/random/mob/item_to_spawn()
return pick(prob(10);/mob/living/simple_animal/lizard,
prob(6);/mob/living/simple_animal/retaliate/diyaab,
prob(10);/mob/living/simple_animal/cat/fluff,
prob(6);/mob/living/simple_animal/cat/kitten,
prob(10);/mob/living/simple_animal/corgi,
prob(6);/mob/living/simple_animal/corgi/puppy,
prob(10);/mob/living/simple_animal/crab,
prob(10);/mob/living/simple_animal/chicken,
prob(6);/mob/living/simple_animal/chick,
prob(10);/mob/living/simple_animal/cow,
prob(6);/mob/living/simple_animal/retaliate/goat,
prob(10);/mob/living/simple_animal/penguin,
prob(10);/mob/living/simple_animal/mouse,
prob(10);/mob/living/simple_animal/yithian,
prob(10);/mob/living/simple_animal/tindalos,
prob(10);/mob/living/simple_animal/corgi/tamaskan,
prob(3);/mob/living/simple_animal/parrot,
prob(1);/mob/living/simple_animal/giant_crab)
return pick(prob(10);/mob/living/simple_mob/lizard,
prob(6);/mob/living/simple_mob/retaliate/diyaab,
prob(10);/mob/living/simple_mob/cat/fluff,
prob(6);/mob/living/simple_mob/cat/kitten,
prob(10);/mob/living/simple_mob/corgi,
prob(6);/mob/living/simple_mob/corgi/puppy,
prob(10);/mob/living/simple_mob/crab,
prob(10);/mob/living/simple_mob/chicken,
prob(6);/mob/living/simple_mob/chick,
prob(10);/mob/living/simple_mob/cow,
prob(6);/mob/living/simple_mob/retaliate/goat,
prob(10);/mob/living/simple_mob/penguin,
prob(10);/mob/living/simple_mob/mouse,
prob(10);/mob/living/simple_mob/yithian,
prob(10);/mob/living/simple_mob/tindalos,
prob(10);/mob/living/simple_mob/corgi/tamaskan,
prob(3);/mob/living/simple_mob/parrot,
prob(1);/mob/living/simple_mob/giant_crab)
/obj/random/mob/sif
name = "Random Sif Animal"
@@ -1556,14 +1556,14 @@ var/list/multi_point_spawns
icon_state = "penguin"
/obj/random/mob/sif/item_to_spawn()
return pick(prob(30);/mob/living/simple_animal/retaliate/diyaab,
prob(15);/mob/living/simple_animal/crab,
prob(15);/mob/living/simple_animal/penguin,
prob(15);/mob/living/simple_animal/mouse,
prob(15);/mob/living/simple_animal/corgi/tamaskan,
prob(2);/mob/living/simple_animal/hostile/giant_spider/frost,
prob(1);/mob/living/simple_animal/hostile/goose,
prob(20);/mob/living/simple_animal/giant_crab)
return pick(prob(30);/mob/living/simple_mob/retaliate/diyaab,
prob(15);/mob/living/simple_mob/crab,
prob(15);/mob/living/simple_mob/penguin,
prob(15);/mob/living/simple_mob/mouse,
prob(15);/mob/living/simple_mob/corgi/tamaskan,
prob(2);/mob/living/simple_mob/hostile/giant_spider/frost,
prob(1);/mob/living/simple_mob/hostile/goose,
prob(20);/mob/living/simple_mob/giant_crab)
/obj/random/mob/sif/hostile
name = "Random Hostile Sif Animal"
@@ -1571,9 +1571,9 @@ var/list/multi_point_spawns
icon_state = "frost"
/obj/random/mob/sif/hostile/item_to_spawn()
return pick(prob(22);/mob/living/simple_animal/hostile/savik,
prob(33);/mob/living/simple_animal/hostile/giant_spider/frost,
prob(45);/mob/living/simple_animal/hostile/shantak)
return pick(prob(22);/mob/living/simple_mob/hostile/savik,
prob(33);/mob/living/simple_mob/hostile/giant_spider/frost,
prob(45);/mob/living/simple_mob/hostile/shantak)
/obj/random/mob/spider
name = "Random Spider"
@@ -1581,9 +1581,9 @@ var/list/multi_point_spawns
icon_state = "guard"
/obj/random/mob/spider/item_to_spawn()
return pick(prob(22);/mob/living/simple_animal/hostile/giant_spider/nurse,
prob(33);/mob/living/simple_animal/hostile/giant_spider/hunter,
prob(45);/mob/living/simple_animal/hostile/giant_spider)
return pick(prob(22);/mob/living/simple_mob/hostile/giant_spider/nurse,
prob(33);/mob/living/simple_mob/hostile/giant_spider/hunter,
prob(45);/mob/living/simple_mob/hostile/giant_spider)
/obj/random/mob/spider/mutant
name = "Random Mutant Spider"
@@ -1592,15 +1592,15 @@ var/list/multi_point_spawns
/obj/random/mob/spider/mutant/item_to_spawn()
return pick(prob(5);/obj/random/mob/spider,
prob(10);/mob/living/simple_animal/hostile/giant_spider/webslinger,
prob(10);/mob/living/simple_animal/hostile/giant_spider/carrier,
prob(33);/mob/living/simple_animal/hostile/giant_spider/lurker,
prob(33);/mob/living/simple_animal/hostile/giant_spider/tunneler,
prob(40);/mob/living/simple_animal/hostile/giant_spider/pepper,
prob(20);/mob/living/simple_animal/hostile/giant_spider/thermic,
prob(40);/mob/living/simple_animal/hostile/giant_spider/electric,
prob(1);/mob/living/simple_animal/hostile/giant_spider/phorogenic,
prob(40);/mob/living/simple_animal/hostile/giant_spider/frost)
prob(10);/mob/living/simple_mob/hostile/giant_spider/webslinger,
prob(10);/mob/living/simple_mob/hostile/giant_spider/carrier,
prob(33);/mob/living/simple_mob/hostile/giant_spider/lurker,
prob(33);/mob/living/simple_mob/hostile/giant_spider/tunneler,
prob(40);/mob/living/simple_mob/hostile/giant_spider/pepper,
prob(20);/mob/living/simple_mob/hostile/giant_spider/thermic,
prob(40);/mob/living/simple_mob/hostile/giant_spider/electric,
prob(1);/mob/living/simple_mob/hostile/giant_spider/phorogenic,
prob(40);/mob/living/simple_mob/hostile/giant_spider/frost)
/obj/random/mob/robotic
name = "Random Robot Mob"
@@ -1608,17 +1608,17 @@ var/list/multi_point_spawns
icon_state = "drone_dead"
/obj/random/mob/robotic/item_to_spawn() //Hivebots have a total number of 'lots' equal to the lesser drone, at 60.
return pick(prob(60);/mob/living/simple_animal/hostile/malf_drone/lesser,
prob(50);/mob/living/simple_animal/hostile/malf_drone,
prob(15);/mob/living/simple_animal/hostile/mecha/malf_drone,
prob(10);/mob/living/simple_animal/hostile/hivebot,
prob(15);/mob/living/simple_animal/hostile/hivebot/swarm,
prob(10);/mob/living/simple_animal/hostile/hivebot/range,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/rapid,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/ion,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/laser,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/strong,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/guard)
return pick(prob(60);/mob/living/simple_mob/hostile/malf_drone/lesser,
prob(50);/mob/living/simple_mob/hostile/malf_drone,
prob(15);/mob/living/simple_mob/hostile/mecha/malf_drone,
prob(10);/mob/living/simple_mob/hostile/hivebot,
prob(15);/mob/living/simple_mob/hostile/hivebot/swarm,
prob(10);/mob/living/simple_mob/hostile/hivebot/range,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/rapid,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/ion,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/laser,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/strong,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/guard)
/obj/random/mob/robotic/hivebot
name = "Random Hivebot"
@@ -1626,11 +1626,11 @@ var/list/multi_point_spawns
icon_state = "drone3"
/obj/random/mob/robotic/hivebot/item_to_spawn()
return pick(prob(10);/mob/living/simple_animal/hostile/hivebot,
prob(15);/mob/living/simple_animal/hostile/hivebot/swarm,
prob(10);/mob/living/simple_animal/hostile/hivebot/range,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/rapid,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/ion,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/laser,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/strong,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/guard)
return pick(prob(10);/mob/living/simple_mob/hostile/hivebot,
prob(15);/mob/living/simple_mob/hostile/hivebot/swarm,
prob(10);/mob/living/simple_mob/hostile/hivebot/range,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/rapid,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/ion,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/laser,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/strong,
prob(5);/mob/living/simple_mob/hostile/hivebot/range/guard)

16
code/game/objects/random/random_vr.dm
View File

@@ -178,18 +178,18 @@
icon_state = "x"
spawn_nothing_percentage = 10
var/faction = "wild animal"
/*
/obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction.
return pick(
prob(50);/mob/living/simple_animal/retaliate/gaslamp,
// prob(50);/mob/living/simple_animal/otie/feral, // Removed until Otie code is unfucked.
prob(20);/mob/living/simple_animal/hostile/dino/virgo3b,
prob(1);/mob/living/simple_animal/hostile/dragon/virgo3b)
prob(50);/mob/living/simple_mob/retaliate/gaslamp,
// prob(50);/mob/living/simple_mob/otie/feral, // Removed until Otie code is unfucked.
prob(20);/mob/living/simple_mob/hostile/dino/virgo3b,
prob(1);/mob/living/simple_mob/hostile/dragon/virgo3b)
*/ //VORESTATION AI TEMPORARY REMOVAL
/obj/random/outside_mob/spawn_item()
. = ..()
if(istype(., /mob/living/simple_animal))
var/mob/living/simple_animal/this_mob = .
if(istype(., /mob/living/simple_mob))
var/mob/living/simple_mob/this_mob = .
this_mob.faction = src.faction
if (this_mob.minbodytemp > 200) // Temporary hotfix. Eventually I'll add code to change all mob vars to fit the environment they are spawned in.
this_mob.minbodytemp = 200