cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +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/_helpers/global_lists_vr.dm
+6 -6
View File
@@ -701,15 +701,15 @@ var/global/list/xenobio_gold_mobs_hostile = list(
/mob/living/simple_mob/vore/aggressive/dino,
/mob/living/simple_mob/vore/aggressive/dragon,
/mob/living/simple_mob/vore/aggressive/frog,
/mob/living/simple_mob/otie,
/mob/living/simple_mob/otie/red,
/mob/living/simple_mob/vore/otie,
/mob/living/simple_mob/vore/otie/red,
/mob/living/simple_mob/vore/aggressive/panther,
/mob/living/simple_mob/vore/aggressive/rat,
/mob/living/simple_mob/vore/aggressive/giant_snake,
/mob/living/simple_mob/vore/sect_drone,
/mob/living/simple_mob/vore/sect_queen,
/mob/living/simple_mob/vore/weretiger,
/mob/living/simple_mob/animal/wolf,
/mob/living/simple_mob/vore/wolf,
/mob/living/simple_mob/vore/xeno_defanged)
var/global/list/xenobio_gold_mobs_bosses = list(
@@ -755,7 +755,7 @@ var/global/list/xenobio_gold_mobs_safe = list(
/mob/living/simple_mob/vore/fennix,
/mob/living/simple_mob/vore/hippo,
/mob/living/simple_mob/vore/horse,
/mob/living/simple_mob/animal/space/jelly,
/mob/living/simple_mob/vore/jelly,
/mob/living/simple_mob/vore/oregrub,
/mob/living/simple_mob/vore/oregrub/lava,
/mob/living/simple_mob/vore/rabbit,
@@ -906,14 +906,14 @@ var/global/list/event_wildlife_roaming = list(
list(
list(/mob/living/simple_mob/vore/aggressive/frog = 1),
list(/mob/living/simple_mob/tomato = 1),
list(/mob/living/simple_mob/animal/wolf = 1),
list(/mob/living/simple_mob/vore/wolf = 1),
list(/mob/living/simple_mob/vore/aggressive/dino = 1),
list(/mob/living/simple_mob/animal/space/bats = 1)
),
list(
list(/mob/living/simple_mob/animal/space/bear = 1),
list(/mob/living/simple_mob/vore/aggressive/deathclaw = 1),
list(/mob/living/simple_mob/otie = 1),
list(/mob/living/simple_mob/vore/otie = 1),
list(/mob/living/simple_mob/vore/aggressive/panther = 1),
list(/mob/living/simple_mob/vore/aggressive/rat = 1),
list(/mob/living/simple_mob/vore/aggressive/giant_snake = 1),
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. \
code/game/turfs/flooring/seasonal.dm
+14 -14
View File
@@ -52,9 +52,9 @@ var/world_time_season
/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
/mob/living/simple_mob/vore/bee = 20,
/mob/living/simple_mob/vore/horse/big = 5,
/mob/living/simple_mob/animal/wolf = 5,
/mob/living/simple_mob/animal/wolf/direwolf = 1,
/mob/living/simple_mob/animal/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/wolf = 5,
/mob/living/simple_mob/vore/wolf/direwolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/squirrel = 20
)
grass_types = list(
@@ -91,7 +91,7 @@ var/world_time_season
/mob/living/simple_mob/vore/horse/big = 5,
/mob/living/simple_mob/vore/pakkun = 2,
/mob/living/simple_mob/vore/fennix = 1,
/mob/living/simple_mob/animal/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/animal/passive/bird/parrot = 1,
/mob/living/simple_mob/vore/squirrel = 20
)
@@ -115,9 +115,9 @@ var/world_time_season
/mob/living/simple_mob/vore/horse/big = 10,
/mob/living/simple_mob/vore/alienanimals/dustjumper = 20,
/mob/living/simple_mob/vore/horse/big = 1,
/mob/living/simple_mob/animal/wolf = 1,
/mob/living/simple_mob/animal/wolf/direwolf = 1,
/mob/living/simple_mob/animal/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/wolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/squirrel = 20
)
grass_types = list(
@@ -138,13 +138,13 @@ var/world_time_season
animal_types = list(
/mob/living/simple_mob/vore/rabbit/white = 40,
/mob/living/simple_mob/vore/redpanda = 10,
/mob/living/simple_mob/animal/wolf = 10,
/mob/living/simple_mob/animal/wolf/direwolf = 1,
/mob/living/simple_mob/animal/wolf/direwolf/dog = 1,
/mob/living/simple_mob/otie/friendly = 2,
/mob/living/simple_mob/otie/friendly/chubby = 1,
/mob/living/simple_mob/otie/red/friendly = 1,
/mob/living/simple_mob/otie/red/chubby = 1,
/mob/living/simple_mob/vore/wolf = 10,
/mob/living/simple_mob/vore/wolf/direwolf = 1,
/mob/living/simple_mob/vore/wolf/direwolf/dog = 1,
/mob/living/simple_mob/vore/otie/friendly = 2,
/mob/living/simple_mob/vore/otie/friendly/chubby = 1,
/mob/living/simple_mob/vore/otie/red/friendly = 1,
/mob/living/simple_mob/vore/otie/red/chubby = 1,
/mob/living/simple_mob/vore/squirrel = 20
)
if(prob(snow_chance))
code/modules/casino/spawnergrenade_casino.dm
+2 -2
View File
@@ -73,7 +73,7 @@
/obj/item/weapon/grenade/spawnergrenade/casino/otie
desc = "It is set to detonate in 5 seconds. It will release a otie won from the casino prize vendor!"
name = "Casino Creature Container (Otie)"
spawner_type = /mob/living/simple_mob/otie/friendly
spawner_type = /mob/living/simple_mob/vore/otie/friendly
/obj/item/weapon/grenade/spawnergrenade/casino/goldcrest
desc = "It is set to detonate in 5 seconds. It will release a bird won from the casino prize vendor!"
@@ -102,4 +102,4 @@
/obj/item/weapon/grenade/spawnergrenade/casino/gygax/shuttlepod
name = "Casino Mech Container (Shuttlepod)"
spawner_type = /obj/mecha/working/hoverpod/shuttlepod
spawner_type = /obj/mecha/working/hoverpod/shuttlepod
code/modules/food/food/snacks.dm
+2 -2
View File
@@ -4778,8 +4778,8 @@
var/composition_reagent
var/composition_reagent_quantity
/mob/living/simple_mob/adultslime
composition_reagent = "slimejelly"
///mob/living/simple_mob/adultslime //The literal only thing in the game that uses this is commented out, so I comment out this too
// composition_reagent = "slimejelly"
/mob/living/carbon/alien/diona
composition_reagent = "nutriment"//Dionae are plants, so eating them doesn't give animal protein
code/modules/mob/living/simple_mob/sd_pets.dm
+3 -3
View File
@@ -104,7 +104,7 @@
value = CATALOGUER_REWARD_TRIVIAL //Worth less points since it lives on the ship
/mob/living/simple_mob/otie/red/chubby/cocoa
/mob/living/simple_mob/vore/otie/red/chubby/cocoa
name = "Cocoa"
desc = "A good boi, eats the scraps when you're not looking."
devourable = 0
@@ -113,9 +113,9 @@
mob_bump_flag = 32
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/otie/cocoa
catalogue_data = list(/datum/category_item/catalogue/fauna/otie/cocoa)
/datum/ai_holder/simple_mob/melee/evasive/otie/cocoa
hostile = 0
retaliate = 0
violent_breakthrough = 0
violent_breakthrough = 0
code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
+2 -2
View File
@@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
name = "chicken"
desc = "Hopefully the eggs are good this season."
tt_desc = "E Gallus gallus"
icon_state = "chicken"
icon_state = "chicken_white"
icon_living = "chicken"
icon_dead = "chicken_dead"
@@ -163,4 +163,4 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
emote_see = list("pecks at the ground","flaps its tiny wings")
/decl/mob_organ_names/chicken
hit_zones = list("head", "body", "left wing", "right wing", "left leg", "right leg", "tendies")
hit_zones = list("head", "body", "left wing", "right wing", "left leg", "right leg", "tendies")
code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm
+11 -2
View File
@@ -1,4 +1,4 @@
/mob/living/simple_mob/animal/space/jelly
/mob/living/simple_mob/vore/jelly
name = "jelly blob"
desc = "Some sort of undulating blob of slime!"
@@ -17,8 +17,17 @@
say_list_type = /datum/say_list/jelly
ai_holder_type = /datum/ai_holder/simple_mob/retaliate/jelly
min_oxy = 0
max_oxy = 0
min_tox = 0
max_tox = 0
min_co2 = 0
max_co2 = 0
min_n2 = 0
max_n2 = 0
minbodytemp = 0
// Activate Noms!
/mob/living/simple_mob/animal/space/jelly
vore_active = 1
vore_pounce_chance = 0
vore_icons = SA_ICON_LIVING
code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm
+2 -4
View File
@@ -1,4 +1,4 @@
/mob/living/simple_mob/mobs_monsters/clowns/big
/mob/living/simple_mob/clowns/big
tt_desc = "E Homo sapiens corydon horrificus" //this clown is stronk
faction = "clown"
@@ -18,8 +18,6 @@
loot_list = list(/obj/item/weapon/bikehorn = 100)
/mob/living/simple_mob/mobs_monsters/clowns/big
min_oxy = 0
max_oxy = 500
min_tox = 0
@@ -41,4 +39,4 @@
can_flee = FALSE
speak_chance = 3
wander = TRUE
base_wander_delay = 9
base_wander_delay = 9
code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/mob/living/simple_mob/mobs_monsters/clowns/
/mob/living/simple_mob/clowns/
tt_desc = "E Homo sapiens corydon" //this is a clown
faction = "clown"
movement_sound = 'sound/effects/clownstep2.ogg'
code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bigclowns.dm
+23 -23
View File
@@ -1,4 +1,4 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/normal
/mob/living/simple_mob/clowns/big/normal
name = "Clown"
desc = "A regular, every tuesday Clown."
tt_desc = "E Homo sapiens corydon" //this is a clown
@@ -10,7 +10,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/honkmunculus
/mob/living/simple_mob/clowns/big/honkmunculus
name = "A Clown?"
desc = "That clown has some interesting proportions."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -28,7 +28,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/cluwne
/mob/living/simple_mob/clowns/big/cluwne
name = "A Clown?"
desc = "Oh no not that thing."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -40,7 +40,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/tunnelclown
/mob/living/simple_mob/clowns/big/tunnelclown
name = "A Clown?"
desc = "Have you heard about our lord and savior, Honkus Chrust?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -52,7 +52,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/sentinel
/mob/living/simple_mob/clowns/big/sentinel
name = "A Clown?"
desc = "This guy means business..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -64,7 +64,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/punished
/mob/living/simple_mob/clowns/big/punished
name = "A Clown?"
desc = "A clown at peak performance."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -82,7 +82,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/thicc
/mob/living/simple_mob/clowns/big/thicc
name = "A Clown..."
desc = "I mean, you see it don't you?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -100,7 +100,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/perm
/mob/living/simple_mob/clowns/big/perm
name = "A Clown?"
desc = "That clown really needs to get that hair under control."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -118,7 +118,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/wide
/mob/living/simple_mob/clowns/big/wide
name = "A Clown?"
desc = "He looks good from some angles!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -136,7 +136,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/thin
/mob/living/simple_mob/clowns/big/thin
name = "A Clown?"
desc = "Is he eating enough?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -148,7 +148,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/hulk
/mob/living/simple_mob/clowns/big/hulk
name = "A Clown?"
desc = "Just look at those muscles."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -168,7 +168,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/longface
/mob/living/simple_mob/clowns/big/longface
name = "A Clown?"
desc = "Why the long face?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -186,7 +186,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/giggles
/mob/living/simple_mob/clowns/big/giggles
name = "A Giggles?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -198,7 +198,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/destroyer
/mob/living/simple_mob/clowns/big/destroyer
name = "A Clown?"
desc = "That clown looks like he means business."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -239,7 +239,7 @@
)
/mob/living/simple_mob/mobs_monsters/clowns/big/chlown
/mob/living/simple_mob/clowns/big/chlown
name = "A Clown?"
desc = "No."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -257,7 +257,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/scary
/mob/living/simple_mob/clowns/big/scary
name = "A Clown?"
desc = "Hey that clown looks familiar!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -269,7 +269,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/flesh
/mob/living/simple_mob/clowns/big/flesh
name = "A Clown?"
desc = "WOOOOO STREAKING WOOOO!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -281,7 +281,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/clowns
/mob/living/simple_mob/clowns/big/clowns
name = "Definitely a singular clown"
desc = "Is it one clown, or many clowns in not a trenchcoat?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -299,7 +299,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/mutant
/mob/living/simple_mob/clowns/big/mutant
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -317,7 +317,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/blob
/mob/living/simple_mob/clowns/big/blob
name = "A Clown?"
desc = "Go to a gym fatty!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -335,7 +335,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/mayor
/mob/living/simple_mob/clowns/big/mayor
name = "A clown?"
desc = "One speaks in riddles..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -353,7 +353,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/honkling
/mob/living/simple_mob/clowns/big/honkling
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -367,7 +367,7 @@
//template
///mob/living/simple_mob/mobs_monsters/clowns/big/
///mob/living/simple_mob/clowns/big/
// name = "A Clown?"
// desc = "Oh sweet space christ."
// tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift
/mob/living/simple_mob/clowns/big/c_shift
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
faction = "clown"
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/New()
/mob/living/simple_mob/clowns/big/c_shift/New()
..()
verbs += /mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/proc/phase_shift
verbs += /mob/living/simple_mob/clowns/big/c_shift/proc/phase_shift
code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/busclowns.dm
+22 -22
View File
@@ -1,4 +1,4 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/anormal
/mob/living/simple_mob/clowns/big/c_shift/anormal
name = "Clown"
desc = "A regular, every tuesday Clown."
tt_desc = "E Homo sapiens corydon" //this is a clown
@@ -10,7 +10,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkmunculus
/mob/living/simple_mob/clowns/big/c_shift/honkmunculus
name = "A Clown?"
desc = "That clown has some interesting proportions."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -28,7 +28,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/cluwne
/mob/living/simple_mob/clowns/big/c_shift/cluwne
name = "A Clown?"
desc = "Oh no not that thing."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -40,7 +40,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/tunnelclown
/mob/living/simple_mob/clowns/big/c_shift/tunnelclown
name = "A Clown?"
desc = "Have you heard about our lord and savior, Honkus Chrust?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -52,7 +52,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/sentinel
/mob/living/simple_mob/clowns/big/c_shift/sentinel
name = "A Clown?"
desc = "This guy means business..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -64,7 +64,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/punished
/mob/living/simple_mob/clowns/big/c_shift/punished
name = "A Clown?"
desc = "A clown at peak performance."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -82,7 +82,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/thicc
/mob/living/simple_mob/clowns/big/c_shift/thicc
name = "A Clown..."
desc = "I mean, you see it don't you?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -100,7 +100,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/perm
/mob/living/simple_mob/clowns/big/c_shift/perm
name = "A Clown?"
desc = "That clown really needs to get that hair under control."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -118,7 +118,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/wide
/mob/living/simple_mob/clowns/big/c_shift/wide
name = "A Clown?"
desc = "He looks good from some angles!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -136,7 +136,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/thin
/mob/living/simple_mob/clowns/big/c_shift/thin
name = "A Clown?"
desc = "Is he eating enough?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -148,7 +148,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/hulk
/mob/living/simple_mob/clowns/big/c_shift/hulk
name = "A Clown?"
desc = "Just look at those muscles."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -168,7 +168,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/longface
/mob/living/simple_mob/clowns/big/c_shift/longface
name = "A Clown?"
desc = "Why the long face?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -186,7 +186,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/giggles
/mob/living/simple_mob/clowns/big/c_shift/giggles
name = "A Giggles?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -198,7 +198,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/destroyer
/mob/living/simple_mob/clowns/big/c_shift/destroyer
name = "A Clown?"
desc = "That clown looks like he means business."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -239,7 +239,7 @@
)
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/chlown
/mob/living/simple_mob/clowns/big/c_shift/chlown
name = "A Clown?"
desc = "No."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -257,7 +257,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/scary
/mob/living/simple_mob/clowns/big/c_shift/scary
name = "A Clown?"
desc = "Hey that clown looks familiar!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -269,7 +269,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/flesh
/mob/living/simple_mob/clowns/big/c_shift/flesh
name = "A Clown?"
desc = "WOOOOO STREAKING WOOOO!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -281,7 +281,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/clowns
/mob/living/simple_mob/clowns/big/c_shift/clowns
name = "Definitely a singular clown"
desc = "Is it one clown, or many clowns in not a trenchcoat?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -299,7 +299,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/mutant
/mob/living/simple_mob/clowns/big/c_shift/mutant
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -317,7 +317,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/blob
/mob/living/simple_mob/clowns/big/c_shift/blob
name = "A Clown?"
desc = "Go to a gym fatty!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -335,7 +335,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/mayor
/mob/living/simple_mob/clowns/big/c_shift/mayor
name = "A clown?"
desc = "One speaks in riddles..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -353,7 +353,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkling
/mob/living/simple_mob/clowns/big/c_shift/honkling
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm
+6 -6
View File
@@ -1,8 +1,8 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift
/mob/living/simple_mob/clowns/big/c_shift
var/ability_flags = 0 //Flags for active abilities
// Phase shifting procs (and related procs)
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/proc/phase_shift()
/mob/living/simple_mob/clowns/big/c_shift/proc/phase_shift()
var/turf/T = get_turf(src)
if(!T.CanPass(src,T) || loc != T)
to_chat(src,"<span class='warning'>You can't use that here!</span>")
@@ -73,23 +73,23 @@
density = FALSE
force_max_speed = TRUE
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/UnarmedAttack()
/mob/living/simple_mob/clowns/big/c_shift/UnarmedAttack()
if(ability_flags & AB_PHASE_SHIFTED)
return FALSE //Nope.
. = ..()
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/can_fall()
/mob/living/simple_mob/clowns/big/c_shift/can_fall()
if(ability_flags & AB_PHASE_SHIFTED)
return FALSE //Nope!
return ..()
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/zMove(direction)
/mob/living/simple_mob/clowns/big/c_shift/zMove(direction)
if(ability_flags & AB_PHASE_SHIFTED)
var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
if(destination)
forceMove(destination)
return TRUE
return ..()
return ..()
code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm
+2 -2
View File
@@ -17,7 +17,7 @@
/obj/structure/ghost_pod/manual/clegg/create_occupant(var/mob/M)
lightning_strike(get_turf(src), cosmetic = TRUE)
var/list/choices = list(/mob/living/simple_mob/mobs_monsters/clowns/normal, /mob/living/simple_mob/mobs_monsters/clowns/honkling, /mob/living/simple_mob/mobs_monsters/clowns/mayor, /mob/living/simple_mob/mobs_monsters/clowns/blob, /mob/living/simple_mob/mobs_monsters/clowns/mutant, /mob/living/simple_mob/mobs_monsters/clowns/clowns, /mob/living/simple_mob/mobs_monsters/clowns/flesh, /mob/living/simple_mob/mobs_monsters/clowns/scary, /mob/living/simple_mob/mobs_monsters/clowns/chlown, /mob/living/simple_mob/mobs_monsters/clowns/destroyer, /mob/living/simple_mob/mobs_monsters/clowns/giggles, /mob/living/simple_mob/mobs_monsters/clowns/longface, /mob/living/simple_mob/mobs_monsters/clowns/hulk, /mob/living/simple_mob/mobs_monsters/clowns/thin, /mob/living/simple_mob/mobs_monsters/clowns/wide, /mob/living/simple_mob/mobs_monsters/clowns/perm, /mob/living/simple_mob/mobs_monsters/clowns/thicc, /mob/living/simple_mob/mobs_monsters/clowns/punished, /mob/living/simple_mob/mobs_monsters/clowns/sentinel, /mob/living/simple_mob/mobs_monsters/clowns/tunnelclown, /mob/living/simple_mob/mobs_monsters/clowns/cluwne, /mob/living/simple_mob/mobs_monsters/clowns/honkmunculus)
var/list/choices = list(/mob/living/simple_mob/clowns/normal, /mob/living/simple_mob/clowns/honkling, /mob/living/simple_mob/clowns/mayor, /mob/living/simple_mob/clowns/blob, /mob/living/simple_mob/clowns/mutant, /mob/living/simple_mob/clowns/clowns, /mob/living/simple_mob/clowns/flesh, /mob/living/simple_mob/clowns/scary, /mob/living/simple_mob/clowns/chlown, /mob/living/simple_mob/clowns/destroyer, /mob/living/simple_mob/clowns/giggles, /mob/living/simple_mob/clowns/longface, /mob/living/simple_mob/clowns/hulk, /mob/living/simple_mob/clowns/thin, /mob/living/simple_mob/clowns/wide, /mob/living/simple_mob/clowns/perm, /mob/living/simple_mob/clowns/thicc, /mob/living/simple_mob/clowns/punished, /mob/living/simple_mob/clowns/sentinel, /mob/living/simple_mob/clowns/tunnelclown, /mob/living/simple_mob/clowns/cluwne, /mob/living/simple_mob/clowns/honkmunculus)
var/chosen_clown = tgui_input_list(M, "Redspace clowns like themes, what's yours?", "Theme Choice", choices)
density = FALSE
var/mob/living/simple_mob/R = new chosen_clown(get_turf(src))
@@ -27,4 +27,4 @@
R.ckey = M.ckey
visible_message("<span class='warning'>With a bright flash of light, \the [src] disappears, and in its place you see a... Clown?</span>")
log_and_message_admins("successfully touched \a [src] and summoned a mistake!")
..()
..()
code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm
+3 -3
View File
@@ -1,4 +1,4 @@
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkelemental
/mob/living/simple_mob/clowns/big/c_shift/honkelemental
name = "Honk Elemental"
desc = "That thing can't be real, right?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -23,7 +23,7 @@
speak = list("HONK", "Honk!", "Henk!")
emote_see = list("honks")
/mob/living/simple_mob/mobs_monsters/clowns/big/c_shift/honkelemental/verb/spawn_egg()
/mob/living/simple_mob/clowns/big/c_shift/honkelemental/verb/spawn_egg()
set category = "Abilities"
set name = "Spawn Clown Egg"
set desc = "Spawns an egg that a player can touch, which will call on ghosts to spawn as clowns."
@@ -32,4 +32,4 @@
return
new /obj/structure/ghost_pod/manual/clegg(get_turf(src))
flick("he_lay",src)
flick("he_lay",src)
code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm
+24 -24
View File
@@ -1,4 +1,4 @@
/mob/living/simple_mob/mobs_monsters/clowns/
/mob/living/simple_mob/clowns/
response_help = "pokes"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -11,7 +11,7 @@
/mob/living/simple_mob/mobs_monsters/clowns/honkmunculus
/mob/living/simple_mob/clowns/honkmunculus
name = "A Clown?"
desc = "That clown has some interesting proportions."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -29,7 +29,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/cluwne
/mob/living/simple_mob/clowns/cluwne
name = "A Clown?"
desc = "Oh no not that thing."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -41,7 +41,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/tunnelclown
/mob/living/simple_mob/clowns/tunnelclown
name = "A Clown?"
desc = "Have you heard about our lord and savior, Honkus Chrust?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -53,7 +53,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/sentinel
/mob/living/simple_mob/clowns/sentinel
name = "A Clown?"
desc = "This guy means business..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -66,7 +66,7 @@
/mob/living/simple_mob/mobs_monsters/clowns/punished
/mob/living/simple_mob/clowns/punished
name = "A Clown?"
desc = "A clown at peak performance."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -84,7 +84,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/thicc
/mob/living/simple_mob/clowns/thicc
name = "A Clown..."
desc = "I mean, you see it don't you?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -102,7 +102,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/perm
/mob/living/simple_mob/clowns/perm
name = "A Clown?"
desc = "That clown really needs to get that hair under control."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -120,7 +120,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/wide
/mob/living/simple_mob/clowns/wide
name = "A Clown?"
desc = "He looks good from some angles!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -138,7 +138,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/thin
/mob/living/simple_mob/clowns/thin
name = "A Clown?"
desc = "Is he eating enough?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -150,7 +150,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/hulk
/mob/living/simple_mob/clowns/hulk
name = "A Clown?"
desc = "Just look at those muscles."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -168,7 +168,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/longface
/mob/living/simple_mob/clowns/longface
name = "A Clown?"
desc = "Why the long face?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -186,7 +186,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/giggles
/mob/living/simple_mob/clowns/giggles
name = "A Giggles?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -198,7 +198,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/destroyer
/mob/living/simple_mob/clowns/destroyer
name = "A Clown?"
desc = "That clown looks like he means business."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -216,7 +216,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/chlown
/mob/living/simple_mob/clowns/chlown
name = "A Clown?"
desc = "No."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -234,7 +234,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/scary
/mob/living/simple_mob/clowns/scary
name = "A Clown?"
desc = "Hey that clown looks familiar!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -246,7 +246,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/flesh
/mob/living/simple_mob/clowns/flesh
name = "A Clown?"
desc = "WOOOOO STREAKING WOOOO!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -258,7 +258,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/clowns
/mob/living/simple_mob/clowns/clowns
name = "Definitely a singular clown"
desc = "Is it one clown, or many clowns in not a trenchcoat?"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -276,7 +276,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/mutant
/mob/living/simple_mob/clowns/mutant
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -294,7 +294,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/blob
/mob/living/simple_mob/clowns/blob
name = "A Clown?"
desc = "Go to a gym fatty!"
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -312,7 +312,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/mayor
/mob/living/simple_mob/clowns/mayor
name = "A clown?"
desc = "One speaks in riddles..."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -330,7 +330,7 @@
pixel_y = 0
/mob/living/simple_mob/mobs_monsters/clowns/honkling
/mob/living/simple_mob/clowns/honkling
name = "A Clown?"
desc = "Oh sweet space christ."
tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown
@@ -342,7 +342,7 @@
vis_height = 32
/mob/living/simple_mob/mobs_monsters/clowns/normal
/mob/living/simple_mob/clowns/normal
name = "Clown"
desc = "A regular, every tuesday Clown."
tt_desc = "E Homo sapiens corydon" //this is a clown
@@ -359,4 +359,4 @@
response_help = "pokes"
response_disarm = "gently pushes aside"
response_harm = "hits"
response_harm = "hits"
code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+28 -28
View File
@@ -1,6 +1,6 @@
#define MORPH_COOLDOWN 50
/mob/living/simple_mob/vore/hostile/morph
/mob/living/simple_mob/vore/morph
name = "morph"
real_name = "morph"
desc = "A revolting, pulsating pile of flesh."
@@ -58,25 +58,25 @@
var/static/list/blacklist_typecache = typecacheof(list(
/obj/screen,
/obj/singularity,
/mob/living/simple_mob/vore/hostile/morph,
/mob/living/simple_mob/vore/morph,
/obj/effect))
/mob/living/simple_mob/vore/hostile/morph/Initialize()
/mob/living/simple_mob/vore/morph/Initialize()
verbs += /mob/living/proc/ventcrawl
verbs += /mob/living/simple_mob/vore/hostile/morph/proc/take_over_prey
if(!istype(src, /mob/living/simple_mob/vore/hostile/morph/dominated_prey))
verbs += /mob/living/simple_mob/vore/hostile/morph/proc/morph_color
verbs += /mob/living/simple_mob/vore/morph/proc/take_over_prey
if(!istype(src, /mob/living/simple_mob/vore/morph/dominated_prey))
verbs += /mob/living/simple_mob/vore/morph/proc/morph_color
return ..()
/mob/living/simple_mob/vore/hostile/morph/Destroy()
/mob/living/simple_mob/vore/morph/Destroy()
form = null
return ..()
/mob/living/simple_mob/vore/hostile/morph/proc/allowed(atom/movable/A)
/mob/living/simple_mob/vore/morph/proc/allowed(atom/movable/A)
return !is_type_in_typecache(A, blacklist_typecache) && (isobj(A) || ismob(A))
/mob/living/simple_mob/vore/hostile/morph/examine(mob/user)
/mob/living/simple_mob/vore/morph/examine(mob/user)
if(morphed)
. = form.examine(user)
if(get_dist(user, src) <= 3 && !resting)
@@ -84,7 +84,7 @@
else
. = ..()
/mob/living/simple_mob/vore/hostile/morph/ShiftClickOn(atom/movable/A)
/mob/living/simple_mob/vore/morph/ShiftClickOn(atom/movable/A)
if(Adjacent(A))
if(morph_time <= world.time && !stat)
if(A == src)
@@ -97,7 +97,7 @@
else
..()
/mob/living/simple_mob/vore/hostile/morph/proc/assume(atom/movable/target)
/mob/living/simple_mob/vore/morph/proc/assume(atom/movable/target)
var/mob/living/carbon/human/humantarget = target
if(istype(humantarget) && humantarget.resleeve_lock && ckey != humantarget.resleeve_lock)
to_chat(src, "<span class='warning'>[target] cannot be impersonated!</span>")
@@ -142,7 +142,7 @@
return
/mob/living/simple_mob/vore/hostile/morph/proc/restore(var/silent = FALSE)
/mob/living/simple_mob/vore/morph/proc/restore(var/silent = FALSE)
if(!morphed)
to_chat(src, "<span class='warning'>You're already in your normal form!</span>")
return
@@ -187,21 +187,21 @@
morph_time = world.time + MORPH_COOLDOWN
/mob/living/simple_mob/vore/hostile/morph/death(gibbed)
/mob/living/simple_mob/vore/morph/death(gibbed)
if(morphed)
visible_message("<span class='warning'>[src] twists and dissolves into a pile of flesh!</span>")
restore(TRUE)
..()
/mob/living/simple_mob/vore/hostile/morph/will_show_tooltip()
/mob/living/simple_mob/vore/morph/will_show_tooltip()
return (!morphed)
/mob/living/simple_mob/vore/hostile/morph/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = TRUE)
/mob/living/simple_mob/vore/morph/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = TRUE)
if(morphed && !ismob(form))
return
return ..()
/mob/living/simple_mob/vore/hostile/morph/lay_down()
/mob/living/simple_mob/vore/morph/lay_down()
if(morphed)
var/temp_state = icon_state
..()
@@ -225,18 +225,18 @@
else
..()
/mob/living/simple_mob/vore/hostile/morph/update_icon()
/mob/living/simple_mob/vore/morph/update_icon()
if(morphed)
return
return ..()
/mob/living/simple_mob/vore/hostile/morph/update_icons()
/mob/living/simple_mob/vore/morph/update_icons()
if(morphed)
return
return ..()
/mob/living/simple_mob/vore/hostile/morph/update_transform()
/mob/living/simple_mob/vore/morph/update_transform()
if(morphed)
var/matrix/M = matrix()
M.Scale(icon_scale_x, icon_scale_y)
@@ -245,7 +245,7 @@
else
..()
/mob/living/simple_mob/vore/hostile/morph/proc/morph_color()
/mob/living/simple_mob/vore/morph/proc/morph_color()
set name = "Pick Color"
set category = "Abilities"
set desc = "You can set your color!"
@@ -255,7 +255,7 @@
chosen_color = newcolor
/mob/living/simple_mob/vore/hostile/morph/proc/take_over_prey()
/mob/living/simple_mob/vore/morph/proc/take_over_prey()
set name = "Take Over Prey"
set category = "Abilities"
set desc = "Take command of your prey's body."
@@ -302,23 +302,23 @@
stop_pulling()
original_ckey = ckey
log_and_message_admins("[key_name_admin(src)] has swapped bodies with [key_name_admin(M)] as a morph at [get_area(src)] - [COORD(src)].")
new /mob/living/simple_mob/vore/hostile/morph/dominated_prey(M.vore_selected, M.ckey, src, M)
new /mob/living/simple_mob/vore/morph/dominated_prey(M.vore_selected, M.ckey, src, M)
else
to_chat(src, "<span class='warning'>\The [M] declined your request for control.</span>")
else
to_chat(src, "<span class='warning'>\The [M] declined your request for control.</span>")
/mob/living/simple_mob/vore/hostile/morph/dominated_prey
/mob/living/simple_mob/vore/morph/dominated_prey
name = "subservient node"
color = "#171717"
digestable = 0
devourable = 0
var/mob/living/simple_mob/vore/hostile/morph/parent_morph
var/mob/living/simple_mob/vore/morph/parent_morph
var/mob/living/carbon/human/prey_body
var/prey_ckey
/mob/living/simple_mob/vore/hostile/morph/dominated_prey/New(loc, pckey, parent, prey)
/mob/living/simple_mob/vore/morph/dominated_prey/New(loc, pckey, parent, prey)
. = ..()
if(pckey)
prey_ckey = pckey
@@ -336,17 +336,17 @@
else
qdel(src)
/mob/living/simple_mob/vore/hostile/morph/dominated_prey/death(gibbed)
/mob/living/simple_mob/vore/morph/dominated_prey/death(gibbed)
. = ..()
undo_prey_takeover(FALSE)
/mob/living/simple_mob/vore/hostile/morph/dominated_prey/Destroy()
/mob/living/simple_mob/vore/morph/dominated_prey/Destroy()
. = ..()
parent_morph = null
prey_body = null
/mob/living/simple_mob/vore/hostile/morph/dominated_prey/proc/undo_prey_takeover(ooc_escape)
/mob/living/simple_mob/vore/morph/dominated_prey/proc/undo_prey_takeover(ooc_escape)
if(buckled)
buckled.unbuckle_mob()
if(prey_body.buckled)
code/modules/mob/living/simple_mob/subtypes/vore/otie.dm
+27 -27
View File
@@ -6,7 +6,7 @@
**the catalogue entry ends here.**"
value = CATALOGUER_REWARD_MEDIUM
/mob/living/simple_mob/otie //Spawn this one only if you're looking for a bad time. Not friendly.
/mob/living/simple_mob/vore/otie //Spawn this one only if you're looking for a bad time. Not friendly.
name = "otie"
desc = "The classic bioengineered longdog."
tt_desc = "Otus robustus"
@@ -49,7 +49,7 @@
// Activate Noms!
/mob/living/simple_mob/otie
/mob/living/simple_mob/vore/otie
vore_active = 1
vore_capacity = 1
vore_pounce_chance = 20
@@ -60,7 +60,7 @@
vore_default_contamination_color = "black"
vore_default_item_mode = IM_DIGEST
/mob/living/simple_mob/otie/feral //gets the pet2tame feature. starts out hostile tho so get gamblin'
/mob/living/simple_mob/vore/otie/feral //gets the pet2tame feature. starts out hostile tho so get gamblin'
name = "mutated feral otie"
desc = "The classic bioengineered longdog. No pets. Only bite. This one has mutated from too much time out on the surface of Virgo-3B."
tt_desc = "Otus phoronis"
@@ -81,14 +81,14 @@
max_n2 = 0
has_eye_glow = TRUE
/mob/living/simple_mob/otie/feral/chubby
/mob/living/simple_mob/vore/otie/feral/chubby
name = "chubby mutated feral otie"
desc = "The classic bioengineered longdog. No pets. Only bite. This one has mutated from too much time out on the surface of Virgo-3B. What an absolute unit."
icon_state = "photiec"
icon_living = "photiec"
icon_rest = "photiec_rest"
/mob/living/simple_mob/otie/red
/mob/living/simple_mob/vore/otie/red
name = "feral red otie"
desc = "Seems this ominous looking longdog has been infused with wicked infernal forces."
tt_desc = "Otus infernalis"
@@ -110,13 +110,13 @@
maxbodytemp = 1000
has_eye_glow = TRUE
/mob/living/simple_mob/otie/red/friendly //gets the pet2tame feature and doesn't kill you right away
/mob/living/simple_mob/vore/otie/red/friendly //gets the pet2tame feature and doesn't kill you right away
name = "red otie"
desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. This one seems rather peaceful though."
faction = "neutral"
tamed = 1
/mob/living/simple_mob/otie/red/chubby //gets the pet2tame feature and doesn't kill you right away
/mob/living/simple_mob/vore/otie/red/chubby //gets the pet2tame feature and doesn't kill you right away
name = "chubby red otie"
desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. What an absolute unit."
icon_state = "hotiec"
@@ -125,20 +125,20 @@
faction = "neutral"
tamed = 1
/mob/living/simple_mob/otie/friendly //gets the pet2tame feature and doesn't kill you right away
/mob/living/simple_mob/vore/otie/friendly //gets the pet2tame feature and doesn't kill you right away
name = "otie"
desc = "The classic bioengineered longdog. This one might even tolerate you!"
faction = "neutral"
tamed = 1
/mob/living/simple_mob/otie/friendly/chubby
/mob/living/simple_mob/vore/otie/friendly/chubby
name = "chubby otie"
desc = "The classic bioengineered longdog. This one might even tolerate you! What an absolute unit"
icon_state = "fotie"
icon_living = "fotie"
icon_rest = "fotie_rest"
/mob/living/simple_mob/otie/cotie //same as above but has a little collar :v
/mob/living/simple_mob/vore/otie/cotie //same as above but has a little collar :v
name = "tamed otie"
desc = "The classic bioengineered longdog. This one has a nice little collar on its neck. However a proper domesticated otie is an oxymoron and the collar is likely just a decoration."
icon_state = "cotie"
@@ -147,14 +147,14 @@
faction = "neutral"
tamed = 1
/mob/living/simple_mob/otie/cotie/chubby
/mob/living/simple_mob/vore/otie/cotie/chubby
name = "chubby tamed otie"
desc = "The classic bioengineered longdog. This one has a nice little collar on its neck. What an absolute unit."
icon_state = "fcotie"
icon_living = "fcotie"
icon_rest = "fcotie_rest"
/mob/living/simple_mob/otie/cotie/phoron //friendly phoron pup with collar
/mob/living/simple_mob/vore/otie/cotie/phoron //friendly phoron pup with collar
name = "mutated otie"
desc = "Looks like someone did manage to domesticate one of those wild phoron mutants. What a badass."
tt_desc = "Otus phoronis"
@@ -172,7 +172,7 @@
max_n2 = 0
has_eye_glow = TRUE
/mob/living/simple_mob/otie/security //tame by default unless you're a marked crimester. can be befriended to follow with pets tho.
/mob/living/simple_mob/vore/otie/security //tame by default unless you're a marked crimester. can be befriended to follow with pets tho.
name = "guard otie"
desc = "The VARMAcorp bioengineering division flagship product on big mean guard dogs."
icon_state = "sotie"
@@ -190,7 +190,7 @@
var/check_records = 0 // If true, arrests people without a record.
var/check_arrest = 1 // If true, arrests people who are set to arrest.
/mob/living/simple_mob/otie/security/chubby
/mob/living/simple_mob/vore/otie/security/chubby
name = "chubby guard otie"
desc = "The VARMAcorp bioengineering division flagship product on big mean guard dogs. What an absolute unit."
icon_state = "fsotie"
@@ -198,7 +198,7 @@
icon_rest = "fsotie_rest"
icon_dead = "fsotie-dead"
/mob/living/simple_mob/otie/security/phoron
/mob/living/simple_mob/vore/otie/security/phoron
name = "mutated guard otie"
desc = "An extra rare phoron resistant version of the VARMAcorp trained guard dogs adapted for hostile environments."
tt_desc = "Otus phoronis"
@@ -215,7 +215,7 @@
min_n2 = 0
max_n2 = 0
/mob/living/simple_mob/otie/security/phoron/red
/mob/living/simple_mob/vore/otie/security/phoron/red
name = "red guard otie"
desc = "An ominous looking version of the big mean VARMAcorp guard dogs."
tt_desc = "Otus infernalis"
@@ -225,20 +225,20 @@
icon_dead = "sechotie-dead"
maxbodytemp = 1000
/mob/living/simple_mob/otie/security/phoron/red/chubby
/mob/living/simple_mob/vore/otie/security/phoron/red/chubby
name = "chubby red guard otie"
desc = "An ominous looking version of the big mean VARMAcorp guard dogs. What an absolute unit."
icon_state = "hotiesc"
icon_living = "hotiesc"
icon_rest = "hotiesc_rest"
/mob/living/simple_mob/otie/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims.
/mob/living/simple_mob/vore/otie/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims.
if(istype(O, /obj/item/weapon/reagent_containers/food))
qdel(O)
playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1)
if(!has_AI())//No autobarf on player control.
return
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/otie/security))
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/vore/otie/security))
to_chat(user,"<span class='notice'>The guard pup accepts your offer for their catch.</span>")
release_vore_contents()
else if(prob(2)) //Small chance to get prey out from non-sec oties.
@@ -247,7 +247,7 @@
return
. = ..()
/mob/living/simple_mob/otie/security/feed_grabbed_to_self(var/mob/living/user, var/mob/living/prey) // Make the gut start out safe for bellybrigging.
/mob/living/simple_mob/vore/otie/security/feed_grabbed_to_self(var/mob/living/user, var/mob/living/prey) // Make the gut start out safe for bellybrigging.
if(ishuman(prey))
vore_selected.digest_mode = DM_HOLD
if(check_threat(prey) >= 4)
@@ -256,12 +256,12 @@
vore_selected.digest_mode = DM_DIGEST
. = ..()
/mob/living/simple_mob/otie/security/proc/check_threat(var/mob/living/M)
/mob/living/simple_mob/vore/otie/security/proc/check_threat(var/mob/living/M)
if(!M || !ishuman(M) || M.stat == DEAD || src == M)
return 0
return M.assess_perp(0, 0, 0, check_records, check_arrest)
/mob/living/simple_mob/otie/security/proc/target_name(mob/living/T)
/mob/living/simple_mob/vore/otie/security/proc/target_name(mob/living/T)
if(ishuman(T))
var/mob/living/carbon/human/H = T
return H.get_id_name("unidentified person")
@@ -269,7 +269,7 @@
//Pet 4 friendly
/mob/living/simple_mob/otie/attack_hand(mob/living/carbon/human/M as mob)
/mob/living/simple_mob/vore/otie/attack_hand(mob/living/carbon/human/M as mob)
switch(M.a_intent)
if(I_HELP)
@@ -302,12 +302,12 @@
else
..()
/mob/living/simple_mob/otie/death(gibbed, deathmessage = "dies!")
/mob/living/simple_mob/vore/otie/death(gibbed, deathmessage = "dies!")
.=..()
resting = 0
icon_state = icon_dead
/mob/living/simple_mob/otie/Login()
/mob/living/simple_mob/vore/otie/Login()
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
@@ -315,7 +315,7 @@
verbs |= /mob/living/proc/toggle_rider_reins
movement_cooldown = 0
/mob/living/simple_mob/otie/MouseDrop_T(mob/living/M, mob/living/user)
/mob/living/simple_mob/vore/otie/MouseDrop_T(mob/living/M, mob/living/user)
return
/datum/say_list/otie
@@ -327,7 +327,7 @@
/datum/ai_holder/simple_mob/melee/evasive/otie
/datum/ai_holder/simple_mob/melee/evasive/otie/New(var/mob/living/simple_mob/otie/new_holder)
/datum/ai_holder/simple_mob/melee/evasive/otie/New(var/mob/living/simple_mob/vore/otie/new_holder)
.=..()
if(new_holder.tamed)
hostile = FALSE
code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
+12 -12
View File
@@ -5,7 +5,7 @@
love to nip and bite at things, as well as sniffing around. They seem to mark their territory by way of scent-marking/urinating on things."
value = CATALOGUER_REWARD_EASY
/mob/living/simple_mob/animal/wolf
/mob/living/simple_mob/vore/wolf
name = "grey wolf"
desc = "My, what big jaws it has!"
tt_desc = "Canis lupus"
@@ -34,12 +34,12 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/wolf)
// Activate Noms!
/mob/living/simple_mob/animal/wolf
/mob/living/simple_mob/vore/wolf
vore_active = 1
vore_icons = SA_ICON_LIVING
// Space edition, stronger and bitier
/mob/living/simple_mob/animal/wolf/space
/mob/living/simple_mob/vore/wolf/space
name = "space wolf"
tt_desc = "Canis lupus aetherius"
@@ -63,10 +63,10 @@
minbodytemp = 0
maxbodytemp = 700
/mob/living/simple_mob/animal/wolf/space/Process_Spacemove(var/check_drift = 0)
/mob/living/simple_mob/vore/wolf/space/Process_Spacemove(var/check_drift = 0)
return TRUE
/mob/living/simple_mob/animal/wolf/direwolf
/mob/living/simple_mob/vore/wolf/direwolf
name = "dire wolf"
desc = "The biggest and baddest wolf around."
tt_desc = "Canis maxdirus"
@@ -96,7 +96,7 @@
buckle_lying = FALSE
vore_icons = SA_ICON_LIVING | SA_ICON_REST
/mob/living/simple_mob/animal/wolf/direwolf/Login()
/mob/living/simple_mob/vore/wolf/direwolf/Login()
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
@@ -104,10 +104,10 @@
verbs |= /mob/living/proc/toggle_rider_reins
movement_cooldown = -1
/mob/living/simple_mob/animal/wolf/direwolf/MouseDrop_T(mob/living/M, mob/living/user)
/mob/living/simple_mob/vore/wolf/direwolf/MouseDrop_T(mob/living/M, mob/living/user)
return
/mob/living/simple_mob/animal/wolf/direwolf/dog
/mob/living/simple_mob/vore/wolf/direwolf/dog
name = "large dog"
desc = "The biggest and goodest dog around."
tt_desc = "Canis maxdirus familiaris"
@@ -116,7 +116,7 @@
icon_state = "diredog"
icon_rest = "diredog_rest"
/mob/living/simple_mob/animal/wolf/direwolf/dog/sec
/mob/living/simple_mob/vore/wolf/direwolf/dog/sec
name = "large guard dog"
desc = "The biggest and goodest guard dog around."
icon_dead = "diredogs-dead"
@@ -124,7 +124,7 @@
icon_state = "diredogs"
icon_rest = "diredogs_rest"
/mob/living/simple_mob/animal/wolf/direwolf/sec
/mob/living/simple_mob/vore/wolf/direwolf/sec
name = "dire guard wolf"
desc = "The biggest and baddest guard wolf around."
icon_dead = "direwolfs-dead"
@@ -132,7 +132,7 @@
icon_state = "direwolfs"
icon_rest = "direwolfs_rest"
/mob/living/simple_mob/animal/wolf/direwolf/rykka
/mob/living/simple_mob/vore/wolf/direwolf/rykka
name = "Rykka"
desc = "This big canine looks like a GSD. It has a collar tagged, 'Bitch'"
tt_desc = "Canidae"
@@ -166,7 +166,7 @@
vore_stomach_name = "Gut"
vore_stomach_flavor = "A black-and-purple veined gut, pulsing warmly around you. Loud gurgles sound around you as the gut squishes inwards and attempts to crush you - Rykka seems intent on digesting you, like the meat you are."
/mob/living/simple_mob/animal/wolf/direwolf/andrews
/mob/living/simple_mob/vore/wolf/direwolf/andrews
name = "andrewsarchus"
desc = "That's one massive mean-looking piece of long extinct megafauna."
tt_desc = "Andrewsarchus mongoliensis"
code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm
-5
View File
@@ -223,11 +223,6 @@
response_disarm = "gently pushes aside"
response_harm = "hits"
/mob/living/simple_mob/hostile/carp/pike
vore_active = 1
// NO VORE SPRITES
/mob/living/simple_mob/animal/space/carp/holographic
vore_icons = 0 // NO VORE SPRITES
vore_digest_chance = 0
code/modules/mob/theme_lists.dm
+10
View File
@@ -0,0 +1,10 @@
//For use with various spawners! Put your selections inside of a list!
/var/global/list/theme_animal = list()
/var/global/list/theme_monster = list()
/var/global/list/theme_alien = list()
/var/global/list/theme_cold = list()
/var/global/list/theme_hot = list()
/var/global/list/theme_aquatic = list()
/var/global/list/theme_dark = list()
/var/global/list/theme_forest = list()
/var/global/list/theme_humanoid = list()
code/modules/rogueminer_vr/controller.dm
+4 -4
View File
@@ -75,17 +75,17 @@ var/datum/controller/rogue/rm_controller
/mob/living/simple_mob/animal/space/bats/roguemines = 1,
/mob/living/simple_mob/animal/space/carp/roguemines = 2,
/mob/living/simple_mob/animal/space/goose/roguemines = 2,
/mob/living/simple_mob/animal/wolf/space/roguemines = 1),
/mob/living/simple_mob/vore/wolf/space/roguemines = 1),
"tier3" = list(
/mob/living/simple_mob/animal/space/carp/roguemines = 1,
/mob/living/simple_mob/animal/space/goose/roguemines = 1,
/mob/living/simple_mob/animal/wolf/space/roguemines = 3,
/mob/living/simple_mob/vore/wolf/space/roguemines = 3,
/mob/living/simple_mob/animal/space/carp/large/roguemines = 2,
/mob/living/simple_mob/animal/space/bear/roguemines = 1),
"tier4" = list(
/mob/living/simple_mob/animal/wolf/space/roguemines = 1,
/mob/living/simple_mob/vore/wolf/space/roguemines = 1,
/mob/living/simple_mob/animal/space/carp/large/roguemines = 4,
/mob/living/simple_mob/animal/space/bear/roguemines = 2),
@@ -199,4 +199,4 @@ var/datum/controller/rogue/rm_controller
var/datum/rogue/zonemaster/ZM_oldest = get_oldest_zone()
if(ZM_oldest) ZM_oldest.clean_zone()
return ZM_target
return ZM_target
code/modules/rogueminer_vr/roguemines_mobs.dm
+2 -2
View File
@@ -7,7 +7,7 @@
/mob/living/simple_mob/animal/space/goose/roguemines
faction = "roguemines"
/mob/living/simple_mob/animal/wolf/space/roguemines
/mob/living/simple_mob/vore/wolf/space/roguemines
faction = "roguemines"
/mob/living/simple_mob/animal/space/carp/large/roguemines
@@ -20,4 +20,4 @@
faction = "roguemines"
/mob/living/simple_mob/animal/space/carp/large/huge/roguemines
faction = "roguemines"
faction = "roguemines"
code/modules/telesci/telesci_computer.dm
+5 -3
View File
@@ -207,12 +207,14 @@
sparks()
if(telepad)
var/L = get_turf(telepad)
var/blocked = list(/mob/living/simple_mob/hostile)
var/list/hostiles = typesof(/mob/living/simple_mob/hostile) - blocked
var/blocked = list(/mob/living/simple_mob/vore)
var/list/hostiles = typesof(/mob/living/simple_mob/vore) - blocked
playsound(L, 'sound/effects/phasein.ogg', 100, 1, extrarange = 3, falloff = 5)
for(var/i in 1 to rand(1,4))
var/chosen = pick(hostiles)
var/mob/living/simple_mob/hostile/H = new chosen
var/mob/living/simple_mob/vore/H = new chosen
if(H.ai_holder)
H.ai_holder.hostile = TRUE
H.forceMove(L)
return
if(99)
code/modules/vore/eating/belly_obj_vr.dm
+2 -2
View File
@@ -461,8 +461,8 @@
if (!(M in contents))
return 0 // They weren't in this belly anyway
if(istype(M, /mob/living/simple_mob/vore/hostile/morph/dominated_prey))
var/mob/living/simple_mob/vore/hostile/morph/dominated_prey/p = M
if(istype(M, /mob/living/simple_mob/vore/morph/dominated_prey))
var/mob/living/simple_mob/vore/morph/dominated_prey/p = M
p.undo_prey_takeover(FALSE)
return 0
for(var/mob/living/L in M.contents)
code/modules/vore/eating/living_vr.dm
+2 -2
View File
@@ -480,8 +480,8 @@
//You're in a belly!
if(isbelly(loc))
//You've been taken over by a morph
if(istype(src, /mob/living/simple_mob/vore/hostile/morph/dominated_prey))
var/mob/living/simple_mob/vore/hostile/morph/dominated_prey/s = src
if(istype(src, /mob/living/simple_mob/vore/morph/dominated_prey))
var/mob/living/simple_mob/vore/morph/dominated_prey/s = src
s.undo_prey_takeover(TRUE)
return
var/obj/belly/B = loc
code/modules/vore/mouseray.dm
+8 -8
View File
@@ -389,18 +389,18 @@
"space bear" = /mob/living/simple_mob/animal/space/bear,
"voracious lizard" = /mob/living/simple_mob/vore/aggressive/dino,
"giant frog" = /mob/living/simple_mob/vore/aggressive/frog,
"jelly blob" = /mob/living/simple_mob/animal/space/jelly,
"wolf" = /mob/living/simple_mob/animal/wolf,
"direwolf" = /mob/living/simple_mob/animal/wolf/direwolf,
"jelly blob" = /mob/living/simple_mob/vore/jelly,
"wolf" = /mob/living/simple_mob/vore/wolf,
"direwolf" = /mob/living/simple_mob/vore/wolf/direwolf,
"great wolf" = /mob/living/simple_mob/vore/greatwolf,
"sect queen" = /mob/living/simple_mob/vore/sect_queen,
"sect drone" = /mob/living/simple_mob/vore/sect_drone,
"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,
"defanged xenomorph" = /mob/living/simple_mob/vore/xeno_defanged,
"catslug" = /mob/living/simple_mob/vore/alienanimals/catslug,
"monkey" = /mob/living/carbon/human/monkey,
@@ -466,11 +466,11 @@
/obj/item/weapon/gun/energy/mouseray/otie
name = "otie ray"
tf_type = /mob/living/simple_mob/otie
tf_type = /mob/living/simple_mob/vore/otie
/obj/item/weapon/gun/energy/mouseray/direwolf
name = "dire wolf ray"
tf_type = /mob/living/simple_mob/animal/wolf/direwolf
tf_type = /mob/living/simple_mob/vore/wolf/direwolf
/obj/item/weapon/gun/energy/mouseray/giantrat
name = "giant rat ray"
code/modules/xenoarcheaology/artifacts/replicator_vr.dm
+3 -3
View File
@@ -19,8 +19,8 @@
/mob/living/simple_mob/vore/rabbit,
/mob/living/simple_mob/animal/goat,
/mob/living/simple_mob/animal/sif/tymisian,
/mob/living/simple_mob/animal/wolf/direwolf,
/mob/living/simple_mob/otie/friendly,
/mob/living/simple_mob/vore/wolf/direwolf,
/mob/living/simple_mob/vore/otie/friendly,
/mob/living/simple_mob/vore/alienanimals/catslug,
/mob/living/simple_mob/vore/fennec,
/mob/living/simple_mob/vore/xeno_defanged,
@@ -594,4 +594,4 @@
update_use_power(USE_POWER_ACTIVE)
icon_state = "borgcharger1(old)"
else
visible_message(fail_message)
visible_message(fail_message)
maps/expedition_vr/aerostat/_aerostat.dm
+1 -1
View File
@@ -139,7 +139,7 @@
prob_fall = 30
//guard = 20
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/space/jelly = 6,
/mob/living/simple_mob/vore/jelly = 6,
/mob/living/simple_mob/mechanical/viscerator = 6,
/mob/living/simple_mob/vore/aggressive/corrupthound = 3,
/mob/living/simple_mob/vore/oregrub = 2,
maps/expedition_vr/aerostat/_aerostat_science_outpost.dm
+1 -1
View File
@@ -72,7 +72,7 @@
prob_fall = 50
//guard = 20
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/space/jelly = 6,
/mob/living/simple_mob/vore/jelly = 6,
/mob/living/simple_mob/mechanical/viscerator = 6,
/mob/living/simple_mob/vore/aggressive/corrupthound = 3,
/mob/living/simple_mob/vore/oregrub = 2,
maps/gateway_archive_vr/snow_outpost.dm
+1 -1
View File
@@ -17,7 +17,7 @@
power_environ = 0
mobcountmax = 100
floracountmax = 7000
valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/animal/wolf, /mob/living/simple_mob/animal/sif/shantak,
valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/vore/wolf, /mob/living/simple_mob/animal/sif/shantak,
/mob/living/simple_mob/animal/sif/kururak, /mob/living/simple_mob/animal/sif/frostfly)
valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,
maps/gateway_archive_vr/snowfield.dm
+2 -2
View File
@@ -20,7 +20,7 @@
valid_mobs = list(/mob/living/simple_mob/animal/sif/sakimm/polar, /mob/living/simple_mob/animal/sif/diyaab/polar,
/mob/living/simple_mob/animal/sif/shantak/polar, /mob/living/simple_mob/animal/space/bear/polar,
/mob/living/simple_mob/animal/wolf)
/mob/living/simple_mob/vore/wolf)
valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,
/obj/structure/flora/grass/both, /obj/structure/flora/bush, /obj/structure/flora/ausbushes/grassybush,
@@ -168,4 +168,4 @@
/obj/effect/floor_decal/derelict/d16
name = "derelict16"
icon_state = "derelict16"
icon_state = "derelict16"
maps/gateway_vr/snow_outpost.dm
+1 -1
View File
@@ -23,7 +23,7 @@
dynamic_lighting = 0
mobcountmax = 50
floracountmax = 300
valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/animal/wolf, /mob/living/simple_mob/animal/sif/shantak,
valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/vore/wolf, /mob/living/simple_mob/animal/sif/shantak,
/mob/living/simple_mob/animal/sif/kururak, /mob/living/simple_mob/animal/sif/frostfly)
valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,
maps/gateway_vr/snowfield.dm
+2 -2
View File
@@ -32,7 +32,7 @@
valid_mobs = list(/mob/living/simple_mob/animal/sif/sakimm/polar, /mob/living/simple_mob/animal/sif/diyaab/polar,
/mob/living/simple_mob/animal/sif/shantak/polar, /mob/living/simple_mob/animal/space/bear/polar,
/mob/living/simple_mob/animal/wolf)
/mob/living/simple_mob/vore/wolf)
valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,
/obj/structure/flora/grass/both, /obj/structure/flora/bush, /obj/structure/flora/ausbushes/grassybush,
@@ -180,4 +180,4 @@
/obj/effect/floor_decal/derelict/d16
name = "derelict16"
icon_state = "derelict16"
icon_state = "derelict16"
maps/gateway_vr/wildwest.dm
+4 -4
View File
@@ -208,8 +208,8 @@
/mob/living/simple_mob/humanoid/merc/melee = 100,
/mob/living/simple_mob/humanoid/merc/ranged = 50,
/mob/living/simple_mob/humanoid/merc/ranged/space = 5,
/mob/living/simple_mob/otie/feral = 10,
/mob/living/simple_mob/otie/feral/chubby = 5
/mob/living/simple_mob/vore/otie/feral = 10,
/mob/living/simple_mob/vore/otie/feral/chubby = 5
),
list(
@@ -224,8 +224,8 @@
list(
/mob/living/simple_mob/humanoid/pirate = 100,
/mob/living/simple_mob/humanoid/pirate/ranged = 50,
/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
)
)
maps/tether/submaps/underdark_pois/underdark_things.dm
+1 -1
View File
@@ -15,7 +15,7 @@
poison_chance = 20
// Adds Phoron Wolf
/mob/living/simple_mob/animal/wolf/phoron
/mob/living/simple_mob/vore/wolf/phoron
faction = "underdark"
movement_cooldown = -1.5
vorestation.dme
+1
View File
@@ -2736,6 +2736,7 @@
#include "code\modules\mob\say.dm"
#include "code\modules\mob\say_vr.dm"
#include "code\modules\mob\skillset.dm"
#include "code\modules\mob\theme_lists.dm"
#include "code\modules\mob\transform_procs.dm"
#include "code\modules\mob\typing_indicator.dm"
#include "code\modules\mob\update_icons.dm"