diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 17fb795809..27e000d0ba 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -728,15 +728,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( @@ -783,7 +783,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, @@ -935,14 +935,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), diff --git a/code/game/objects/effects/semirandom_mobs_vr.dm b/code/game/objects/effects/semirandom_mobs_vr.dm index 343bf77e7f..1143078536 100644 --- a/code/game/objects/effects/semirandom_mobs_vr.dm +++ b/code/game/objects/effects/semirandom_mobs_vr.dm @@ -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, @@ -467,8 +467,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 @@ -502,13 +502,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, @@ -719,17 +719,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, diff --git a/code/game/objects/items/devices/denecrotizer_vr.dm b/code/game/objects/items/devices/denecrotizer_vr.dm index 3b8fb1c761..2416dbe6ed 100644 --- a/code/game/objects/items/devices/denecrotizer_vr.dm +++ b/code/game/objects/items/devices/denecrotizer_vr.dm @@ -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 diff --git a/code/game/objects/items/weapons/capture_crystal.dm b/code/game/objects/items/weapons/capture_crystal.dm index da096cd0f0..3b982d39ae 100644 --- a/code/game/objects/items/weapons/capture_crystal.dm +++ b/code/game/objects/items/weapons/capture_crystal.dm @@ -592,8 +592,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), @@ -608,10 +608,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), @@ -650,8 +650,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 @@ -684,7 +684,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, @@ -785,13 +785,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, diff --git a/code/game/objects/micro_structures.dm b/code/game/objects/micro_structures.dm index f47ced1475..55c0cbe81a 100644 --- a/code/game/objects/micro_structures.dm +++ b/code/game/objects/micro_structures.dm @@ -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 ) diff --git a/code/game/objects/mob_spawner_vr.dm b/code/game/objects/mob_spawner_vr.dm index 3693bf85e2..6feebec885 100644 --- a/code/game/objects/mob_spawner_vr.dm +++ b/code/game/objects/mob_spawner_vr.dm @@ -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 ) diff --git a/code/game/objects/random/mob_vr.dm b/code/game/objects/random/mob_vr.dm index 5eb18d7de0..66c058a68a 100644 --- a/code/game/objects/random/mob_vr.dm +++ b/code/game/objects/random/mob_vr.dm @@ -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) diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 47ec0eedf0..a52a729e0b 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -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, @@ -56,7 +56,11 @@ /mob/living/simple_mob/otie/zorgoia, //CHOMPstation edit /mob/living/simple_mob/vore/rabbit, /mob/living/simple_mob/vore/weretiger;0.5, +<<<<<<< HEAD /mob/living/simple_mob/otie;0.5 +======= +// /mob/living/simple_mob/vore/otie;0.5 +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks )) return ..() @@ -72,9 +76,14 @@ /mob/living/simple_mob/animal/space/alien/drone, /mob/living/simple_mob/animal/space/alien/sentinel, /mob/living/simple_mob/animal/space/alien/queen, +<<<<<<< HEAD /mob/living/simple_mob/otie/feral, /mob/living/simple_mob/otie/feral/chubby, /mob/living/simple_mob/otie/red, +======= +// /mob/living/simple_mob/vore/otie/feral, +// /mob/living/simple_mob/vore/otie/red, +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks /mob/living/simple_mob/vore/aggressive/corrupthound)) return ..() @@ -83,7 +92,7 @@ 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/otie/guardbeast/Initialize() starts_with = list(pick(/mob/living/simple_mob/otie/security, @@ -95,7 +104,7 @@ 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/guardmutant/Initialize() starts_with = list(pick(/mob/living/simple_mob/otie/security/phoron;2, @@ -108,7 +117,7 @@ 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/Initialize() @@ -119,12 +128,17 @@ /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() +<<<<<<< HEAD starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2, /mob/living/simple_mob/otie/red/friendly;0.5, /mob/living/simple_mob/otie/red/chubby;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)) +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks return ..() /obj/structure/largecrate/animal/otie/attack_hand(mob/living/carbon/human/M as mob)//I just couldn't decide between the icons lmao diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index 9d951133eb..32e673a7d2 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -29,11 +29,16 @@ "Lizardman" = /mob/living/simple_mob/vore/aggressive/lizardman,//CHOMPedit: more mobs "Giant Frog" = /mob/living/simple_mob/vore/aggressive/frog, "Giant Rat" = /mob/living/simple_mob/vore/aggressive/rat, +<<<<<<< HEAD "Jelly Blob" = /mob/living/simple_mob/animal/space/jelly, "Wolf" = /mob/living/simple_mob/animal/wolf, "Dire Wolf" = /mob/living/simple_mob/animal/wolf/direwolf,//CHOMPedit: more mobs "Large Dog" = /mob/living/simple_mob/animal/wolf/direwolf/dog,//CHOMPedit: more mobs "Hyena" = /mob/living/simple_mob/animal/hyena,//CHOMPedit: more mobs +======= + "Jelly Blob" = /mob/living/simple_mob/vore/jelly, + "Wolf" = /mob/living/simple_mob/vore/wolf, +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks "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, @@ -41,6 +46,7 @@ "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, +<<<<<<< HEAD "Otie" = /mob/living/simple_mob/otie, "Chubby Otie" = /mob/living/simple_mob/otie/friendly/chubby,//CHOMPedit: more mobs "Mutated Otie" = /mob/living/simple_mob/otie/feral, @@ -48,6 +54,11 @@ "Red Otie" = /mob/living/simple_mob/otie/red, "Chubby Red Otie" = /mob/living/simple_mob/otie/red/chubby,//CHOMPedit: more mobs "Zorgoia" = /mob/living/simple_mob/otie/zorgoia,//CHOMPedit: more mobs +======= + "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, +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks "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, @@ -125,9 +136,13 @@ /obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(var/mob/M) ..() +<<<<<<< HEAD var/mob/living/simple_mob/vore/hostile/morph/newMorph = new /mob/living/simple_mob/vore/hostile/morph(get_turf(src)) newMorph.voremob_loaded = TRUE //CHOMPedit: On-demand belly loading. newMorph.init_vore() //CHOMPedit: On-demand belly loading. +======= + var/mob/living/simple_mob/vore/morph/newMorph = new /mob/living/simple_mob/vore/morph(get_turf(src)) +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks if(M.mind) M.mind.transfer_to(newMorph) to_chat(M, "You are a Morph, somehow having gotten aboard the station in your wandering. \ diff --git a/code/game/turfs/flooring/seasonal.dm b/code/game/turfs/flooring/seasonal.dm index 21ebbccbdc..1ff4695ca6 100644 --- a/code/game/turfs/flooring/seasonal.dm +++ b/code/game/turfs/flooring/seasonal.dm @@ -55,9 +55,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( @@ -97,7 +97,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 ) @@ -123,9 +123,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( @@ -148,13 +148,13 @@ var/world_time_season /mob/living/simple_mob/vore/alienanimals/teppi = 10, /mob/living/simple_mob/vore/alienanimals/teppi/mutant = 1, /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)) diff --git a/code/modules/casino/spawnergrenade_casino.dm b/code/modules/casino/spawnergrenade_casino.dm index 4a3cf8e535..70bf00bf16 100644 --- a/code/modules/casino/spawnergrenade_casino.dm +++ b/code/modules/casino/spawnergrenade_casino.dm @@ -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 \ No newline at end of file + spawner_type = /obj/mecha/working/hoverpod/shuttlepod diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 7dd6269339..14004df83f 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -4784,8 +4784,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 diff --git a/code/modules/mob/living/simple_mob/sd_pets.dm b/code/modules/mob/living/simple_mob/sd_pets.dm index 87a0216b8f..119bb2c23d 100644 --- a/code/modules/mob/living/simple_mob/sd_pets.dm +++ b/code/modules/mob/living/simple_mob/sd_pets.dm @@ -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 \ No newline at end of file + violent_breakthrough = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 95a6eea482..7a22edf533 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -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" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm b/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm index 0715a62d0c..1c364a0a54 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm @@ -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!" @@ -19,8 +19,17 @@ can_be_drop_prey = FALSE //CHOMP Add + 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 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm index 92a8a46306..62c53af4d6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm @@ -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 \ No newline at end of file + base_wander_delay = 9 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm index 9e0130f2aa..78dd49c4ab 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm @@ -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' diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bigclowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bigclowns.dm index 7602016b9e..6232d96d00 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bigclowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bigclowns.dm @@ -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 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm index 8a51b77018..6ecc2b5bb7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm @@ -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 \ No newline at end of file + verbs += /mob/living/simple_mob/clowns/big/c_shift/proc/phase_shift diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/busclowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/busclowns.dm index 21b201bb37..6c0311ec0a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/busclowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/busclowns.dm @@ -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 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm index bf56fd4e0e..a576a3e39e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm @@ -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,"You can't use that here!") @@ -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 ..() \ No newline at end of file + return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm index f92a9a07e6..42d553b8f1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm @@ -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("With a bright flash of light, \the [src] disappears, and in its place you see a... Clown?") log_and_message_admins("successfully touched \a [src] and summoned a mistake!") - ..() \ No newline at end of file + ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm index 00dab095de..66807e24a2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm @@ -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) \ No newline at end of file + flick("he_lay",src) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm index d32af4a5ab..0db552feba 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm @@ -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" @@ -13,7 +13,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 @@ -31,7 +31,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 @@ -43,7 +43,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 @@ -55,7 +55,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 @@ -68,7 +68,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 @@ -86,7 +86,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 @@ -104,7 +104,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 @@ -122,7 +122,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 @@ -140,7 +140,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 @@ -152,7 +152,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 @@ -170,7 +170,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 @@ -188,7 +188,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 @@ -200,7 +200,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 @@ -218,7 +218,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 @@ -236,7 +236,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 @@ -248,7 +248,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 @@ -260,7 +260,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 @@ -278,7 +278,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 @@ -296,7 +296,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 @@ -314,7 +314,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 @@ -332,7 +332,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 @@ -344,7 +344,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 @@ -361,4 +361,4 @@ response_help = "pokes" response_disarm = "gently pushes aside" - response_harm = "hits" \ No newline at end of file + response_harm = "hits" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm index 7308bf7f8c..83f001f04a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm @@ -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, "[target] cannot be impersonated!") @@ -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, "You're already in your normal form!") 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("[src] twists and dissolves into a pile of flesh!") 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, "\The [M] declined your request for control.") else to_chat(src, "\The [M] declined your request for control.") -/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) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm index ba3a14bccd..2ddc698837 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm @@ -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" @@ -57,7 +57,7 @@ // Activate Noms! -/mob/living/simple_mob/otie +/mob/living/simple_mob/vore/otie vore_active = 1 vore_capacity = 1 vore_pounce_chance = 20 @@ -68,7 +68,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 seems to have developed a mutation from an abnormally phoron-rich diet." //CHOMPedit tt_desc = "Otus phoronis" @@ -89,14 +89,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 seems to have developed a mutation from an abnormally phoron-rich diet. What an absolute unit." //CHOMPedit 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" @@ -118,13 +118,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" @@ -133,20 +133,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" @@ -155,14 +155,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" @@ -180,7 +180,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" @@ -198,7 +198,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" @@ -206,7 +206,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" @@ -223,7 +223,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" @@ -233,20 +233,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,"The guard pup accepts your offer for their catch.") release_vore_contents() else if(prob(2)) //Small chance to get prey out from non-sec oties. @@ -255,7 +255,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) @@ -264,12 +264,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") @@ -277,7 +277,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) @@ -314,12 +314,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) @@ -327,7 +327,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 @@ -339,7 +339,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 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm index d0f63a8730..428f68e113 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm @@ -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" @@ -42,7 +42,7 @@ // Activate Noms! -/mob/living/simple_mob/animal/wolf +/mob/living/simple_mob/vore/wolf vore_active = 1 vore_icons = SA_ICON_LIVING @@ -59,7 +59,7 @@ B.belly_fullscreen = "anim_belly" // CHOMPedit - Belly Fullscreen // 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" @@ -83,10 +83,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" @@ -116,7 +116,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) @@ -124,10 +124,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" @@ -136,7 +136,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" @@ -144,7 +144,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" @@ -152,7 +152,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" @@ -186,7 +186,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" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm index 48cb351290..e65025a51f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm @@ -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 diff --git a/code/modules/mob/theme_lists.dm b/code/modules/mob/theme_lists.dm new file mode 100644 index 0000000000..f93277c3c1 --- /dev/null +++ b/code/modules/mob/theme_lists.dm @@ -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() diff --git a/code/modules/rogueminer_vr/controller.dm b/code/modules/rogueminer_vr/controller.dm index efff235f2e..47017c7620 100644 --- a/code/modules/rogueminer_vr/controller.dm +++ b/code/modules/rogueminer_vr/controller.dm @@ -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 \ No newline at end of file + return ZM_target diff --git a/code/modules/rogueminer_vr/roguemines_mobs.dm b/code/modules/rogueminer_vr/roguemines_mobs.dm index a296c6d811..85c581d61e 100644 --- a/code/modules/rogueminer_vr/roguemines_mobs.dm +++ b/code/modules/rogueminer_vr/roguemines_mobs.dm @@ -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" \ No newline at end of file + faction = "roguemines" diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 2ef55c1f03..d58956c110 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -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) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 79fae032e4..238d556dc2 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -700,8 +700,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) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 7a429a2db0..28067cb97d 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -501,8 +501,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 diff --git a/code/modules/vore/mouseray.dm b/code/modules/vore/mouseray.dm index 725deaef9c..ba154ea205 100644 --- a/code/modules/vore/mouseray.dm +++ b/code/modules/vore/mouseray.dm @@ -393,18 +393,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, "teppi" = /mob/living/simple_mob/vore/alienanimals/teppi, @@ -471,11 +471,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" diff --git a/code/modules/xenoarcheaology/artifacts/replicator_vr.dm b/code/modules/xenoarcheaology/artifacts/replicator_vr.dm index 8d5fc2cb0b..31763d9adc 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator_vr.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator_vr.dm @@ -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/alienanimals/teppi, /mob/living/simple_mob/vore/fennec, @@ -595,4 +595,4 @@ update_use_power(USE_POWER_ACTIVE) icon_state = "borgcharger1(old)" else - visible_message(fail_message) \ No newline at end of file + visible_message(fail_message) diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm index fc63ab8678..f83c068782 100644 --- a/maps/expedition_vr/aerostat/_aerostat.dm +++ b/maps/expedition_vr/aerostat/_aerostat.dm @@ -139,9 +139,17 @@ prob_fall = 30 //guard = 20 mobs_to_pick_from = list( +<<<<<<< HEAD /mob/living/simple_mob/animal/space/jelly = 1, /mob/living/simple_mob/mechanical/viscerator = 1, /mob/living/simple_mob/vore/aggressive/corrupthound = 1 +======= + /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, + /mob/living/simple_mob/vore/oregrub/lava = 1 +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks ) /obj/structure/old_roboprinter diff --git a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm index 329f95d0d8..c181fba6a6 100644 --- a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm +++ b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm @@ -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, diff --git a/maps/gateway_archive_vr/snow_outpost.dm b/maps/gateway_archive_vr/snow_outpost.dm index de9d70dfb1..c1e0adc8ae 100644 --- a/maps/gateway_archive_vr/snow_outpost.dm +++ b/maps/gateway_archive_vr/snow_outpost.dm @@ -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, diff --git a/maps/gateway_vr/snow_outpost.dm b/maps/gateway_vr/snow_outpost.dm index 1814683c45..84aae8da2f 100644 --- a/maps/gateway_vr/snow_outpost.dm +++ b/maps/gateway_vr/snow_outpost.dm @@ -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, diff --git a/maps/gateway_vr/snowfield.dm b/maps/gateway_vr/snowfield.dm index 3aed3117ba..8127505ae9 100644 --- a/maps/gateway_vr/snowfield.dm +++ b/maps/gateway_vr/snowfield.dm @@ -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" \ No newline at end of file + icon_state = "derelict16" diff --git a/maps/gateway_vr/wildwest.dm b/maps/gateway_vr/wildwest.dm index 69c3a26f21..eaeef9426e 100644 --- a/maps/gateway_vr/wildwest.dm +++ b/maps/gateway_vr/wildwest.dm @@ -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 ) ) diff --git a/maps/gateway_vr/zoo.dmm b/maps/gateway_vr/zoo.dmm index 19fa7fc4da..688e547acf 100644 --- a/maps/gateway_vr/zoo.dmm +++ b/maps/gateway_vr/zoo.dmm @@ -7806,7 +7806,7 @@ /turf/simulated/floor/wood, /area/awaymission/zoo) "un" = ( -/mob/living/simple_mob/animal/wolf{ +/mob/living/simple_mob/vore/wolf{ faction = "zoo" }, /turf/simulated/floor/holofloor/snow, diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index fd6a33cfea..162ac136ba 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -1010,7 +1010,7 @@ dir = 1; pixel_y = 24 }, -/mob/living/simple_mob/otie/red/chubby/cocoa, +/mob/living/simple_mob/vore/otie/red/chubby/cocoa, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) >>>>>>> 3917d1a8d1... Merge pull request #14701 from KillianKirilenko/kk-misc2 diff --git a/maps/submaps/surface_submaps/plains/emptycabin.dmm b/maps/submaps/surface_submaps/plains/emptycabin.dmm new file mode 100644 index 0000000000..707aaa9bab --- /dev/null +++ b/maps/submaps/surface_submaps/plains/emptycabin.dmm @@ -0,0 +1,328 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/effect/decal/cleanable/filth, +/obj/item/weapon/bone/arm, +/obj/item/weapon/bone/skull/unathi, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"c" = ( +/obj/structure/curtain/black, +/obj/structure/simple_door/sifwood, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"d" = ( +/obj/structure/closet/wardrobe, +/obj/item/weapon/material/fishing_rod/modern, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/weapon/storage/toolbox/lunchbox/nymph/filled, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"e" = ( +/turf/simulated/wall/sifwood, +/area/submap/EmptyCabin) +"f" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"g" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/purpledouble, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"h" = ( +/obj/structure/loot_pile/surface/bones, +/turf/template_noop, +/area/template_noop) +"i" = ( +/obj/structure/bed/chair/sofa/left/blue{ + dir = 1 + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"j" = ( +/obj/effect/decal/cleanable/blood, +/mob/living/simple_mob/vore/otie/friendly/chubby{ + desc = "The classic bioengineered longdog. This one still probably won't tolerate you. What an absolute unit"; + faction = "spiders"; + max_co2 = 0; + max_tox = 0 + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"k" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/bed/chair/sofa/left{ + dir = 8 + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"l" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/bed/chair/sofa{ + dir = 8 + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"n" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/storage/fancy/candle_box, +/obj/item/weapon/paper/crumpled/bloody{ + info = "I found an otie while picking flowers today. He's so cute! I took him back home, and he seemed quite happy to share food with me. He really likes fish. Though, he never really seems to not be hungry..." + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"q" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/template_noop, +/area/submap/EmptyCabin) +"r" = ( +/obj/effect/landmark/loot_spawn/low, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"t" = ( +/obj/structure/railing/grey, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"y" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/curtain/black, +/obj/structure/grille/rustic, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"z" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"A" = ( +/obj/structure/bonfire/permanent/sifwood, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/virgo3b_indoors, +/area/submap/EmptyCabin) +"B" = ( +/turf/template_noop, +/area/submap/EmptyCabin) +"C" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"D" = ( +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"G" = ( +/obj/structure/bed/chair/sofa/blue{ + dir = 1 + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"I" = ( +/obj/structure/table/sifwoodentable, +/obj/item/pizzabox/meat, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"J" = ( +/obj/structure/bed/chair/sofa/right/blue{ + dir = 1 + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"L" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/flame/candle/candelabra, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"M" = ( +/obj/item/weapon/bone/leg, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"O" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/bed/chair/sofa/right{ + dir = 8 + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"Q" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"T" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/template_noop, +/area/submap/EmptyCabin) +"V" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"W" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"X" = ( +/obj/item/weapon/bone, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) +"Z" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/turf/simulated/floor/wood/sif/virgo3b, +/area/submap/EmptyCabin) + +(1,1,1) = {" +a +q +e +O +l +l +k +C +e +a +"} +(2,1,1) = {" +a +B +D +D +D +D +D +D +t +a +"} +(3,1,1) = {" +a +T +f +e +e +c +e +e +t +a +"} +(4,1,1) = {" +a +a +e +e +b +M +D +e +e +a +"} +(5,1,1) = {" +a +a +e +g +j +X +L +i +e +a +"} +(6,1,1) = {" +a +a +y +n +W +D +I +G +e +a +"} +(7,1,1) = {" +a +a +e +d +Z +r +D +J +e +a +"} +(8,1,1) = {" +a +a +e +e +z +V +Q +e +e +a +"} +(9,1,1) = {" +a +a +h +e +e +A +e +e +a +a +"} +(10,1,1) = {" +a +a +a +h +e +e +e +a +a +a +"} diff --git a/maps/submaps/surface_submaps/plains/greatwolfden.dmm b/maps/submaps/surface_submaps/plains/greatwolfden.dmm new file mode 100644 index 0000000000..d8ac2577ee --- /dev/null +++ b/maps/submaps/surface_submaps/plains/greatwolfden.dmm @@ -0,0 +1,1597 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/effect/decal/cleanable/blood/drip, +/mob/living/simple_mob/vore/wolf/direwolf{ + ai_holder_type = /datum/ai_holder/simple_mob/retaliate; + desc = "The biggest and baddest wolf around. Seems pretty chill, for a wolf."; + faction = "sif"; + max_co2 = 0; + max_tox = 0; + min_oxy = 0 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"bp" = ( +/obj/structure/cliff/automatic/corner{ + dir = 6 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"bz" = ( +/obj/structure/flora/bboulder1, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"bI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"bY" = ( +/turf/simulated/floor/outdoors/snow/virgo3b, +/area/submap/GreatWolfDen) +"dM" = ( +/obj/structure/flora/bboulder2, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"dX" = ( +/obj/structure/cliff/automatic{ + dir = 4 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"eq" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow/virgo3b, +/area/submap/GreatWolfDen) +"fh" = ( +/obj/structure/cliff/automatic{ + dir = 2 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"fX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks2, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"ge" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "frostbelle" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"hJ" = ( +/obj/structure/cliff/automatic{ + dir = 9 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"iX" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"jg" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/item/ammo_casing/a10mm{ + dir = 8 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"ju" = ( +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"kg" = ( +/obj/item/weapon/bone/skull/unathi, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"kk" = ( +/obj/effect/decal/cleanable/blood/gibs{ + color = "red"; + icon_state = "gib2_flesh" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"kL" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "grass3" + }, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/submap/GreatWolfDen) +"lu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_casing/a10mm, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"lL" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/landmark/loot_spawn/low, +/obj/random/projectile/scrapped_gun, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"lQ" = ( +/obj/effect/decal/cleanable/filth, +/obj/item/weapon/card/emag_broken, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"mk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/obj/item/ammo_casing/a10mm{ + dir = 8 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"mm" = ( +/obj/random/trash_pile, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"nd" = ( +/obj/structure/flora/rocks2, +/obj/effect/decal/remains/lizard, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"nv" = ( +/mob/living/simple_mob/vore/greatwolf{ + dir = 8; + max_co2 = 0; + min_oxy = 0 + }, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/submap/GreatWolfDen) +"pS" = ( +/turf/template_noop, +/area/template_noop) +"qb" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"rn" = ( +/obj/structure/loot_pile/mecha/gygax/dark/adv, +/obj/effect/decal/cleanable/blood/gibs/robot/down, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"rM" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "eyeplant2" + }, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/submap/GreatWolfDen) +"tb" = ( +/obj/structure/flora/smallbould, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"tm" = ( +/turf/simulated/mineral/ignore_mapgen, +/area/submap/GreatWolfDen) +"tC" = ( +/obj/effect/decal/remains/mouse, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"uz" = ( +/mob/living/simple_mob/vore/wolf/direwolf{ + ai_holder_type = /datum/ai_holder/simple_mob/retaliate; + desc = "The biggest and baddest wolf around. Seems pretty chill, for a wolf."; + faction = "sif"; + max_co2 = 0; + max_tox = 0; + min_oxy = 0 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"uY" = ( +/obj/item/ammo_casing/a10mm, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"vu" = ( +/obj/item/weapon/bone/skull/tajaran, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"wc" = ( +/obj/item/weapon/bone/skull/unathi, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"xt" = ( +/obj/effect/landmark/loot_spawn/low, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"xu" = ( +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"xK" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/under/syndicate, +/obj/random/projectile/scrapped_gun, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"yi" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "frostbelle2" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"yF" = ( +/obj/structure/flora/smallbould, +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"yG" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/virgo3b, +/area/submap/GreatWolfDen) +"yH" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"zl" = ( +/obj/structure/flora/bboulder1, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"zs" = ( +/obj/structure/flora/bboulder2, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"zV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"AG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks2, +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/rocks/virgo3b, +/area/submap/GreatWolfDen) +"AK" = ( +/obj/structure/cliff/automatic/ramp{ + dir = 9 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"BR" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "frostbelle2" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Cd" = ( +/mob/living/simple_mob/vore/otie/feral/chubby{ + ai_holder_type = /datum/ai_holder/simple_mob/retaliate; + desc = "The classic bioengineered longdog. No pets. Only bite. What an absolute unit."; + faction = "sif"; + minbodytemp = 0 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"CR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Dj" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"DV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/outcrop, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"EU" = ( +/obj/structure/flora/rocks1, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Fy" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "eyeplant1" + }, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/submap/GreatWolfDen) +"GZ" = ( +/obj/structure/flora/rocks1, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Hb" = ( +/obj/structure/closet/crate/secure/loot, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"HC" = ( +/obj/random/outcrop, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Ic" = ( +/obj/effect/decal/remains/deer, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Id" = ( +/obj/effect/decal/cleanable/dirt, +/turf/template_noop, +/area/template_noop) +"If" = ( +/obj/effect/decal/cleanable/blood/gibs/robot/limb, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Iw" = ( +/obj/effect/decal/remains/deer, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Kb" = ( +/obj/item/ammo_casing/a10mm{ + dir = 8 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Ko" = ( +/obj/effect/decal/cleanable/blood/gibs{ + color = "red"; + icon_state = "gibdown1_flesh" + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Kp" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/snow/virgo3b, +/area/submap/GreatWolfDen) +"KU" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "grass3" + }, +/turf/simulated/floor/outdoors/snow/virgo3b, +/area/submap/GreatWolfDen) +"Lx" = ( +/obj/structure/cliff/automatic{ + dir = 8 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Lz" = ( +/obj/effect/decal/cleanable/blood/gibs{ + color = "red"; + icon_state = "gib1_flesh" + }, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/submap/GreatWolfDen) +"LJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/sif/subterranean{ + icon_state = "glowplant2" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"LP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks2, +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"LT" = ( +/obj/structure/cliff/automatic/corner{ + dir = 10 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Mc" = ( +/obj/effect/decal/cleanable/ash, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Mv" = ( +/obj/random/outcrop, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"MD" = ( +/obj/structure/flora/tree/sif{ + icon_state = "tree_sif4" + }, +/turf/simulated/floor/outdoors/snow/virgo3b, +/area/submap/GreatWolfDen) +"OB" = ( +/obj/item/stack/material/log{ + amount = 25 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"OL" = ( +/obj/structure/cliff/automatic, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"OV" = ( +/obj/structure/cliff/automatic{ + dir = 6 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"OW" = ( +/obj/structure/cliff/automatic{ + dir = 5 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Pa" = ( +/obj/structure/cliff/automatic/ramp, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Pf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Pl" = ( +/obj/effect/decal/remains/lizard, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"PC" = ( +/obj/structure/closet/crate/secure/loot, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"PX" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Qb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks1, +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Qv" = ( +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"QA" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "grass2" + }, +/turf/simulated/floor/outdoors/snow/virgo3b, +/area/submap/GreatWolfDen) +"QJ" = ( +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"QM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Rb" = ( +/obj/item/weapon/bone/leg, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Rf" = ( +/obj/structure/loot_pile/surface/bones, +/obj/structure/flora/sif/subterranean{ + icon_state = "frostbelle" + }, +/obj/item/weapon/gun/projectile/pistol, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Rj" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/virgo3b, +/area/submap/GreatWolfDen) +"Rx" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"RW" = ( +/obj/structure/flora/rocks2, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"SO" = ( +/obj/item/weapon/telecube/mated, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"SQ" = ( +/obj/structure/cliff/automatic/corner{ + dir = 9 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Tf" = ( +/obj/item/weapon/paper/card/heart{ + desc = "A gift card with a heart on the cover. This appears to be a thank-you to the.. wolves??" + }, +/obj/item/weapon/paper/crumpled{ + icon_state = "scrap_bloodied"; + info = "The wolves dragged me back to their den when they found me incapacitated, and nursed me back to health, instead of eating me. I don't know why. Anyway, they're a bunch of goodboyes. Don't let the bones strewn about their den frighten you. Just be nice to them and they won't hurt you."; + name = "survivor's note" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Tn" = ( +/obj/structure/bonfire, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/submap/GreatWolfDen) +"Ty" = ( +/obj/random/trash_pile, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"UV" = ( +/obj/structure/cliff/automatic{ + dir = 10 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Vq" = ( +/obj/structure/loot_pile/surface/bones, +/obj/random/projectile/scrapped_gun, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"WH" = ( +/obj/structure/loot_pile/surface/bones, +/obj/item/weapon/storage/toolbox/syndicate, +/obj/random/projectile/scrapped_gun, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"WR" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "glowplant1" + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"WY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks1, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Xx" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "grass1" + }, +/turf/simulated/floor/outdoors/snow/virgo3b, +/area/submap/GreatWolfDen) +"Xy" = ( +/obj/item/weapon/bone/ribs, +/obj/effect/landmark/loot_spawn/low, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Yw" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/landmark/loot_spawn/low, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Yy" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Zj" = ( +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/submap/GreatWolfDen) +"Zk" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "glowplant2" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) +"Zu" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/landmark/loot_spawn/low, +/obj/effect/decal/cleanable/dirt, +/obj/random/projectile/scrapped_gun, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/GreatWolfDen) + +(1,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +"} +(2,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Ty +pS +pS +Qv +Qv +Qv +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +"} +(3,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +Qv +HC +Qv +Qv +Qv +Qv +Qv +Qv +Qv +pS +pS +pS +pS +pS +pS +Qv +pS +pS +"} +(4,1,1) = {" +pS +pS +pS +pS +Qv +pS +pS +Qv +Qv +Qv +bp +dX +dX +dX +dX +dX +dX +dX +Dj +Qv +HC +Qv +pS +pS +pS +pS +Qv +Qv +pS +pS +"} +(5,1,1) = {" +pS +pS +pS +pS +pS +pS +Qv +bp +dX +dX +OV +tm +tm +tm +tm +tm +tm +tm +OW +dX +dX +Dj +Qv +Qv +Qv +pS +pS +pS +pS +pS +"} +(6,1,1) = {" +pS +pS +pS +pS +pS +Qv +Qv +fh +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +OW +dX +Dj +Qv +Qv +pS +pS +pS +pS +"} +(7,1,1) = {" +pS +pS +pS +pS +Qv +Qv +bp +OV +tm +tm +tm +tm +jg +BR +Mv +tm +tm +tm +tm +tm +tm +tm +tm +OW +Dj +Qv +pS +pS +pS +pS +"} +(8,1,1) = {" +pS +pS +pS +pS +pS +Qv +fh +tm +tm +tm +yi +CR +xK +uY +xu +Zu +zs +xu +xu +Mv +tm +tm +tm +tm +OW +Dj +Qv +pS +pS +pS +"} +(9,1,1) = {" +pS +pS +pS +pS +pS +Qv +fh +tm +tm +Mc +QJ +qb +lu +mk +uY +xu +xu +kk +xu +xu +xu +tb +tm +tm +tm +OL +Qv +Qv +pS +pS +"} +(10,1,1) = {" +pS +pS +pS +pS +Qv +Qv +fh +tm +tm +mm +Rb +EU +lQ +BR +Kb +QM +Iw +xu +RW +Zk +xu +xu +tm +tm +tm +OL +Qv +Qv +Qv +pS +"} +(11,1,1) = {" +pS +pS +pS +Qv +Qv +Qv +fh +tm +tm +bz +Pl +bI +DV +tm +wc +xu +xu +xu +xu +xu +Cd +xu +kg +tm +tm +OW +Dj +Qv +Qv +pS +"} +(12,1,1) = {" +pS +pS +pS +Qv +HC +Qv +LT +UV +tm +tm +bI +CR +tm +tm +rn +PX +Tn +Zj +Zj +uz +xu +xu +BR +tm +tm +tm +OL +Qv +Qv +pS +"} +(13,1,1) = {" +pS +pS +Id +pS +Qv +Qv +Qv +fh +tm +tm +Tf +Ko +tm +tm +OB +uz +Zj +Xx +rM +Zj +Iw +xu +xu +tm +tm +tm +OL +Qv +Qv +pS +"} +(14,1,1) = {" +pS +pS +pS +pS +Id +Qv +Qv +fh +tm +tm +CR +CR +tm +yF +Yy +Fy +Zj +Rj +Kp +Lz +Zj +xu +uz +Xy +tm +tm +OL +Qv +Qv +Qv +"} +(15,1,1) = {" +pS +Qv +Id +fX +pS +dM +Pa +OV +tm +LJ +Pf +CR +tm +ju +aa +Lz +eq +bY +MD +yG +Zj +xu +If +xu +tm +tm +OL +Qv +HC +Qv +"} +(16,1,1) = {" +Qv +pS +Qv +Id +Rx +zV +LP +Qb +AG +CR +CR +CR +tm +SO +tC +Zj +Zj +bY +QA +Zj +kL +uz +xu +Mv +tm +tm +OL +Qv +Qv +Qv +"} +(17,1,1) = {" +pS +pS +Qv +Rx +WY +Rx +AK +UV +tm +tm +tm +tm +tm +vu +WR +GZ +nv +KU +Rj +Zj +xu +xu +xu +xu +tm +tm +OL +Qv +Qv +pS +"} +(18,1,1) = {" +pS +pS +pS +pS +pS +pS +Qv +LT +UV +tm +tm +tm +zs +xu +xK +Ic +Zj +Zj +bY +Zj +nd +xu +xu +lL +tm +tm +OL +Qv +Qv +pS +"} +(19,1,1) = {" +pS +pS +pS +pS +pS +pS +Qv +Qv +fh +tm +tm +tm +tm +Hb +xu +uz +xu +Zj +Zj +Zj +xu +uz +xt +tm +tm +hJ +SQ +Qv +pS +Qv +"} +(20,1,1) = {" +pS +pS +pS +pS +pS +pS +Qv +Qv +fh +tm +tm +tm +tm +PC +xu +Yy +kk +Ic +uz +xu +Vq +xt +Rf +tm +tm +OL +Qv +Qv +pS +pS +"} +(21,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +Qv +LT +UV +tm +tm +tm +tm +xu +WH +iX +yH +Yy +xu +Vq +Yw +tm +tm +tm +OL +Qv +Qv +Qv +pS +"} +(22,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +Qv +HC +fh +tm +tm +tm +tm +zl +BR +xu +ge +xu +Vq +xt +tm +tm +tm +hJ +SQ +Qv +Ty +Qv +pS +"} +(23,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +Qv +LT +UV +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +hJ +SQ +Qv +Qv +pS +pS +pS +"} +(24,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +LT +Lx +UV +tm +tm +tm +tm +tm +tm +tm +tm +tm +hJ +SQ +Qv +Qv +Qv +pS +pS +pS +"} +(25,1,1) = {" +pS +pS +pS +pS +pS +Qv +pS +pS +pS +Qv +Qv +Qv +LT +Lx +UV +tm +tm +hJ +Lx +Lx +Lx +Lx +SQ +Qv +Qv +pS +pS +pS +pS +pS +"} +(26,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +Qv +Qv +Ty +LT +Lx +Lx +SQ +Qv +Qv +Qv +Qv +Qv +Qv +pS +pS +pS +pS +pS +pS +"} +(27,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +Qv +Qv +Qv +Qv +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +"} +(28,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +HC +Qv +Qv +pS +pS +pS +pS +pS +pS +Qv +Qv +pS +pS +pS +"} +(29,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +pS +pS +pS +pS +pS +pS +"} +(30,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +"} diff --git a/maps/submaps/surface_submaps/plains/leopardmanderden.dmm b/maps/submaps/surface_submaps/plains/leopardmanderden.dmm new file mode 100644 index 0000000000..006b3c6689 --- /dev/null +++ b/maps/submaps/surface_submaps/plains/leopardmanderden.dmm @@ -0,0 +1,1055 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aK" = ( +/obj/item/weapon/ore/silver, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"aT" = ( +/obj/structure/table/bench/sifwooden/padded, +/mob/living/simple_mob/animal/sif/siffet{ + faction = "neutral"; + max_co2 = 0; + max_tox = 0; + min_oxy = 0; + minbodytemp = 0 + }, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"bj" = ( +/obj/item/weapon/bluespace_crystal, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"bO" = ( +/obj/item/stack/material/gold, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"cu" = ( +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"dA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/simple_door/sifwood, +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"eD" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"eF" = ( +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/rocks/virgo3b, +/area/template_noop) +"fe" = ( +/obj/item/weapon/coin/diamond, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"fQ" = ( +/obj/effect/landmark/loot_spawn/low, +/obj/item/weapon/ore/gold, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"gg" = ( +/obj/random/obstruction, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"gC" = ( +/obj/item/weapon/flame/lighter/zippo/gold, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"gD" = ( +/obj/structure/flora/smallbould, +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"gP" = ( +/obj/structure/cliff/automatic, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"gU" = ( +/obj/item/weapon/coin/gold, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"hi" = ( +/obj/structure/sign/warning/falling, +/turf/simulated/wall/gold, +/area/submap/LeopardmanderDen) +"hr" = ( +/obj/structure/flora/rocks1, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"hw" = ( +/obj/structure/cliff/automatic{ + dir = 9 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"iV" = ( +/obj/structure/cliff/automatic/corner{ + dir = 6 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"jb" = ( +/obj/machinery/crystal/ice, +/turf/template_noop, +/area/template_noop) +"jE" = ( +/obj/structure/cliff/automatic{ + dir = 8 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"ki" = ( +/obj/structure/table/bench/sifwooden/padded, +/obj/item/clothing/head/pin/flower/violet, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"kx" = ( +/obj/item/stack/material/gold, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"kO" = ( +/obj/structure/cliff/automatic{ + dir = 6 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"lb" = ( +/obj/structure/cliff/automatic{ + dir = 10 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"ll" = ( +/obj/structure/cliff/automatic/corner{ + dir = 10 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"mi" = ( +/obj/structure/cliff/automatic/ramp{ + dir = 9 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"mu" = ( +/obj/structure/flora/rocks2, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"mW" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"nG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"nR" = ( +/mob/living/simple_mob/animal/sif/sakimm, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"oD" = ( +/obj/fiftyspawner/silver, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"pQ" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"qa" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"qg" = ( +/obj/structure/bed/chair/sofa/right{ + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"rn" = ( +/turf/template_noop, +/area/template_noop) +"ro" = ( +/obj/structure/flora/lily3, +/turf/simulated/floor/water/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"rD" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"rG" = ( +/obj/structure/flora/pottedplant/flower, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"sl" = ( +/obj/machinery/crystal/ice, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"sN" = ( +/mob/living/simple_mob/vore/otie/red/chubby{ + desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. What an absolute unit. It has a collar around one of its ankles that reads 'Tawny'."; + name = "Tawny" + }, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"sY" = ( +/mob/living/simple_mob/animal/sif/sakimm{ + faction = "neutral"; + max_co2 = 0; + max_tox = 0; + min_oxy = 0; + minbodytemp = 0 + }, +/turf/template_noop, +/area/template_noop) +"tC" = ( +/obj/item/weapon/ore/diamond, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"tP" = ( +/mob/living/simple_mob/animal/sif/sakimm{ + faction = "neutral"; + max_co2 = 0; + max_tox = 0; + min_oxy = 0; + minbodytemp = 0 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"uw" = ( +/obj/structure/ledge/ledge_stairs{ + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/virgo3b, +/area/template_noop) +"uz" = ( +/obj/structure/cliff/automatic{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"xf" = ( +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"xg" = ( +/obj/item/weapon/ore/silver, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"xL" = ( +/obj/random/outcrop, +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"yl" = ( +/turf/simulated/wall/golddiamond, +/area/submap/LeopardmanderDen) +"zJ" = ( +/mob/living/simple_mob/animal/sif/siffet{ + faction = "neutral"; + max_co2 = 0; + max_tox = 0; + min_oxy = 0; + minbodytemp = 0 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"zW" = ( +/obj/structure/cliff/automatic/corner{ + dir = 9 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Ah" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"AF" = ( +/turf/simulated/floor/water/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"AP" = ( +/obj/structure/bed/chair/sofa/right{ + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"BE" = ( +/obj/item/stack/material/diamond, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"DI" = ( +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"DJ" = ( +/obj/structure/flora/log1, +/turf/simulated/floor/water/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Ez" = ( +/obj/structure/flora/bboulder2, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"EH" = ( +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Gl" = ( +/obj/structure/cliff/automatic{ + dir = 9 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Gw" = ( +/obj/item/weapon/ore/gold, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Hx" = ( +/obj/structure/sign/warning/falling, +/turf/simulated/wall/sifwood, +/area/template_noop) +"HV" = ( +/obj/structure/bed/chair/sofa/left{ + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Ih" = ( +/obj/random/obstruction, +/turf/template_noop, +/area/template_noop) +"IQ" = ( +/turf/simulated/mineral/ignore_mapgen, +/area/submap/LeopardmanderDen) +"Jk" = ( +/turf/simulated/floor/outdoors/rocks/virgo3b, +/area/template_noop) +"Kd" = ( +/obj/structure/cliff/automatic, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Kv" = ( +/obj/random/outcrop, +/turf/template_noop, +/area/template_noop) +"KT" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/tree/bigtree, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Lb" = ( +/obj/structure/cliff/automatic{ + dir = 5 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Ls" = ( +/obj/structure/cliff/automatic{ + dir = 2 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"MQ" = ( +/obj/machinery/crystal/ice, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"NS" = ( +/obj/structure/cliff/automatic{ + dir = 10 + }, +/obj/structure/railing/grey, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Pc" = ( +/obj/item/stack/material/diamond, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"PO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks2, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Qa" = ( +/obj/machinery/crystal/ice, +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"QQ" = ( +/obj/item/stack/material/gold, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"RA" = ( +/obj/fiftyspawner/gold, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Sk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks1, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Sm" = ( +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"SM" = ( +/obj/structure/flora/log2, +/turf/simulated/floor/water/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Te" = ( +/obj/item/weapon/coin/silver, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Tj" = ( +/mob/living/simple_mob/animal/sif/tymisian{ + faction = "neutral"; + max_co2 = 0; + max_tox = 0; + min_oxy = 0; + minbodytemp = 0 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Tt" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/item/weapon/coin/iron, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"TF" = ( +/obj/structure/bed/chair/sofa/left{ + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Uc" = ( +/obj/item/weapon/ore/diamond, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Ul" = ( +/obj/item/weapon/ore/gold, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"UA" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/item/weapon/coin/gold, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Vi" = ( +/obj/structure/flora/lily2, +/turf/simulated/floor/water/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"VM" = ( +/turf/simulated/wall/gold, +/area/submap/LeopardmanderDen) +"VV" = ( +/obj/structure/flora/lily1, +/turf/simulated/floor/water/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"WB" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/rocks/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Xt" = ( +/mob/living/simple_mob/vore/leopardmander{ + max_co2 = 0; + min_oxy = 0 + }, +/turf/simulated/floor/outdoors/grass/sif/forest/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"XR" = ( +/obj/effect/map_effect/interval/effect_emitter/steam, +/turf/simulated/floor/water/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Yq" = ( +/obj/structure/cliff/automatic{ + dir = 4 + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"YJ" = ( +/obj/item/weapon/ore/diamond, +/turf/simulated/floor/outdoors/grass/sif/forest{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) +"Zj" = ( +/mob/living/simple_mob/animal/sif/tymisian{ + faction = "neutral" + }, +/turf/simulated/floor/outdoors/grass/sif/virgo3b{ + outdoors = 0 + }, +/area/submap/LeopardmanderDen) + +(1,1,1) = {" +rn +Ih +iV +Yq +Yq +Yq +Yq +Yq +Yq +Yq +pQ +Sm +Sm +Sm +Sm +rn +rn +rn +rn +rn +"} +(2,1,1) = {" +rn +iV +kO +IQ +IQ +IQ +IQ +IQ +IQ +IQ +Lb +Yq +Yq +Yq +pQ +Sm +sY +rn +Sm +rn +"} +(3,1,1) = {" +iV +kO +IQ +IQ +Qa +yl +IQ +IQ +IQ +IQ +IQ +IQ +IQ +IQ +Lb +Yq +pQ +Sm +Ih +rn +"} +(4,1,1) = {" +Ls +IQ +IQ +cu +xf +bj +Pc +xf +IQ +cu +IQ +IQ +IQ +IQ +IQ +IQ +Lb +pQ +Sm +rn +"} +(5,1,1) = {" +Ls +IQ +IQ +xL +BE +DI +PO +DI +kx +gU +DI +Uc +xL +cu +IQ +IQ +IQ +Lb +Yq +pQ +"} +(6,1,1) = {" +Ls +IQ +IQ +xf +fe +Xt +AF +Vi +YJ +AF +Ah +xg +Zj +Qa +cu +IQ +IQ +IQ +IQ +gP +"} +(7,1,1) = {" +Ls +IQ +IQ +RA +DI +AF +SM +AF +AF +ro +AF +nR +DI +Pc +xL +IQ +IQ +IQ +IQ +gP +"} +(8,1,1) = {" +Ls +IQ +cu +xf +mu +AF +AF +AF +UA +XR +AF +DJ +hr +tC +Uc +IQ +Qa +IQ +IQ +gP +"} +(9,1,1) = {" +Ls +IQ +IQ +IQ +QQ +AF +AF +rD +KT +Tt +AF +AF +AF +fQ +xf +IQ +HV +AP +IQ +gP +"} +(10,1,1) = {" +Ls +IQ +IQ +cu +gC +nG +AF +XR +Ez +VV +AF +AF +ki +Gw +bO +cu +cu +cu +IQ +gP +"} +(11,1,1) = {" +Ls +IQ +IQ +cu +xL +DI +DI +AF +AF +AF +AF +AF +aT +Ul +qa +VM +qg +TF +IQ +gP +"} +(12,1,1) = {" +ll +lb +IQ +IQ +VM +Qa +sN +aK +Te +DJ +Ah +rG +Sk +qa +oD +IQ +IQ +IQ +IQ +gP +"} +(13,1,1) = {" +rn +ll +lb +IQ +IQ +IQ +IQ +Qa +DI +hr +DI +xf +xf +xL +cu +IQ +IQ +IQ +IQ +gP +"} +(14,1,1) = {" +rn +gg +Ls +IQ +IQ +IQ +IQ +IQ +IQ +IQ +xf +cu +cu +Qa +cu +IQ +IQ +IQ +Gl +zW +"} +(15,1,1) = {" +rn +Sm +ll +jE +lb +IQ +IQ +IQ +IQ +IQ +gD +cu +WB +IQ +IQ +IQ +IQ +Gl +zW +rn +"} +(16,1,1) = {" +rn +Sm +gg +Sm +ll +lb +IQ +IQ +IQ +IQ +IQ +hi +dA +VM +IQ +Gl +jE +zW +rn +Kv +"} +(17,1,1) = {" +rn +rn +Sm +rn +Sm +ll +jE +jE +jE +jE +jE +NS +uw +hw +jE +zW +Sm +jb +zJ +rn +"} +(18,1,1) = {" +rn +Sm +Sm +Sm +Tj +Sm +Sm +Hx +Sm +sl +eD +mW +uw +Kd +tP +rn +Tj +rn +rn +rn +"} +(19,1,1) = {" +rn +rn +Sm +rn +Sm +tP +Sm +zJ +Sm +EH +eF +eF +Jk +Kd +Sm +Ih +rn +rn +rn +rn +"} +(20,1,1) = {" +rn +rn +rn +rn +rn +Sm +Sm +Sm +Sm +MQ +mi +uz +uz +zW +rn +rn +rn +rn +rn +rn +"} diff --git a/maps/submaps/surface_submaps/plains/otieshelter.dmm b/maps/submaps/surface_submaps/plains/otieshelter.dmm new file mode 100644 index 0000000000..137930b5f8 --- /dev/null +++ b/maps/submaps/surface_submaps/plains/otieshelter.dmm @@ -0,0 +1,1095 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ag" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"aj" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating/external/virgo3b, +/area/submap/OtieShelter) +"ar" = ( +/obj/structure/closet/secure_closet/medical_wall/anesthetics, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"cq" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"cU" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"eI" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"fw" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"gr" = ( +/obj/machinery/porta_turret/poi, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating/external/virgo3b, +/area/submap/OtieShelter) +"gN" = ( +/obj/structure/undies_wardrobe, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"hh" = ( +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"hk" = ( +/obj/structure/grille/rustic, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"hD" = ( +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"iv" = ( +/obj/structure/table/glass, +/obj/item/weapon/storage/firstaid/surgery, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"iC" = ( +/obj/effect/decal/cleanable/blood, +/mob/living/simple_mob/vore/otie/friendly{ + health = 0 + }, +/turf/template_noop, +/area/template_noop) +"iY" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/item/trash/bowl, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"jc" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"jo" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"jy" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"jI" = ( +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/blood/tracks{ + color = "red"; + desc = "Your instincts say you shouldn't be following these."; + dir = 4; + icon = 'icons/effects/blood.dmi'; + icon_state = "tracks" + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"kF" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/dogbed, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"kX" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"lv" = ( +/obj/structure/door_assembly, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"lP" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"lQ" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"lY" = ( +/obj/machinery/light, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"mu" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/mob/living/simple_mob/vore/otie/friendly/chubby, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"mC" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -28 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"mJ" = ( +/obj/structure/sign/warning/secure_area, +/turf/simulated/wall/r_wall, +/area/submap/OtieShelter) +"nK" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"nR" = ( +/obj/structure/table/marble, +/obj/item/weapon/newspaper, +/obj/item/weapon/paper/card/heart, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"ob" = ( +/obj/structure/grille/rustic, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"od" = ( +/obj/machinery/door/window, +/obj/item/weapon/bone, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"op" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/turf/simulated/floor/plating/external/virgo3b, +/area/submap/OtieShelter) +"pa" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/filth, +/obj/effect/decal/cleanable/filth, +/obj/random/handgun/sec, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"pd" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"rb" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating/external/virgo3b, +/area/submap/OtieShelter) +"sJ" = ( +/obj/structure/grille/rustic, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"tt" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/mob/living/simple_mob/vore/otie/cotie, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"tz" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"tP" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"uw" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/dogbed, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"uD" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"uS" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"vA" = ( +/obj/item/weapon/bone, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"vB" = ( +/obj/machinery/door/window{ + dir = 8 + }, +/obj/item/weapon/bone, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"vV" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"wg" = ( +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"wO" = ( +/obj/structure/dogbed, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"xf" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/reagent_dispensers, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"xj" = ( +/obj/structure/table/marble, +/obj/item/modular_computer/laptop/preset/custom_loadout/cheap, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"xI" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/mob/living/simple_mob/vore/otie/friendly, +/obj/structure/dogbed, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"yD" = ( +/obj/structure/table/glass, +/obj/item/weapon/storage/firstaid/adv, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Aa" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/mob/living/simple_mob/vore/otie/cotie/phoron, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"At" = ( +/obj/structure/table/marble, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"AO" = ( +/obj/structure/table/glass, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"AQ" = ( +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"BM" = ( +/obj/item/weapon/melee/baton/cattleprod, +/obj/effect/decal/cleanable/blood/tracks{ + color = "red"; + desc = "Your instincts say you shouldn't be following these."; + dir = 4; + icon = 'icons/effects/blood.dmi'; + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/filth, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Cw" = ( +/obj/structure/table/glass, +/obj/item/weapon/storage/firstaid, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"CM" = ( +/obj/structure/closet/wardrobe, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"EE" = ( +/obj/machinery/door/airlock/engineering, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"EI" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Hk" = ( +/obj/machinery/door/window, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"HV" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Ih" = ( +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Ij" = ( +/mob/living/simple_mob/vore/otie/cotie{ + max_co2 = 0; + max_tox = 0 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"IF" = ( +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"JY" = ( +/turf/simulated/floor/plating/external/virgo3b, +/area/submap/OtieShelter) +"KJ" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/closet/secure_closet/freezer/meat, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Lr" = ( +/obj/structure/door_assembly, +/turf/simulated/floor/plating/external/virgo3b, +/area/submap/OtieShelter) +"LF" = ( +/obj/structure/ghost_pod/manual/lost_drone/dogborg, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Mc" = ( +/obj/structure/fireaxecabinet{ + pixel_y = 29 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Mg" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Mn" = ( +/mob/living/simple_mob/vore/otie/red/chubby, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Mz" = ( +/turf/simulated/wall/r_wall, +/area/submap/OtieShelter) +"MK" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"Nd" = ( +/obj/structure/table/marble, +/obj/structure/table/marble, +/obj/item/device/radio/phone, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"Nh" = ( +/obj/item/weapon/bedsheet/browndouble, +/obj/structure/bed/double/padded, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"Np" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/item/trash/bowl, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"NJ" = ( +/obj/machinery/door/window{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Of" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"OJ" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/obj/effect/decal/cleanable/blood/tracks/paw{ + icon_state = "paw1" + }, +/obj/item/ammo_casing/spent, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Pn" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Px" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"Qr" = ( +/turf/template_noop, +/area/template_noop) +"Ro" = ( +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"RW" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "PAPC"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"Sn" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"SD" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"TP" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"UF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"UH" = ( +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"VE" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/obj/effect/decal/cleanable/blood/tracks/paw{ + icon_state = "paw1" + }, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"VL" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/carpet/turcarpet/virgo3b, +/area/submap/OtieShelter) +"VY" = ( +/mob/living/simple_mob/vore/otie/cotie/chubby, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Wl" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/windoor_assembly, +/obj/structure/windoor_assembly{ + dir = 2 + }, +/turf/simulated/floor/virgo3b_indoors, +/area/submap/OtieShelter) +"WY" = ( +/obj/machinery/oxygen_pump/mobile/anesthetic, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"XB" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/virgo3b, +/area/submap/OtieShelter) +"XG" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/mob/living/simple_mob/vore/otie/red/friendly, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) + +(1,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +"} +(2,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +"} +(3,1,1) = {" +Qr +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Qr +Qr +Qr +"} +(4,1,1) = {" +Qr +Mz +wO +Of +kF +Of +kF +Of +xI +Of +kF +Of +Mz +Nh +MK +gN +Mz +Qr +Qr +Qr +"} +(5,1,1) = {" +Qr +Mz +IF +VY +tt +IF +Aa +Ih +lQ +IF +lQ +IF +Mz +vV +Ro +Ro +Mz +Qr +Qr +Qr +"} +(6,1,1) = {" +Qr +Mz +hh +Hk +tP +Hk +Np +od +Np +Hk +mu +Hk +Mz +CM +Ro +Ro +Mz +gr +Qr +Qr +"} +(7,1,1) = {" +Qr +Mz +ar +Px +Px +Px +Px +Px +Px +Px +Px +Px +Mz +Mz +fw +Mz +mJ +rb +Lr +Qr +"} +(8,1,1) = {" +Qr +Mz +jo +AQ +AQ +AQ +AQ +AQ +AQ +AQ +AQ +AQ +fw +mC +nK +ag +AQ +aj +op +iC +"} +(9,1,1) = {" +Qr +Mz +Mc +AQ +AQ +AO +Cw +yD +AO +AQ +AQ +uD +Mz +Mz +lv +Mz +mJ +rb +JY +Qr +"} +(10,1,1) = {" +Qr +Mz +HV +WY +jc +AO +iv +AO +AO +vA +hD +AQ +sJ +Sn +tz +wg +Mz +gr +Qr +Qr +"} +(11,1,1) = {" +Qr +Mz +jo +AQ +AQ +AQ +AQ +AQ +hD +pa +OJ +AQ +ob +jy +Nd +nR +Mz +Qr +Qr +Qr +"} +(12,1,1) = {" +Qr +Mz +LF +UF +UF +UF +UF +UF +UF +BM +kX +EI +hk +wg +xj +cq +Mz +Qr +Qr +Qr +"} +(13,1,1) = {" +Qr +Mz +UH +NJ +Pn +vB +Pn +NJ +Mg +jI +xf +lY +Mz +VL +At +wg +Mz +Qr +Qr +Qr +"} +(14,1,1) = {" +Qr +Mz +IF +Ij +XG +IF +lQ +Mn +iY +lP +XB +pd +Wl +VE +wg +wg +Mz +Qr +Qr +Qr +"} +(15,1,1) = {" +Qr +Mz +wO +uS +kF +uS +kF +uS +uw +SD +KJ +AQ +Mz +wg +wg +wg +Mz +Qr +Qr +Qr +"} +(16,1,1) = {" +Qr +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +EE +Mz +Mz +Mz +Mz +Mz +Qr +Qr +Qr +"} +(17,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Mz +RW +cU +Mz +Qr +Qr +Qr +Qr +Qr +Qr +"} +(18,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Mz +TP +eI +Mz +Qr +Qr +Qr +Qr +Qr +Qr +"} +(19,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Mz +Mz +Mz +Mz +Qr +Qr +Qr +Qr +Qr +Qr +"} +(20,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +"} diff --git a/maps/submaps/surface_submaps/wilderness/dogbase.dmm b/maps/submaps/surface_submaps/wilderness/dogbase.dmm index 697c7da787..b837c26ce4 100644 --- a/maps/submaps/surface_submaps/wilderness/dogbase.dmm +++ b/maps/submaps/surface_submaps/wilderness/dogbase.dmm @@ -1,3 +1,4 @@ +<<<<<<< HEAD //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( /obj/machinery/light{ @@ -1886,3 +1887,1868 @@ hp hp hp "} +======= +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ab" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/corner/red/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"ae" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"ay" = ( +/obj/structure/dogbed, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/tajaran, +/obj/random/maintenance/medical, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"aF" = ( +/obj/structure/sign/securearea, +/turf/simulated/wall/r_wall, +/area/submap/DogBase) +"aX" = ( +/obj/structure/dogbed, +/obj/effect/decal/remains/tajaran, +/obj/effect/decal/cleanable/filth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/bone, +/obj/random/maintenance/security, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"bl" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor, +/area/submap/DogBase) +"bw" = ( +/obj/item/weapon/storage/belt/janitor, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"bx" = ( +/obj/machinery/porta_turret/poi{ + faction = "syndicate" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"bT" = ( +/obj/structure/safe, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"cS" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"ec" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"eA" = ( +/obj/machinery/vending/cola, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"eI" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"eZ" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"fg" = ( +/obj/structure/closet/l3closet/janitor, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"fI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/cargo, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"hl" = ( +/obj/effect/floor_decal/borderfloor/corner, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"hp" = ( +/turf/template_noop, +/area/template_noop) +"hA" = ( +/obj/structure/table/woodentable, +/obj/item/stolenpackage, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"hZ" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"ik" = ( +/obj/random/mob/merc/all, +/turf/template_noop, +/area/template_noop) +"iv" = ( +/obj/structure/dogbed, +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/filth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/bone/ribs, +/obj/random/maintenance/research, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"jz" = ( +/obj/machinery/vending/cigarette, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"jD" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"jO" = ( +/obj/structure/dogbed, +/obj/effect/decal/remains/unathi, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/security, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"kl" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/cargo, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"km" = ( +/obj/effect/decal/remains/human, +/turf/template_noop, +/area/template_noop) +"lb" = ( +/obj/random/mob/merc/all, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"lg" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"lh" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"lk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"lm" = ( +/obj/structure/table/woodentable, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"lr" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor, +/area/submap/DogBase) +"lN" = ( +/obj/machinery/porta_turret/poi{ + faction = "syndicate" + }, +/turf/simulated/floor, +/area/submap/DogBase) +"lX" = ( +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"ng" = ( +/mob/living/bot/cleanbot{ + faction = "malf_drone" + }, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"np" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/gun/projectile/pistol, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"oW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"pR" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"qg" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"qk" = ( +/obj/machinery/porta_turret/poi{ + faction = "syndicate" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"qI" = ( +/obj/structure/dogbed, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/bone, +/obj/random/maintenance/security, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"qO" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"qZ" = ( +/obj/effect/decal/remains/ribcage, +/turf/template_noop, +/area/template_noop) +"re" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"rH" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"se" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"tp" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/submap/DogBase) +"tt" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/green, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"tz" = ( +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"tN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"vq" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"vX" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"wI" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"wQ" = ( +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"wS" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/turf/template_noop, +/area/template_noop) +"xc" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"xe" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/random/projectile/scrapped_smg, +/obj/random/projectile/scrapped_smg, +/obj/random/projectile/scrapped_smg, +/obj/random/projectile/scrapped_shotgun, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"xp" = ( +/obj/structure/dogbed, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/human, +/obj/random/contraband/nofail, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"yl" = ( +/obj/structure/dogbed, +/obj/effect/decal/remains/deer, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/contraband/nofail, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"yx" = ( +/obj/machinery/door/airlock/external, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"yX" = ( +/obj/item/modular_computer/laptop/preset/custom_loadout/cheap, +/obj/structure/table/woodentable, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Am" = ( +/obj/machinery/door/blast/gate/thin, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"AJ" = ( +/obj/machinery/door/airlock/engineering, +/turf/simulated/floor/tiled, +/area/submap/DogBase) +"AY" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/random/projectile, +/obj/random/projectile, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Bk" = ( +/turf/simulated/wall/r_wall, +/area/submap/DogBase) +"Bx" = ( +/obj/structure/table/woodentable, +/obj/random/projectile/scrapped_pistol, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"BA" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"BB" = ( +/obj/structure/table/woodentable, +/obj/random/cash/big, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"BY" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Ce" = ( +/obj/structure/janitorialcart, +/obj/item/weapon/storage/bag/trash, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Cz" = ( +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"CQ" = ( +/obj/structure/dogbed, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/bone, +/obj/random/contraband/nofail, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"Dt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/landmark/loot_spawn, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Dv" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Ez" = ( +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/template_noop, +/area/template_noop) +"Fm" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled, +/area/submap/DogBase) +"FD" = ( +/obj/structure/fence, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"FO" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Ge" = ( +/obj/structure/table/woodentable, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/random/cash/huge, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Gf" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/filth, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/cargo, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"GB" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"GJ" = ( +/obj/structure/closet/secure_closet/guncabinet, +/obj/random/projectile, +/obj/random/projectile, +/obj/effect/landmark/loot_spawn, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Hl" = ( +/turf/simulated/floor, +/area/submap/DogBase) +"HF" = ( +/obj/random/mob/merc/all, +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"HM" = ( +/obj/structure/table/woodentable, +/obj/random/contraband/nofail, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Iz" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Jm" = ( +/obj/structure/dogbed, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/research, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"Ki" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"Kt" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/light{ + dir = 4 + }, +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"Le" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"Lm" = ( +/obj/effect/landmark/loot_spawn, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"LJ" = ( +/obj/effect/decal/remains/tajaran, +/turf/template_noop, +/area/template_noop) +"LP" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Ng" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/vending/security, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Ni" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Ok" = ( +/obj/structure/table/woodentable, +/obj/item/device/radio/phone, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Ol" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/bone/leg, +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"OR" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor, +/area/submap/DogBase) +"OS" = ( +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Pi" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"PB" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"PJ" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/obj/structure/table/rack/shelf/steel, +/obj/item/stack/material/phoron{ + amount = 10 + }, +/obj/item/stack/material/phoron{ + amount = 10; + pixel_x = 1; + pixel_y = 6 + }, +/turf/simulated/floor/plating, +/area/submap/DogBase) +"Qp" = ( +/obj/effect/decal/cleanable/dirt, +/turf/template_noop, +/area/template_noop) +"Qu" = ( +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"QB" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Rz" = ( +/obj/structure/table/woodentable, +/obj/item/device/radio/phone, +/obj/random/contraband/nofail, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"RW" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"SW" = ( +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"To" = ( +/obj/structure/fence/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"UW" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"UY" = ( +/obj/structure/dogbed, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/security, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"Vm" = ( +/obj/structure/loot_pile/maint/technical, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Vy" = ( +/obj/effect/decal/remains/unathi, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"VG" = ( +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Wm" = ( +/obj/structure/table/woodentable, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/random/curseditem, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Wq" = ( +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Wu" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"WH" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"WU" = ( +/obj/structure/table/woodentable, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/random/cash/huge, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Xz" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Ya" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Yi" = ( +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/corner/purple/diagonal, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"Yr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/submap/DogBase) +"YJ" = ( +/obj/random/mob/merc/all, +/turf/simulated/floor, +/area/submap/DogBase) +"YX" = ( +/obj/structure/dogbed, +/obj/effect/decal/remains/deer, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/medical, +/turf/simulated/floor/outdoors/dirt, +/area/submap/DogBase) +"ZK" = ( +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "Unknown APC"; + pixel_x = -24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/mob/living/simple_mob/mechanical/viscerator/mercenary, +/turf/simulated/floor/plating, +/area/submap/DogBase) + +(1,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +hp +km +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +km +hp +"} +(2,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +"} +(3,1,1) = {" +hp +km +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +Ez +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +"} +(4,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +lN +Hl +hp +hp +hp +Hl +lN +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +"} +(5,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +Hl +Bk +Bk +Bk +Bk +Bk +FD +FD +FD +FD +FD +To +Qp +hp +hp +hp +hp +Xz +hp +hp +km +hp +hp +"} +(6,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +hp +Bk +fg +ng +Vm +Bk +iv +yl +YX +qI +jO +GB +Qp +LJ +hp +hp +Xz +Xz +Ez +hp +SW +hp +hp +"} +(7,1,1) = {" +hp +hp +hp +hp +hp +ik +wS +hp +Bk +Yi +Qu +Vm +Bk +UY +Gf +Ol +Vy +fI +Am +oW +oW +oW +oW +oW +hp +SW +hp +hp +hp +hp +"} +(8,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +hp +Bk +lg +Qu +bw +Bk +aX +lk +ae +kl +lk +Am +oW +oW +QB +oW +hp +hp +hp +hp +SW +hp +hp +"} +(9,1,1) = {" +hp +hp +lN +Hl +hp +hp +hp +hp +Bk +eI +Qu +Ce +Bk +Jm +xp +ay +CQ +YX +GB +LJ +hp +hp +Qp +Qp +tp +lN +hp +hp +hp +hp +"} +(10,1,1) = {" +hp +hp +Hl +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Fm +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Hl +hp +km +hp +hp +"} +(11,1,1) = {" +hp +hp +hp +Bk +pR +RW +Wu +vq +Bk +Ng +wQ +FO +Bk +Dt +tN +tN +Dv +RW +vq +Bk +Pi +tN +qk +vq +Bk +Hl +Hl +hp +hp +hp +"} +(12,1,1) = {" +km +hp +Ez +Bk +Ge +Wq +Bx +lX +Bk +GJ +lb +OS +Bk +Yr +VG +HM +wI +Wq +lX +Bk +eZ +Wq +Wq +lX +Bk +lr +Hl +hp +hp +SW +"} +(13,1,1) = {" +hp +Ez +hp +Bk +qO +Wq +BA +lX +Bk +AY +Wq +OS +Bk +Yr +HF +Rz +wI +Wq +Ni +RW +PB +hl +se +jz +Bk +OR +Hl +SW +SW +hp +"} +(14,1,1) = {" +hp +Hl +Hl +Bk +hA +Wq +Iz +lX +Bk +xe +Wq +OS +Bk +rH +VG +HM +wI +Wq +hl +se +WH +BY +Bk +Bk +aF +bl +Hl +SW +hp +hp +"} +(15,1,1) = {" +hp +lN +Hl +Bk +qO +lb +BA +lX +LP +Cz +Wq +OS +LP +Yr +VG +Ok +wI +re +lX +Bk +Yr +lX +yx +Wq +yx +lr +YJ +SW +SW +SW +"} +(16,1,1) = {" +hp +Hl +Hl +Bk +hA +Wq +BB +lX +Bk +Wm +Wq +OS +Bk +rH +VG +np +wI +Wq +Ni +tN +PB +BY +Bk +Bk +aF +bl +Hl +SW +SW +hp +"} +(17,1,1) = {" +hp +Ez +hp +Bk +qO +Wq +BA +lX +Bk +yX +wI +OS +Bk +Yr +VG +HM +wI +lb +hl +jD +WH +Ni +tN +eA +Bk +OR +Hl +SW +SW +hp +"} +(18,1,1) = {" +hp +hp +Ez +Bk +lm +Wq +Iz +lX +Bk +WU +lb +OS +Bk +Yr +VG +HM +wI +Wq +lX +Bk +Yr +Wq +Wq +lX +Bk +lr +Hl +hp +SW +hp +"} +(19,1,1) = {" +km +hp +hp +Bk +bT +jD +se +UW +Bk +ab +tz +qg +Bk +Lm +se +se +se +jD +Ya +Bk +ec +se +bx +UW +Bk +Hl +Hl +hp +hp +hp +"} +(20,1,1) = {" +hp +hp +Hl +Bk +Bk +Bk +Bk +Bk +Bk +Bk +AJ +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Bk +Hl +hp +hp +hp +hp +"} +(21,1,1) = {" +hp +hp +lN +Hl +hp +hp +hp +hp +Bk +ZK +Le +Ki +Bk +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +Hl +lN +hp +hp +hp +km +"} +(22,1,1) = {" +hp +hp +hp +hp +hp +hp +Ez +hp +Bk +PJ +xc +vX +Bk +hp +hp +hp +hp +hp +hp +hp +hp +wS +hp +hp +hp +hp +hp +hp +hp +hp +"} +(23,1,1) = {" +hp +hp +hp +hp +hp +hp +wS +hp +Bk +lh +cS +lh +Bk +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +Ez +hp +hp +hp +hp +"} +(24,1,1) = {" +hp +hp +hp +hp +hp +ik +hp +hp +Bk +hZ +Kt +tt +Bk +hp +hp +km +hp +hp +km +hp +hp +hp +km +hp +hp +hp +hp +hp +km +hp +"} +(25,1,1) = {" +hp +hp +km +hp +hp +hp +hp +Hl +Bk +Bk +Bk +Bk +Bk +Hl +hp +hp +hp +Ez +hp +hp +qZ +hp +hp +hp +hp +hp +hp +hp +hp +hp +"} +(26,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +lN +Hl +hp +hp +hp +Hl +lN +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +"} +(27,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +Ez +hp +hp +hp +km +hp +hp +km +hp +hp +"} +(28,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +km +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +"} +(29,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +km +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +"} +(30,1,1) = {" +hp +hp +hp +hp +hp +hp +hp +hp +km +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +hp +"} +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks diff --git a/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm b/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm index 84bb92f974..597de56f49 100644 --- a/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm +++ b/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm @@ -5,10 +5,20 @@ }, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) +<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm "aB" = ( /obj/structure/safe, /obj/effect/floor_decal/borderfloor{ dir = 5 +======= +"ae" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm }, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) @@ -86,8 +96,14 @@ }, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) +<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm "ec" = ( /mob/living/simple_mob/animal/giant_spider/nurse{ +======= +"eZ" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm faction = "syndicate"; name = "trained giant spider" }, @@ -244,8 +260,23 @@ /obj/item/weapon/bedsheet, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) +<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm "md" = ( /obj/machinery/door/airlock, +======= +"qZ" = ( +/obj/effect/decal/remains/ribcage, +/turf/template_noop, +/area/template_noop) +"re" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "mF" = ( @@ -307,9 +338,32 @@ /obj/effect/landmark/loot_spawn, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) +<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm "pT" = ( /obj/machinery/light{ dir = 1 +======= +"wS" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/turf/template_noop, +/area/template_noop) +"xc" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -428,9 +482,19 @@ }, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) +<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm "yr" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 +======= +"Dv" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm }, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) @@ -575,9 +639,40 @@ /obj/random/projectile/scrapped_pistol, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) +<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm "Io" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloor, +======= +"Ol" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/bone/leg, +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/submap/DogBase) +"OR" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/plating/external/virgo3b, +/area/submap/DogBase) +"OS" = ( +/obj/effect/floor_decal/corner/red/border, +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm /turf/simulated/floor/tiled/dark, /area/submap/DogBase) "Ju" = ( @@ -612,7 +707,23 @@ }, /turf/simulated/floor/tiled/dark, /area/submap/DogBase) +<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm "KH" = ( +======= +"QB" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Rz" = ( +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm /obj/structure/table/woodentable, /obj/random/contraband/nofail, /turf/simulated/floor/tiled/dark, @@ -709,6 +820,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +<<<<<<< HEAD:maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/submap/DogBase) "QF" = ( @@ -716,6 +828,17 @@ dir = 4; icon_state = "tube1"; pixel_x = 0 +======= +/turf/simulated/floor/outdoors/dirt/virgo3b, +/area/template_noop) +"Ya" = ( +/mob/living/simple_mob/vore/wolf/direwolf/dog/sec{ + desc = "The biggest and baddest guard dog around."; + faction = "syndicate"; + max_co2 = 0; + max_tox = 0; + name = "syndicate guard dog" +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks:maps/submaps/surface_submaps/plains/dogbase.dmm }, /obj/effect/floor_decal/borderfloor{ dir = 4 diff --git a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm index 9008166129..71f9cb72b4 100644 --- a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm +++ b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm @@ -117,7 +117,7 @@ /turf/simulated/floor/wood/sif, /area/submap/EmptyCabin) "F" = ( -/mob/living/simple_mob/otie/friendly/chubby{ +/mob/living/simple_mob/vore/otie/friendly/chubby{ desc = "The classic bioengineered longdog. This one still probably won't tolerate you. What an absolute unit"; faction = "spiders" }, diff --git a/maps/submaps/surface_submaps/wilderness/greatwolfden.dmm b/maps/submaps/surface_submaps/wilderness/greatwolfden.dmm index a029394e8b..2d2d5adb87 100644 --- a/maps/submaps/surface_submaps/wilderness/greatwolfden.dmm +++ b/maps/submaps/surface_submaps/wilderness/greatwolfden.dmm @@ -1,3 +1,4 @@ +<<<<<<< HEAD //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( /obj/effect/decal/cleanable/blood/drip, @@ -1553,3 +1554,1569 @@ pS pS pS "} +======= +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/effect/decal/cleanable/blood/drip, +/mob/living/simple_mob/vore/wolf/direwolf{ + ai_holder_type = /datum/ai_holder/simple_mob/retaliate; + desc = "The biggest and baddest wolf around. Seems pretty chill, for a wolf."; + faction = "sif"; + max_co2 = 0; + max_tox = 0; + min_oxy = 0 + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"bp" = ( +/obj/structure/cliff/automatic/corner{ + dir = 6 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"bz" = ( +/obj/structure/flora/bboulder1, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"bI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"bY" = ( +/turf/simulated/floor/outdoors/snow, +/area/submap/GreatWolfDen) +"dM" = ( +/obj/structure/flora/bboulder2, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"dX" = ( +/obj/structure/cliff/automatic{ + dir = 4 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"eq" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow, +/area/submap/GreatWolfDen) +"fh" = ( +/obj/structure/cliff/automatic{ + dir = 2 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"fX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks2, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"ge" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "frostbelle" + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"hJ" = ( +/obj/structure/cliff/automatic{ + dir = 9 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"iX" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"jg" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/item/ammo_casing/a10mm{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"ju" = ( +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"kg" = ( +/obj/item/weapon/bone/skull/unathi, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"kk" = ( +/obj/effect/decal/cleanable/blood/gibs{ + color = "red"; + icon_state = "gib2_flesh" + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"kL" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "grass3" + }, +/turf/simulated/floor/outdoors/grass/sif/forest{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"lu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_casing/a10mm, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"lL" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/landmark/loot_spawn/low, +/obj/random/projectile/scrapped_gun, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"lQ" = ( +/obj/effect/decal/cleanable/filth, +/obj/item/weapon/card/emag_broken, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"mk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/obj/item/ammo_casing/a10mm{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"mm" = ( +/obj/random/trash_pile, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"nd" = ( +/obj/structure/flora/rocks2, +/obj/effect/decal/remains/lizard, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"nv" = ( +/mob/living/simple_mob/vore/greatwolf{ + dir = 8; + max_co2 = 0; + min_oxy = 0 + }, +/turf/simulated/floor/outdoors/grass/sif/forest{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"pS" = ( +/turf/template_noop, +/area/template_noop) +"qb" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"rn" = ( +/obj/structure/loot_pile/mecha/gygax/dark/adv, +/obj/effect/decal/cleanable/blood/gibs/robot/down, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"rM" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "eyeplant2" + }, +/turf/simulated/floor/outdoors/grass/sif/forest{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"tb" = ( +/obj/structure/flora/smallbould, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"tm" = ( +/turf/simulated/mineral/ignore_mapgen, +/area/submap/GreatWolfDen) +"tC" = ( +/obj/effect/decal/remains/mouse, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"uz" = ( +/mob/living/simple_mob/vore/wolf/direwolf{ + ai_holder_type = /datum/ai_holder/simple_mob/retaliate; + desc = "The biggest and baddest wolf around. Seems pretty chill, for a wolf."; + faction = "sif"; + max_co2 = 0; + max_tox = 0; + min_oxy = 0 + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"uY" = ( +/obj/item/ammo_casing/a10mm, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"vu" = ( +/obj/item/weapon/bone/skull/tajaran, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"wc" = ( +/obj/item/weapon/bone/skull/unathi, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"xt" = ( +/obj/effect/landmark/loot_spawn/low, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"xK" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/under/syndicate, +/obj/random/projectile/scrapped_gun, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"yi" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "frostbelle2" + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"yF" = ( +/obj/structure/flora/smallbould, +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"yG" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow, +/area/submap/GreatWolfDen) +"yH" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"zl" = ( +/obj/structure/flora/bboulder1, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"zs" = ( +/obj/structure/flora/bboulder2, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"zV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"AG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks2, +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/rocks, +/area/submap/GreatWolfDen) +"AK" = ( +/obj/structure/cliff/automatic/ramp{ + dir = 9 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Cd" = ( +/mob/living/simple_mob/vore/otie/feral/chubby{ + ai_holder_type = /datum/ai_holder/simple_mob/retaliate; + desc = "The classic bioengineered longdog. No pets. Only bite. What an absolute unit."; + faction = "sif"; + minbodytemp = 0 + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"CR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Dj" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"DV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/outcrop, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"EU" = ( +/obj/structure/flora/rocks1, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Fy" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "eyeplant1" + }, +/turf/simulated/floor/outdoors/grass/sif/forest{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Hb" = ( +/obj/structure/closet/crate/secure/loot, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"HC" = ( +/obj/random/outcrop, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Ic" = ( +/obj/effect/decal/remains/deer, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Id" = ( +/obj/effect/decal/cleanable/dirt, +/turf/template_noop, +/area/template_noop) +"If" = ( +/obj/effect/decal/cleanable/blood/gibs/robot/limb, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Iw" = ( +/obj/effect/decal/remains/deer, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Kb" = ( +/obj/item/ammo_casing/a10mm{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Ko" = ( +/obj/effect/decal/cleanable/blood/gibs{ + color = "red"; + icon_state = "gibdown1_flesh" + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Kp" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/snow, +/area/submap/GreatWolfDen) +"KU" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "grass3" + }, +/turf/simulated/floor/outdoors/snow, +/area/submap/GreatWolfDen) +"Lx" = ( +/obj/structure/cliff/automatic{ + dir = 8 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Lz" = ( +/obj/effect/decal/cleanable/blood/gibs{ + color = "red"; + icon_state = "gib1_flesh" + }, +/turf/simulated/floor/outdoors/grass/sif/forest{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"LJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/sif/subterranean{ + icon_state = "glowplant2" + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"LP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks2, +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"LT" = ( +/obj/structure/cliff/automatic/corner{ + dir = 10 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Mc" = ( +/obj/effect/decal/cleanable/ash, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Mv" = ( +/obj/random/outcrop, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"MD" = ( +/obj/structure/flora/tree/sif{ + icon_state = "tree_sif4" + }, +/turf/simulated/floor/outdoors/snow, +/area/submap/GreatWolfDen) +"OB" = ( +/obj/item/stack/material/log{ + amount = 25 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"OL" = ( +/obj/structure/cliff/automatic, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"OV" = ( +/obj/structure/cliff/automatic{ + dir = 6 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"OW" = ( +/obj/structure/cliff/automatic{ + dir = 5 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Pa" = ( +/obj/structure/cliff/automatic/ramp, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Pf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Pl" = ( +/obj/effect/decal/remains/lizard, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"PC" = ( +/obj/structure/closet/crate/secure/loot, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"PX" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Qb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks1, +/obj/structure/ledge/ledge_stairs, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Qv" = ( +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"QA" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "grass2" + }, +/turf/simulated/floor/outdoors/snow, +/area/submap/GreatWolfDen) +"QJ" = ( +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"QM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Rb" = ( +/obj/item/weapon/bone/leg, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Rf" = ( +/obj/structure/loot_pile/surface/bones, +/obj/structure/flora/sif/subterranean{ + icon_state = "frostbelle" + }, +/obj/item/weapon/gun/projectile/pistol, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Rj" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow, +/area/submap/GreatWolfDen) +"Rx" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"RW" = ( +/obj/structure/flora/rocks2, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"SO" = ( +/obj/item/weapon/telecube/mated, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"SQ" = ( +/obj/structure/cliff/automatic/corner{ + dir = 9 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Tf" = ( +/obj/item/weapon/paper/card/heart{ + desc = "A gift card with a heart on the cover. This appears to be a thank-you to the.. wolves??" + }, +/obj/item/weapon/paper/crumpled{ + icon_state = "scrap_bloodied"; + info = "The wolves dragged me back to their den when they found me incapacitated, and nursed me back to health, instead of eating me. I don't know why. Anyway, they're a bunch of goodboyes. Don't let the bones strewn about their den frighten you. Just be nice to them and they won't hurt you."; + name = "survivor's note" + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Tn" = ( +/obj/structure/bonfire, +/turf/simulated/floor/outdoors/grass/sif/forest{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Ty" = ( +/obj/random/trash_pile, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"UV" = ( +/obj/structure/cliff/automatic{ + dir = 10 + }, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Vq" = ( +/obj/structure/loot_pile/surface/bones, +/obj/random/projectile/scrapped_gun, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"WH" = ( +/obj/structure/loot_pile/surface/bones, +/obj/item/weapon/storage/toolbox/syndicate, +/obj/random/projectile/scrapped_gun, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"WR" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "glowplant1" + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"WY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/rocks1, +/turf/simulated/floor/outdoors/dirt, +/area/template_noop) +"Xx" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "grass1" + }, +/turf/simulated/floor/outdoors/snow, +/area/submap/GreatWolfDen) +"Xy" = ( +/obj/item/weapon/bone/ribs, +/obj/effect/landmark/loot_spawn/low, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Yw" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/landmark/loot_spawn/low, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Zj" = ( +/turf/simulated/floor/outdoors/grass/sif/forest{ + outdoors = 0 + }, +/area/submap/GreatWolfDen) +"Zk" = ( +/obj/structure/flora/sif/subterranean{ + icon_state = "glowplant2" + }, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) +"Zu" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/landmark/loot_spawn/low, +/obj/effect/decal/cleanable/dirt, +/obj/random/projectile/scrapped_gun, +/turf/simulated/mineral/floor/ignore_mapgen, +/area/submap/GreatWolfDen) + +(1,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +"} +(2,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Ty +pS +pS +Qv +Qv +Qv +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +"} +(3,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +Qv +HC +Qv +Qv +Qv +Qv +Qv +Qv +Qv +pS +pS +pS +pS +pS +pS +Qv +pS +pS +"} +(4,1,1) = {" +pS +pS +pS +pS +Qv +pS +pS +Qv +Qv +Qv +bp +dX +dX +dX +dX +dX +dX +dX +Dj +Qv +HC +Qv +pS +pS +pS +pS +Qv +Qv +pS +pS +"} +(5,1,1) = {" +pS +pS +pS +pS +pS +pS +Qv +bp +dX +dX +OV +tm +tm +tm +tm +tm +tm +tm +OW +dX +dX +Dj +Qv +Qv +Qv +pS +pS +pS +pS +pS +"} +(6,1,1) = {" +pS +pS +pS +pS +pS +Qv +Qv +fh +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +OW +dX +Dj +Qv +Qv +pS +pS +pS +pS +"} +(7,1,1) = {" +pS +pS +pS +pS +Qv +Qv +bp +OV +tm +tm +tm +tm +jg +yi +Mv +tm +tm +tm +tm +tm +tm +tm +tm +OW +Dj +Qv +pS +pS +pS +pS +"} +(8,1,1) = {" +pS +pS +pS +pS +pS +Qv +fh +tm +tm +tm +yi +CR +xK +uY +QJ +Zu +zs +QJ +QJ +Mv +tm +tm +tm +tm +OW +Dj +Qv +pS +pS +pS +"} +(9,1,1) = {" +pS +pS +pS +pS +pS +Qv +fh +tm +tm +Mc +QJ +qb +lu +mk +uY +QJ +QJ +kk +QJ +QJ +QJ +tb +tm +tm +tm +OL +Qv +Qv +pS +pS +"} +(10,1,1) = {" +pS +pS +pS +pS +Qv +Qv +fh +tm +tm +mm +Rb +EU +lQ +yi +Kb +QM +Iw +QJ +RW +Zk +QJ +QJ +tm +tm +tm +OL +Qv +Qv +Qv +pS +"} +(11,1,1) = {" +pS +pS +pS +Qv +Qv +Qv +fh +tm +tm +bz +Pl +bI +DV +tm +wc +QJ +QJ +QJ +QJ +QJ +Cd +QJ +kg +tm +tm +OW +Dj +Qv +Qv +pS +"} +(12,1,1) = {" +pS +pS +pS +Qv +HC +Qv +LT +UV +tm +tm +bI +CR +tm +tm +rn +PX +Tn +Zj +Zj +uz +QJ +QJ +yi +tm +tm +tm +OL +Qv +Qv +pS +"} +(13,1,1) = {" +pS +pS +Id +pS +Qv +Qv +Qv +fh +tm +tm +Tf +Ko +tm +tm +OB +uz +Zj +Xx +rM +Zj +Iw +QJ +QJ +tm +tm +tm +OL +Qv +Qv +pS +"} +(14,1,1) = {" +pS +pS +pS +pS +Id +Qv +Qv +fh +tm +tm +CR +CR +tm +yF +qb +Fy +Zj +Rj +Kp +Lz +Zj +QJ +uz +Xy +tm +tm +OL +Qv +Qv +Qv +"} +(15,1,1) = {" +pS +Qv +Id +fX +pS +dM +Pa +OV +tm +LJ +Pf +CR +tm +ju +aa +Lz +eq +bY +MD +yG +Zj +QJ +If +QJ +tm +tm +OL +Qv +HC +Qv +"} +(16,1,1) = {" +Qv +pS +Qv +Id +Rx +zV +LP +Qb +AG +CR +CR +CR +tm +SO +tC +Zj +Zj +bY +QA +Zj +kL +uz +QJ +Mv +tm +tm +OL +Qv +Qv +Qv +"} +(17,1,1) = {" +pS +pS +Qv +Rx +WY +Rx +AK +UV +tm +tm +tm +tm +tm +vu +WR +EU +nv +KU +Rj +Zj +QJ +QJ +QJ +QJ +tm +tm +OL +Qv +Qv +pS +"} +(18,1,1) = {" +pS +pS +pS +pS +pS +pS +Qv +LT +UV +tm +tm +tm +zs +QJ +xK +Ic +Zj +Zj +bY +Zj +nd +QJ +QJ +lL +tm +tm +OL +Qv +Qv +pS +"} +(19,1,1) = {" +pS +pS +pS +pS +pS +pS +Qv +Qv +fh +tm +tm +tm +tm +Hb +QJ +uz +QJ +Zj +Zj +Zj +QJ +uz +xt +tm +tm +hJ +SQ +Qv +pS +Qv +"} +(20,1,1) = {" +pS +pS +pS +pS +pS +pS +Qv +Qv +fh +tm +tm +tm +tm +PC +QJ +qb +kk +Ic +uz +QJ +Vq +xt +Rf +tm +tm +OL +Qv +Qv +pS +pS +"} +(21,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +Qv +LT +UV +tm +tm +tm +tm +QJ +WH +iX +yH +qb +QJ +Vq +Yw +tm +tm +tm +OL +Qv +Qv +Qv +pS +"} +(22,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +Qv +HC +fh +tm +tm +tm +tm +zl +yi +QJ +ge +QJ +Vq +xt +tm +tm +tm +hJ +SQ +Qv +Ty +Qv +pS +"} +(23,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +Qv +LT +UV +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +hJ +SQ +Qv +Qv +pS +pS +pS +"} +(24,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +LT +Lx +UV +tm +tm +tm +tm +tm +tm +tm +tm +tm +hJ +SQ +Qv +Qv +Qv +pS +pS +pS +"} +(25,1,1) = {" +pS +pS +pS +pS +pS +Qv +pS +pS +pS +Qv +Qv +Qv +LT +Lx +UV +tm +tm +hJ +Lx +Lx +Lx +Lx +SQ +Qv +Qv +pS +pS +pS +pS +pS +"} +(26,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +Qv +Qv +Ty +LT +Lx +Lx +SQ +Qv +Qv +Qv +Qv +Qv +Qv +pS +pS +pS +pS +pS +pS +"} +(27,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +Qv +Qv +Qv +Qv +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +"} +(28,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +Qv +HC +Qv +Qv +pS +pS +pS +pS +pS +pS +Qv +Qv +pS +pS +pS +"} +(29,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +Qv +pS +pS +pS +pS +pS +pS +"} +(30,1,1) = {" +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +pS +"} +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks diff --git a/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm b/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm index 305a26567d..f0fd28901d 100644 --- a/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm +++ b/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm @@ -242,7 +242,7 @@ /turf/simulated/floor/outdoors/dirt, /area/template_noop) "sN" = ( -/mob/living/simple_mob/otie/red/chubby{ +/mob/living/simple_mob/vore/otie/red/chubby{ desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. What an absolute unit. It has a collar around one of its ankles that reads 'Tawny'."; name = "Tawny" }, diff --git a/maps/submaps/surface_submaps/wilderness/otieshelter.dmm b/maps/submaps/surface_submaps/wilderness/otieshelter.dmm index be1981d224..5bbdc2cedc 100644 --- a/maps/submaps/surface_submaps/wilderness/otieshelter.dmm +++ b/maps/submaps/surface_submaps/wilderness/otieshelter.dmm @@ -1,3 +1,4 @@ +<<<<<<< HEAD //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ag" = ( /obj/machinery/light{ @@ -1067,3 +1068,1075 @@ Qr Qr Qr "} +======= +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ag" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"aj" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"ar" = ( +/obj/structure/closet/secure_closet/medical_wall/anesthetics, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"cq" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"cU" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"eI" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"fw" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"gr" = ( +/obj/machinery/porta_turret/poi, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"gN" = ( +/obj/structure/undies_wardrobe, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"hh" = ( +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"hk" = ( +/obj/structure/grille/rustic, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"hD" = ( +/obj/effect/decal/cleanable/filth, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"iv" = ( +/obj/structure/table/glass, +/obj/item/weapon/storage/firstaid/surgery, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"iC" = ( +/obj/effect/decal/cleanable/blood, +/mob/living/simple_mob/vore/otie/friendly{ + health = 0 + }, +/turf/template_noop, +/area/template_noop) +"iY" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/item/trash/bowl, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"jc" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"jo" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"jy" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"jI" = ( +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/blood/tracks{ + color = "red"; + desc = "Your instincts say you shouldn't be following these."; + dir = 4; + icon = 'icons/effects/blood.dmi'; + icon_state = "tracks" + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"kF" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/dogbed, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"kX" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"lv" = ( +/obj/structure/door_assembly, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"lP" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"lQ" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"lY" = ( +/obj/machinery/light, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"mu" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/mob/living/simple_mob/vore/otie/friendly/chubby, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"mC" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -28 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"mJ" = ( +/obj/structure/sign/warning/secure_area, +/turf/simulated/wall/r_wall, +/area/submap/OtieShelter) +"nK" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"nR" = ( +/obj/structure/table/marble, +/obj/item/weapon/newspaper, +/obj/item/weapon/paper/card/heart, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"ob" = ( +/obj/structure/grille/rustic, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"od" = ( +/obj/machinery/door/window, +/obj/item/weapon/bone, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"op" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"pa" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/filth, +/obj/effect/decal/cleanable/filth, +/obj/random/handgun/sec, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"pd" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"rb" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"sJ" = ( +/obj/structure/grille/rustic, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"tt" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/mob/living/simple_mob/vore/otie/cotie, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"tz" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"tP" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"uD" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"uS" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"vA" = ( +/obj/item/weapon/bone, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"vB" = ( +/obj/machinery/door/window{ + dir = 8 + }, +/obj/item/weapon/bone, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"vV" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"wO" = ( +/obj/structure/dogbed, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"xf" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/reagent_dispensers, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"xj" = ( +/obj/structure/table/marble, +/obj/item/modular_computer/laptop/preset/custom_loadout/cheap, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"xI" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/mob/living/simple_mob/vore/otie/friendly, +/obj/structure/dogbed, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"yD" = ( +/obj/structure/table/glass, +/obj/item/weapon/storage/firstaid/adv, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Aa" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/mob/living/simple_mob/vore/otie/cotie/phoron, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"At" = ( +/obj/structure/table/marble, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"AO" = ( +/obj/structure/table/glass, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"BM" = ( +/obj/item/weapon/melee/baton/cattleprod, +/obj/effect/decal/cleanable/blood/tracks{ + color = "red"; + desc = "Your instincts say you shouldn't be following these."; + dir = 4; + icon = 'icons/effects/blood.dmi'; + icon_state = "tracks" + }, +/obj/effect/decal/cleanable/filth, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Cw" = ( +/obj/structure/table/glass, +/obj/item/weapon/storage/firstaid, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"CM" = ( +/obj/structure/closet/wardrobe, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"EE" = ( +/obj/machinery/door/airlock/engineering, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"EI" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Hk" = ( +/obj/machinery/door/window, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"HV" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Ih" = ( +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Ij" = ( +/mob/living/simple_mob/vore/otie/cotie{ + max_co2 = 0; + max_tox = 0 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"IF" = ( +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"JY" = ( +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"KJ" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/closet/secure_closet/freezer/meat, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Lr" = ( +/obj/structure/door_assembly, +/turf/simulated/floor/plating, +/area/submap/OtieShelter) +"LF" = ( +/obj/structure/ghost_pod/manual/lost_drone/dogborg, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Mc" = ( +/obj/structure/fireaxecabinet{ + pixel_y = 29 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Mg" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Mn" = ( +/mob/living/simple_mob/vore/otie/red/chubby, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Mz" = ( +/turf/simulated/wall/r_wall, +/area/submap/OtieShelter) +"MK" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"Nd" = ( +/obj/structure/table/marble, +/obj/structure/table/marble, +/obj/item/device/radio/phone, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"Nh" = ( +/obj/item/weapon/bedsheet/browndouble, +/obj/structure/bed/double/padded, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"Np" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/item/trash/bowl, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"NJ" = ( +/obj/machinery/door/window{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Of" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"OJ" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/obj/effect/decal/cleanable/blood/tracks/paw{ + icon_state = "paw1" + }, +/obj/item/ammo_casing/spent, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Pn" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Px" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Qr" = ( +/turf/template_noop, +/area/template_noop) +"Ro" = ( +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"RW" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "PAPC"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"TP" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"UF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"UH" = ( +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/item/trash/bowl, +/obj/item/weapon/reagent_containers/food/snacks/meat/human, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"VE" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/obj/effect/decal/cleanable/blood/tracks/paw{ + icon_state = "paw1" + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"VL" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/OtieShelter) +"VY" = ( +/mob/living/simple_mob/vore/otie/cotie/chubby, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"Wl" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/windoor_assembly, +/obj/structure/windoor_assembly{ + dir = 2 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/OtieShelter) +"WY" = ( +/obj/machinery/oxygen_pump/mobile/anesthetic, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"XB" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) +"XG" = ( +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/mob/living/simple_mob/vore/otie/red/friendly, +/turf/simulated/floor/tiled, +/area/submap/OtieShelter) + +(1,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +"} +(2,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +"} +(3,1,1) = {" +Qr +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Qr +Qr +Qr +"} +(4,1,1) = {" +Qr +Mz +wO +Of +kF +Of +kF +Of +xI +Of +kF +Of +Mz +Nh +MK +gN +Mz +Qr +Qr +Qr +"} +(5,1,1) = {" +Qr +Mz +IF +VY +tt +IF +Aa +Ih +lQ +IF +lQ +IF +Mz +vV +Ro +Ro +Mz +Qr +Qr +Qr +"} +(6,1,1) = {" +Qr +Mz +hh +Hk +tP +Hk +Np +od +Np +Hk +mu +Hk +Mz +CM +Ro +Ro +Mz +gr +Qr +Qr +"} +(7,1,1) = {" +Qr +Mz +ar +Px +Px +Px +Px +Px +Px +Px +Px +Px +Mz +Mz +fw +Mz +mJ +rb +Lr +Qr +"} +(8,1,1) = {" +Qr +Mz +jo +IF +IF +IF +IF +IF +IF +IF +IF +IF +fw +mC +nK +ag +IF +aj +op +iC +"} +(9,1,1) = {" +Qr +Mz +Mc +IF +IF +AO +Cw +yD +AO +IF +IF +uD +Mz +Mz +lv +Mz +mJ +rb +JY +Qr +"} +(10,1,1) = {" +Qr +Mz +HV +WY +jc +AO +iv +AO +AO +vA +hD +IF +sJ +MK +tz +Ro +Mz +gr +Qr +Qr +"} +(11,1,1) = {" +Qr +Mz +jo +IF +IF +IF +IF +IF +hD +pa +OJ +IF +ob +jy +Nd +nR +Mz +Qr +Qr +Qr +"} +(12,1,1) = {" +Qr +Mz +LF +UF +UF +UF +UF +UF +UF +BM +kX +EI +hk +Ro +xj +cq +Mz +Qr +Qr +Qr +"} +(13,1,1) = {" +Qr +Mz +UH +NJ +Pn +vB +Pn +NJ +Mg +jI +xf +lY +Mz +VL +At +Ro +Mz +Qr +Qr +Qr +"} +(14,1,1) = {" +Qr +Mz +IF +Ij +XG +IF +lQ +Mn +iY +lP +XB +pd +Wl +VE +Ro +Ro +Mz +Qr +Qr +Qr +"} +(15,1,1) = {" +Qr +Mz +wO +uS +kF +uS +kF +uS +kF +uS +KJ +IF +Mz +Ro +Ro +Ro +Mz +Qr +Qr +Qr +"} +(16,1,1) = {" +Qr +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +Mz +EE +Mz +Mz +Mz +Mz +Mz +Qr +Qr +Qr +"} +(17,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Mz +RW +cU +Mz +Qr +Qr +Qr +Qr +Qr +Qr +"} +(18,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Mz +TP +eI +Mz +Qr +Qr +Qr +Qr +Qr +Qr +"} +(19,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Mz +Mz +Mz +Mz +Qr +Qr +Qr +Qr +Qr +Qr +"} +(20,1,1) = {" +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +Qr +"} +>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks diff --git a/maps/tether/submaps/underdark_pois/rykka_easter_egg.dmm b/maps/tether/submaps/underdark_pois/rykka_easter_egg.dmm index 65b4b5135c..dfe8845755 100644 --- a/maps/tether/submaps/underdark_pois/rykka_easter_egg.dmm +++ b/maps/tether/submaps/underdark_pois/rykka_easter_egg.dmm @@ -7,7 +7,7 @@ /area/mine/explored/underdark) "c" = ( /obj/structure/dogbed, -/mob/living/simple_mob/animal/wolf/direwolf/rykka{ +/mob/living/simple_mob/vore/wolf/direwolf/rykka{ attacktext = list("attacked, bites, gnaws"); friendly = list("nuzzles, cuddles, rubs against") }, diff --git a/maps/tether/submaps/underdark_pois/underdark_things.dm b/maps/tether/submaps/underdark_pois/underdark_things.dm index 499d5a924c..210fad46b9 100644 --- a/maps/tether/submaps/underdark_pois/underdark_things.dm +++ b/maps/tether/submaps/underdark_pois/underdark_things.dm @@ -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 diff --git a/maps/tether/submaps/underdark_pois/wolf_den.dmm b/maps/tether/submaps/underdark_pois/wolf_den.dmm index 59b5e79aec..efcaf437d2 100644 --- a/maps/tether/submaps/underdark_pois/wolf_den.dmm +++ b/maps/tether/submaps/underdark_pois/wolf_den.dmm @@ -23,7 +23,7 @@ /turf/simulated/mineral/floor/ignore_cavegen/virgo3b, /area/mine/explored/underdark) "g" = ( -/mob/living/simple_mob/animal/wolf/phoron, +/mob/living/simple_mob/vore/wolf/phoron, /turf/simulated/mineral/floor/ignore_cavegen/virgo3b, /area/mine/explored/underdark) "h" = ( @@ -36,7 +36,7 @@ /turf/simulated/mineral/floor/ignore_cavegen/virgo3b, /area/mine/explored/underdark) "j" = ( -/mob/living/simple_mob/otie/feral{ +/mob/living/simple_mob/vore/otie/feral{ faction = "underdark" }, /turf/simulated/mineral/floor/ignore_cavegen/virgo3b, diff --git a/maps/yw/submaps/gateway/snowfield.dm b/maps/yw/submaps/gateway/snowfield.dm index 6d6f7b1b2d..6548ca6f0d 100644 --- a/maps/yw/submaps/gateway/snowfield.dm +++ b/maps/yw/submaps/gateway/snowfield.dm @@ -28,7 +28,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, @@ -176,4 +176,4 @@ /obj/effect/floor_decal/derelict/d16 name = "derelict16" - icon_state = "derelict16" \ No newline at end of file + icon_state = "derelict16" diff --git a/vorestation.dme b/vorestation.dme index 90ea5ab8ab..06f7d6020a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2894,6 +2894,7 @@ #include "code\modules\mob\say_ch.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"