cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 19:15:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks and tidying

Browse Source 
Adjusts some types to tidy up the mob list. Put some of the mobs that can vore under the vore tab, removed the clown mobs from /mobs_monsters because they were the only thing in there, so there wasn't really any point in hiding them a level deeper, and generally looked for subtypes that didn't have anything in them, and commented those out. Did you know that telesci is supposed to have a chance to spawn hostile mobs if you mess up? It's true! I may or may not have fixed it, I don't play telesci, but it uses a path that actually has mobs in it now.
This commit is contained in:
VerySoft
2023-07-03 02:09:51 -04:00
parent 37d27accec
commit 4628e467c2
45 changed files with 309 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/semirandom_mobs_vr.dm
+31 -31
View File
@@ -56,8 +56,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
list(/mob/living/simple_mob/animal/passive/tindalos),
list(/mob/living/simple_mob/animal/passive/yithian),
list(
/mob/living/simple_mob/animal/wolf = 10,
/mob/living/simple_mob/animal/wolf/direwolf = 5,
/mob/living/simple_mob/vore/wolf = 10,
/mob/living/simple_mob/vore/wolf/direwolf = 5,
/mob/living/simple_mob/vore/greatwolf = 1,
/mob/living/simple_mob/vore/greatwolf/black = 1,
/mob/living/simple_mob/vore/greatwolf/grey = 1
@@ -75,10 +75,10 @@ var/global/list/semirandom_mob_spawner_decisions = list()
/mob/living/simple_mob/animal/space/bear/brown
),
list(
/mob/living/simple_mob/otie/feral,
/mob/living/simple_mob/otie/feral/chubby,
/mob/living/simple_mob/otie/red,
/mob/living/simple_mob/otie/red/chubby
/mob/living/simple_mob/vore/otie/feral,
/mob/living/simple_mob/vore/otie/feral/chubby,
/mob/living/simple_mob/vore/otie/red,
/mob/living/simple_mob/vore/otie/red/chubby
),
list(/mob/living/simple_mob/animal/sif/diyaab),
list(/mob/living/simple_mob/animal/sif/duck),
@@ -144,7 +144,7 @@ var/global/list/semirandom_mob_spawner_decisions = list()
/mob/living/simple_mob/animal/space/carp/large/huge = 5
),
list(/mob/living/simple_mob/animal/space/goose),
list(/mob/living/simple_mob/animal/space/jelly),
list(/mob/living/simple_mob/vore/jelly),
list(/mob/living/simple_mob/animal/space/tree),
list(
/mob/living/simple_mob/vore/aggressive/corrupthound = 10,
@@ -245,12 +245,12 @@ var/global/list/semirandom_mob_spawner_decisions = list()
list(/mob/living/simple_mob/mechanical/wahlem),
list(/mob/living/simple_mob/animal/passive/fox/syndicate),
list(/mob/living/simple_mob/animal/passive/fox),
list(/mob/living/simple_mob/animal/space/jelly),
list(/mob/living/simple_mob/vore/jelly),
list(
/mob/living/simple_mob/otie/feral,
/mob/living/simple_mob/otie/feral/chubby,
/mob/living/simple_mob/otie/red,
/mob/living/simple_mob/otie/red/chubby
/mob/living/simple_mob/vore/otie/feral,
/mob/living/simple_mob/vore/otie/feral/chubby,
/mob/living/simple_mob/vore/otie/red,
/mob/living/simple_mob/vore/otie/red/chubby
),
list(
/mob/living/simple_mob/shadekin/blue = 100,
@@ -377,8 +377,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
list(/mob/living/simple_mob/animal/passive/tindalos) = 10,
list(/mob/living/simple_mob/animal/passive/yithian) = 10,
list(
/mob/living/simple_mob/animal/wolf = 10,
/mob/living/simple_mob/animal/wolf/direwolf = 5,
/mob/living/simple_mob/vore/wolf = 10,
/mob/living/simple_mob/vore/wolf/direwolf = 5,
/mob/living/simple_mob/vore/greatwolf = 1,
/mob/living/simple_mob/vore/greatwolf/black = 1,
/mob/living/simple_mob/vore/greatwolf/grey = 1
@@ -396,10 +396,10 @@ var/global/list/semirandom_mob_spawner_decisions = list()
/mob/living/simple_mob/animal/space/bear/brown
) = 1,
list(
/mob/living/simple_mob/otie/feral = 50,
/mob/living/simple_mob/otie/feral/chubby = 10,
/mob/living/simple_mob/otie/red = 5,
/mob/living/simple_mob/otie/red/chubby = 1
/mob/living/simple_mob/vore/otie/feral = 50,
/mob/living/simple_mob/vore/otie/feral/chubby = 10,
/mob/living/simple_mob/vore/otie/red = 5,
/mob/living/simple_mob/vore/otie/red/chubby = 1
) = 5,
list(/mob/living/simple_mob/vore/aggressive/rat) = 15,
list(/mob/living/simple_mob/animal/sif/diyaab) = 5,
@@ -466,8 +466,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
/mob/living/simple_mob/shadekin/purple = 10
) = 1,
list(
/mob/living/simple_mob/animal/wolf = 10,
/mob/living/simple_mob/animal/wolf/direwolf = 5,
/mob/living/simple_mob/vore/wolf = 10,
/mob/living/simple_mob/vore/wolf/direwolf = 5,
/mob/living/simple_mob/vore/greatwolf = 1,
/mob/living/simple_mob/vore/greatwolf/black = 1,
/mob/living/simple_mob/vore/greatwolf/grey = 1
@@ -501,13 +501,13 @@ var/global/list/semirandom_mob_spawner_decisions = list()
/mob/living/simple_mob/animal/space/carp/large/huge = 5
) = 50,
list(/mob/living/simple_mob/animal/space/goose) = 50,
list(/mob/living/simple_mob/animal/space/jelly) = 40,
list(/mob/living/simple_mob/vore/jelly) = 40,
list(/mob/living/simple_mob/animal/space/tree) = 15,
list(
/mob/living/simple_mob/otie/feral = 50,
/mob/living/simple_mob/otie/feral/chubby = 10,
/mob/living/simple_mob/otie/red = 5,
/mob/living/simple_mob/otie/red/chubby = 1
/mob/living/simple_mob/vore/otie/feral = 50,
/mob/living/simple_mob/vore/otie/feral/chubby = 10,
/mob/living/simple_mob/vore/otie/red = 5,
/mob/living/simple_mob/vore/otie/red/chubby = 1
) = 40,
list(
/mob/living/simple_mob/vore/aggressive/corrupthound = 10,
@@ -717,17 +717,17 @@ var/global/list/semirandom_mob_spawner_decisions = list()
possible_mob_types = list(
list(
/mob/living/simple_mob/animal/wolf/direwolf = 5,
/mob/living/simple_mob/vore/wolf/direwolf = 5,
/mob/living/simple_mob/vore/greatwolf = 1,
/mob/living/simple_mob/vore/greatwolf/black = 1,
/mob/living/simple_mob/vore/greatwolf/grey = 1
) = 100,
list(/mob/living/simple_mob/animal/space/jelly) = 70,
list(/mob/living/simple_mob/vore/jelly) = 70,
list(
/mob/living/simple_mob/otie/feral,
/mob/living/simple_mob/otie/feral/chubby,
/mob/living/simple_mob/otie/red,
/mob/living/simple_mob/otie/red/chubby
/mob/living/simple_mob/vore/otie/feral,
/mob/living/simple_mob/vore/otie/feral/chubby,
/mob/living/simple_mob/vore/otie/red,
/mob/living/simple_mob/vore/otie/red/chubby
) = 50,
list(
/mob/living/simple_mob/shadekin/blue = 100,
code/game/objects/items/devices/denecrotizer_vr.dm
+1 -1
View File
@@ -29,7 +29,7 @@
//The stuff we want to be revivable normally
/mob/living/simple_mob/animal
ic_revivable = TRUE
/mob/living/simple_mob/otie
/mob/living/simple_mob/vore/otie
ic_revivable = TRUE
/mob/living/simple_mob/vore
ic_revivable = TRUE
code/game/objects/items/weapons/capture_crystal.dm
+15 -15
View File
@@ -590,8 +590,8 @@
list(/mob/living/simple_mob/animal/passive/tindalos),
list(/mob/living/simple_mob/animal/passive/yithian),
list(
/mob/living/simple_mob/animal/wolf,
/mob/living/simple_mob/animal/wolf/direwolf
/mob/living/simple_mob/vore/wolf,
/mob/living/simple_mob/vore/wolf/direwolf
),
list(/mob/living/simple_mob/vore/rabbit),
list(/mob/living/simple_mob/vore/redpanda),
@@ -606,10 +606,10 @@
/mob/living/simple_mob/animal/space/bear/brown
),
list(
/mob/living/simple_mob/otie/feral,
/mob/living/simple_mob/otie/feral/chubby,
/mob/living/simple_mob/otie/red,
/mob/living/simple_mob/otie/red/chubby
/mob/living/simple_mob/vore/otie/feral,
/mob/living/simple_mob/vore/otie/feral/chubby,
/mob/living/simple_mob/vore/otie/red,
/mob/living/simple_mob/vore/otie/red/chubby
),
list(/mob/living/simple_mob/animal/sif/diyaab),
list(/mob/living/simple_mob/animal/sif/duck),
@@ -648,8 +648,8 @@
/mob/living/simple_mob/animal/giant_spider/webslinger = 5,
/mob/living/simple_mob/animal/giant_spider/broodmother = 1),
list(
/mob/living/simple_mob/animal/wolf = 10,
/mob/living/simple_mob/animal/wolf/direwolf = 5,
/mob/living/simple_mob/vore/wolf = 10,
/mob/living/simple_mob/vore/wolf/direwolf = 5,
/mob/living/simple_mob/vore/greatwolf = 1,
/mob/living/simple_mob/vore/greatwolf/black = 1,
/mob/living/simple_mob/vore/greatwolf/grey = 1
@@ -682,7 +682,7 @@
/mob/living/simple_mob/animal/space/carp/large/huge = 5
),
list(/mob/living/simple_mob/animal/space/goose),
list(/mob/living/simple_mob/animal/space/jelly),
list(/mob/living/simple_mob/vore/jelly),
list(/mob/living/simple_mob/animal/space/tree),
list(
/mob/living/simple_mob/vore/aggressive/corrupthound = 10,
@@ -783,13 +783,13 @@
list(/mob/living/simple_mob/mechanical/wahlem),
list(/mob/living/simple_mob/animal/passive/fox/syndicate),
list(/mob/living/simple_mob/animal/passive/fox),
list(/mob/living/simple_mob/animal/wolf/direwolf),
list(/mob/living/simple_mob/animal/space/jelly),
list(/mob/living/simple_mob/vore/wolf/direwolf),
list(/mob/living/simple_mob/vore/jelly),
list(
/mob/living/simple_mob/otie/feral,
/mob/living/simple_mob/otie/feral/chubby,
/mob/living/simple_mob/otie/red,
/mob/living/simple_mob/otie/red/chubby
/mob/living/simple_mob/vore/otie/feral,
/mob/living/simple_mob/vore/otie/feral/chubby,
/mob/living/simple_mob/vore/otie/red,
/mob/living/simple_mob/vore/otie/red/chubby
),
list(
/mob/living/simple_mob/shadekin/blue = 100,
code/game/objects/micro_structures.dm
+1 -1
View File
@@ -13,7 +13,7 @@
var/static/non_micro_types = list(
/mob/living/simple_mob/vore/squirrel,
/mob/living/simple_mob/vore/alienanimals/catslug,
/mob/living/simple_mob/vore/hostile/morph,
/mob/living/simple_mob/vore/morph,
/mob/living/simple_mob/protean_blob,
/mob/living/simple_mob/slime
)
code/game/objects/mob_spawner_vr.dm
+1 -1
View File
@@ -157,7 +157,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
invisibility = 101
spawn_types = list(
/mob/living/simple_mob/animal/passive/gaslamp = 20,
// /mob/living/simple_mob/otie/feral = 10,
// /mob/living/simple_mob/vore/otie/feral = 10,
/mob/living/simple_mob/vore/aggressive/dino/virgo3b = 5,
/mob/living/simple_mob/vore/aggressive/dragon/virgo3b = 1
)
code/game/objects/random/mob_vr.dm
+1 -1
View File
@@ -184,7 +184,7 @@
/obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction.
return pick(
prob(50);/mob/living/simple_mob/animal/passive/gaslamp,
// prob(50);/mob/living/simple_mob/otie/feral, // Removed until Otie code is unfucked.
// prob(50);/mob/living/simple_mob/vore/otie/feral, // Removed until Otie code is unfucked.
prob(20);/mob/living/simple_mob/vore/aggressive/dino/virgo3b,
prob(1);/mob/living/simple_mob/vore/aggressive/dragon/virgo3b)
code/game/objects/structures/crates_lockers/largecrate_vr.dm
+10 -10
View File
@@ -47,7 +47,7 @@
/mob/living/simple_mob/vore/horse,
/mob/living/simple_mob/vore/aggressive/panther,
/mob/living/simple_mob/vore/aggressive/giant_snake,
/mob/living/simple_mob/animal/wolf,
/mob/living/simple_mob/vore/wolf,
/mob/living/simple_mob/animal/space/bear;0.5,
/mob/living/simple_mob/animal/space/carp,
/mob/living/simple_mob/vore/aggressive/mimic,
@@ -55,7 +55,7 @@
/mob/living/simple_mob/vore/aggressive/rat/tame,
/mob/living/simple_mob/vore/rabbit,
/mob/living/simple_mob/vore/weretiger;0.5,
// /mob/living/simple_mob/otie;0.5
// /mob/living/simple_mob/vore/otie;0.5
))
return ..()
@@ -71,8 +71,8 @@
/mob/living/simple_mob/animal/space/alien/drone,
/mob/living/simple_mob/animal/space/alien/sentinel,
/mob/living/simple_mob/animal/space/alien/queen,
// /mob/living/simple_mob/otie/feral,
// /mob/living/simple_mob/otie/red,
// /mob/living/simple_mob/vore/otie/feral,
// /mob/living/simple_mob/vore/otie/red,
/mob/living/simple_mob/vore/aggressive/corrupthound))
return ..()
/*
@@ -81,31 +81,31 @@
desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs."
icon = 'icons/obj/storage_vr.dmi'
icon_state = "sotiecrate"
starts_with = list(/mob/living/simple_mob/otie/security)
starts_with = list(/mob/living/simple_mob/vore/otie/security)
/obj/structure/largecrate/animal/guardmutant
name = "VARMAcorp autoNOMous security solution for hostile environments."
desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. This one can survive hostile atmosphere."
icon = 'icons/obj/storage_vr.dmi'
icon_state = "sotiecrate"
starts_with = list(/mob/living/simple_mob/otie/security/phoron)
starts_with = list(/mob/living/simple_mob/vore/otie/security/phoron)
/obj/structure/largecrate/animal/otie
name = "VARMAcorp adoptable reject (Dangerous!)"
desc = "A warning on the side says the creature inside was returned to the supplier after injuring or devouring several unlucky members of the previous adoption family. It was given a second chance with the next customer. Godspeed and good luck with your new pet!"
icon = 'icons/obj/storage_vr.dmi'
icon_state = "otiecrate2"
starts_with = list(/mob/living/simple_mob/otie/cotie)
starts_with = list(/mob/living/simple_mob/vore/otie/cotie)
var/taped = 1
/obj/structure/largecrate/animal/otie/phoron
name = "VARMAcorp adaptive beta subject (Experimental)"
desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!"
starts_with = list(/mob/living/simple_mob/otie/cotie/phoron)
starts_with = list(/mob/living/simple_mob/vore/otie/cotie/phoron)
/obj/structure/largecrate/animal/otie/phoron/Initialize()
starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2,
/mob/living/simple_mob/otie/red/friendly;0.5))
starts_with = list(pick(/mob/living/simple_mob/vore/otie/cotie/phoron;2,
/mob/living/simple_mob/vore/otie/red/friendly;0.5))
return ..()
/obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao
code/game/objects/structures/ghost_pods/event_vr.dm
+6 -6
View File
@@ -24,8 +24,8 @@
"Voracious Lizard" = /mob/living/simple_mob/vore/aggressive/dino,
"Giant Frog" = /mob/living/simple_mob/vore/aggressive/frog,
"Giant Rat" = /mob/living/simple_mob/vore/aggressive/rat,
"Jelly Blob" = /mob/living/simple_mob/animal/space/jelly,
"Wolf" = /mob/living/simple_mob/animal/wolf,
"Jelly Blob" = /mob/living/simple_mob/vore/jelly,
"Wolf" = /mob/living/simple_mob/vore/wolf,
"Juvenile Solargrub" = /mob/living/simple_mob/vore/solargrub,
"Sect Queen" = /mob/living/simple_mob/vore/sect_queen,
"Sect Drone" = /mob/living/simple_mob/vore/sect_drone,
@@ -33,9 +33,9 @@
"Panther" = /mob/living/simple_mob/vore/aggressive/panther,
"Giant Snake" = /mob/living/simple_mob/vore/aggressive/giant_snake,
"Deathclaw" = /mob/living/simple_mob/vore/aggressive/deathclaw,
"Otie" = /mob/living/simple_mob/otie,
"Mutated Otie" =/mob/living/simple_mob/otie/feral,
"Red Otie" = /mob/living/simple_mob/otie/red,
"Otie" = /mob/living/simple_mob/vore/otie,
"Mutated Otie" =/mob/living/simple_mob/vore/otie/feral,
"Red Otie" = /mob/living/simple_mob/vore/otie/red,
"Corrupt Hound" = /mob/living/simple_mob/vore/aggressive/corrupthound,
"Corrupt Corrupt Hound" = /mob/living/simple_mob/vore/aggressive/corrupthound/prettyboi,
"Hunter Giant Spider" = /mob/living/simple_mob/animal/giant_spider/hunter,
@@ -110,7 +110,7 @@
/obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(var/mob/M)
..()
var/mob/living/simple_mob/vore/hostile/morph/newMorph = new /mob/living/simple_mob/vore/hostile/morph(get_turf(src))
var/mob/living/simple_mob/vore/morph/newMorph = new /mob/living/simple_mob/vore/morph(get_turf(src))
if(M.mind)
M.mind.transfer_to(newMorph)
to_chat(M, "<span class='notice'>You are a <b>Morph</b>, somehow having gotten aboard the station in your wandering. \