mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-18 18:46:24 +01:00
Tweaks and tidying
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:
@@ -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
|
||||
|
||||
@@ -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. \
|
||||
|
||||
Reference in New Issue
Block a user