diff --git a/code/game/objects/effects/semirandom_mobs_vr.dm b/code/game/objects/effects/semirandom_mobs_vr.dm index 759270ca23..343401bbf3 100644 --- a/code/game/objects/effects/semirandom_mobs_vr.dm +++ b/code/game/objects/effects/semirandom_mobs_vr.dm @@ -251,12 +251,12 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/otie/red/chubby ), list( - /mob/living/simple_mob/shadekin/blue/ai = 100, - /mob/living/simple_mob/shadekin/green/ai = 50, - /mob/living/simple_mob/shadekin/orange/ai = 20, - /mob/living/simple_mob/shadekin/purple/ai = 60, - /mob/living/simple_mob/shadekin/red/ai = 40, - /mob/living/simple_mob/shadekin/yellow/ai = 1 + /mob/living/simple_mob/shadekin/blue = 100, + /mob/living/simple_mob/shadekin/green = 50, + /mob/living/simple_mob/shadekin/orange = 20, + /mob/living/simple_mob/shadekin/purple = 60, + /mob/living/simple_mob/shadekin/red = 40, + /mob/living/simple_mob/shadekin/yellow = 1 ), list( /mob/living/simple_mob/vore/aggressive/corrupthound, @@ -459,9 +459,9 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/animal/giant_spider/webslinger = 5 ) = 100, list( - /mob/living/simple_mob/shadekin/red/ai = 5, - /mob/living/simple_mob/shadekin/orange/ai = 1, - /mob/living/simple_mob/shadekin/purple/ai = 10 + /mob/living/simple_mob/shadekin/red = 5, + /mob/living/simple_mob/shadekin/orange = 1, + /mob/living/simple_mob/shadekin/purple = 10 ) = 1, list( /mob/living/simple_mob/animal/wolf = 10, @@ -552,9 +552,9 @@ var/global/list/semirandom_mob_spawner_decisions = list() possible_mob_types = list( list( - /mob/living/simple_mob/shadekin/blue/ai = 25, - /mob/living/simple_mob/shadekin/green/ai = 10, - /mob/living/simple_mob/shadekin/purple/ai = 1, + /mob/living/simple_mob/shadekin/blue = 25, + /mob/living/simple_mob/shadekin/green = 10, + /mob/living/simple_mob/shadekin/purple = 1, ) = 1, list(/mob/living/simple_mob/vore/catgirl) = 100, list(/mob/living/simple_mob/vore/wolfgirl) = 100, @@ -729,12 +729,12 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/otie/red/chubby ) = 50, list( - /mob/living/simple_mob/shadekin/blue/ai = 100, - /mob/living/simple_mob/shadekin/green/ai = 50, - /mob/living/simple_mob/shadekin/orange/ai = 20, - /mob/living/simple_mob/shadekin/purple/ai = 60, - /mob/living/simple_mob/shadekin/red/ai = 40, - /mob/living/simple_mob/shadekin/yellow/ai = 1 + /mob/living/simple_mob/shadekin/blue = 100, + /mob/living/simple_mob/shadekin/green = 50, + /mob/living/simple_mob/shadekin/orange = 20, + /mob/living/simple_mob/shadekin/purple = 60, + /mob/living/simple_mob/shadekin/red = 40, + /mob/living/simple_mob/shadekin/yellow = 1 ) = 1, list( /mob/living/simple_mob/vore/aggressive/corrupthound, diff --git a/code/game/objects/items/weapons/capture_crystal.dm b/code/game/objects/items/weapons/capture_crystal.dm index 5523ad8d1e..4474ff6219 100644 --- a/code/game/objects/items/weapons/capture_crystal.dm +++ b/code/game/objects/items/weapons/capture_crystal.dm @@ -711,12 +711,12 @@ /mob/living/simple_mob/otie/red/chubby ), list( - /mob/living/simple_mob/shadekin/blue/ai = 100, - /mob/living/simple_mob/shadekin/green/ai = 50, - /mob/living/simple_mob/shadekin/orange/ai = 20, - /mob/living/simple_mob/shadekin/purple/ai = 60, - /mob/living/simple_mob/shadekin/red/ai = 40, - /mob/living/simple_mob/shadekin/yellow/ai = 1 + /mob/living/simple_mob/shadekin/blue = 100, + /mob/living/simple_mob/shadekin/green = 50, + /mob/living/simple_mob/shadekin/orange = 20, + /mob/living/simple_mob/shadekin/purple = 60, + /mob/living/simple_mob/shadekin/red = 40, + /mob/living/simple_mob/shadekin/yellow = 1 ), list( /mob/living/simple_mob/vore/aggressive/corrupthound, diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm index 2157631709..9030e874ac 100644 --- a/code/game/objects/random/misc_vr.dm +++ b/code/game/objects/random/misc_vr.dm @@ -60,6 +60,9 @@ prob(20);/obj/item/weapon/aliencoin/phoron, prob(10);/obj/item/device/denecrotizer, prob(5);/obj/item/capture_crystal, + prob(3);/obj/item/capture_crystal/great, + prob(1);/obj/item/capture_crystal/ultra, + prob(4);/obj/item/capture_crystal/random, prob(5);/obj/item/device/perfect_tele, prob(5);/obj/item/weapon/bluespace_harpoon, prob(1);/obj/item/weapon/cell/infinite, @@ -81,6 +84,19 @@ prob(1);/obj/fiftyspawner/diamond, prob(5);/obj/fiftyspawner/phoron, prob(1);/obj/item/weapon/telecube/randomized, - prob(1);/obj/item/capture_crystal/random, - prob(10000);/obj/random/meat + prob(10);/obj/random/empty_or_lootable_crate, + prob(10);/obj/random/medical, + prob(5);/obj/random/firstaid, + prob(30);/obj/random/maintenance, + prob(10);/obj/random/mre, + prob(15);/obj/random/snack, + prob(10);/obj/random/tech_supply, + prob(15);/obj/random/tech_supply/component, + prob(10);/obj/random/tool, + prob(5);/obj/random/tool/power, + prob(1);/obj/random/tool/alien, + prob(5);/obj/random/weapon, + prob(5);/obj/random/ammo_all, + prob(3);/obj/random/projectile/random, + prob(5);/obj/random/multiple/voidsuit ) diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm index 96795f446d..4780c89f36 100644 --- a/code/game/objects/structures/flora/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -450,6 +450,43 @@ desc = "This is a tiny well lit decorative christmas tree." icon_state = "plant-xmas" +/obj/random/pottedplant + name = "random potted plant" + desc = "This is a random potted plant." + +/obj/random/pottedplant/item_to_spawn() + return pick( + prob(10);/obj/structure/flora/pottedplant, + prob(10);/obj/structure/flora/pottedplant/large, + prob(10);/obj/structure/flora/pottedplant/fern, + prob(10);/obj/structure/flora/pottedplant/overgrown, + prob(10);/obj/structure/flora/pottedplant/bamboo, + prob(10);/obj/structure/flora/pottedplant/largebush, + prob(10);/obj/structure/flora/pottedplant/thinbush, + prob(10);/obj/structure/flora/pottedplant/mysterious, + prob(10);/obj/structure/flora/pottedplant/smalltree, + prob(10);/obj/structure/flora/pottedplant/unusual, + prob(10);/obj/structure/flora/pottedplant/orientaltree, + prob(10);/obj/structure/flora/pottedplant/smallcactus, + prob(10);/obj/structure/flora/pottedplant/tall, + prob(10);/obj/structure/flora/pottedplant/sticky, + prob(10);/obj/structure/flora/pottedplant/smelly, + prob(10);/obj/structure/flora/pottedplant/small, + prob(10);/obj/structure/flora/pottedplant/aquatic, + prob(10);/obj/structure/flora/pottedplant/shoot, + prob(10);/obj/structure/flora/pottedplant/flower, + prob(10);/obj/structure/flora/pottedplant/crystal, + prob(10);/obj/structure/flora/pottedplant/subterranean, + prob(10);/obj/structure/flora/pottedplant/minitree, + prob(10);/obj/structure/flora/pottedplant/stoutbush, + prob(10);/obj/structure/flora/pottedplant/drooping, + prob(10);/obj/structure/flora/pottedplant/tropical, + prob(10);/obj/structure/flora/pottedplant/dead, + prob(10);/obj/structure/flora/pottedplant/decorative, + prob(1);/obj/structure/flora/pottedplant/xmas + ) + + /obj/structure/flora/sif icon = 'icons/obj/flora/sifflora.dmi' diff --git a/code/modules/admin/verbs/smite_vr.dm b/code/modules/admin/verbs/smite_vr.dm index 51e4411906..750a8c0bea 100644 --- a/code/modules/admin/verbs/smite_vr.dm +++ b/code/modules/admin/verbs/smite_vr.dm @@ -34,7 +34,7 @@ if(!Ts) return //Didn't find shadekin spawn turf - var/mob/living/simple_mob/shadekin/red/ai/shadekin = new(Ts) + var/mob/living/simple_mob/shadekin/red/shadekin = new(Ts) //Abuse of shadekin shadekin.real_name = shadekin.name shadekin.init_vore() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index 371fc8d241..ee27fb1c97 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -76,6 +76,8 @@ var/obj/screen/energyhud //Holder to update this icon var/list/shadekin_abilities + var/check_for_observer = FALSE + var/check_timer = 0 /mob/living/simple_mob/shadekin/Initialize() //You spawned the prototype, and want a totally random one. @@ -86,6 +88,7 @@ /mob/living/simple_mob/shadekin/red = 20, //Actively seek people out to nom, so fairly common to see (relatively speaking), /mob/living/simple_mob/shadekin/blue = 15, //Explorers that like to interact with people, so still fairly common, /mob/living/simple_mob/shadekin/purple = 15, //Also explorers that may or may not homf people, + /mob/living/simple_mob/shadekin/green = 5, /mob/living/simple_mob/shadekin/yellow = 1 //Very rare, usually never leaves their home ) var/new_type = pickweight(sk_types) @@ -198,7 +201,18 @@ if(. && nutrition > initial(nutrition) && energy < 100) nutrition = max(0, nutrition-5) energy = min(100,energy+1) - + if(!client && check_for_observer && check_timer++ > 5) + check_timer = 0 + var/non_kin_count = 0 + for(var/mob/living/M in view(6,src)) + if(!istype(M, /mob/living/simple_mob/shadekin)) + non_kin_count ++ + // Technically can be combined with ||, they call the same function, but readability is poor + if(!non_kin_count && (ability_flags & AB_PHASE_SHIFTED)) + phase_shift() // shifting back in, nobody present + else if (non_kin_count && !(ability_flags & AB_PHASE_SHIFTED)) + phase_shift() // shifting out, scaredy + /mob/living/simple_mob/shadekin/update_icon() . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm index e66162432b..d09e72aa97 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm @@ -28,6 +28,9 @@ a brawl, but you barely generate any of your own energy. You can stand in a dark spot to gather scraps \ of energy in a pinch, but otherwise need to take it, by force if necessary." +/mob/living/simple_mob/shadekin/red + ai_holder_type = /datum/ai_holder/simple_mob/melee + /mob/living/simple_mob/shadekin/red/white icon_state = "white" /mob/living/simple_mob/shadekin/red/dark @@ -35,16 +38,6 @@ /mob/living/simple_mob/shadekin/red/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/red/ai - ai_holder_type = /datum/ai_holder/simple_mob/melee - -/mob/living/simple_mob/shadekin/red/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/red/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/red/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// /mob/living/simple_mob/shadekin/blue name = "blue-eyed shadekin" @@ -85,6 +78,9 @@ without doing so, albeit slowly. Dark and light are irrelevant to you, they are just different places to explore and \ discover new things and new people." +/mob/living/simple_mob/shadekin/blue/ + ai_holder_type = /datum/ai_holder/simple_mob/passive + /mob/living/simple_mob/shadekin/blue/white icon_state = "white" /mob/living/simple_mob/shadekin/blue/dark @@ -92,16 +88,6 @@ /mob/living/simple_mob/shadekin/blue/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/blue/ai - ai_holder_type = /datum/ai_holder/simple_mob/passive - -/mob/living/simple_mob/shadekin/blue/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/blue/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/blue/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// /mob/living/simple_mob/shadekin/purple name = "purple-eyed shadekin" @@ -137,6 +123,9 @@ areas is taxing on your energy. You can harvest energy from others in a fight, but since you don't need to, you may \ just choose to simply not fight." +/mob/living/simple_mob/shadekin/purple + ai_holder_type = /datum/ai_holder/simple_mob/retaliate + /mob/living/simple_mob/shadekin/purple/white icon_state = "white" /mob/living/simple_mob/shadekin/purple/dark @@ -144,16 +133,6 @@ /mob/living/simple_mob/shadekin/purple/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/purple/ai - ai_holder_type = /datum/ai_holder/simple_mob/retaliate - -/mob/living/simple_mob/shadekin/purple/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/purple/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/purple/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// /mob/living/simple_mob/shadekin/yellow name = "yellow-eyed shadekin" @@ -177,6 +156,7 @@ eye_desc = "yellow eyes" stalker = FALSE + check_for_observer = TRUE vore_stomach_flavor = "You slip past pointy triangle teeth and down the slick, slippery gullet \ of the creature. It's warm, and the air is thick. You can hear its body squelch and shift around you \ as you settle into its stomach! The doughy walls within cling to you heavily, churning down on you, wearing \ @@ -187,6 +167,9 @@ area is very taxing on you, but you gain energy extremely fast in any very dark area. You're weaker than other \ shadekin, but your fast energy generation in the dark allows you to phase shift more often." +/mob/living/simple_mob/shadekin/yellow + ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run + /mob/living/simple_mob/shadekin/yellow/white icon_state = "white" /mob/living/simple_mob/shadekin/yellow/dark @@ -194,24 +177,14 @@ /mob/living/simple_mob/shadekin/yellow/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/yellow/ai - ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run - -/mob/living/simple_mob/shadekin/yellow/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/yellow/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/yellow/ai/brown - icon_state = "brown" - -/mob/living/simple_mob/shadekin/yellow/ai/retaliate +/mob/living/simple_mob/shadekin/yellow/retaliate ai_holder_type = /datum/ai_holder/simple_mob/retaliate -/mob/living/simple_mob/shadekin/yellow/ai/retaliate/white +/mob/living/simple_mob/shadekin/yellow/retaliate/white icon_state = "white" -/mob/living/simple_mob/shadekin/yellow/ai/retaliate/dark +/mob/living/simple_mob/shadekin/yellow/retaliate/dark icon_state = "dark" -/mob/living/simple_mob/shadekin/yellow/ai/retaliate/brown +/mob/living/simple_mob/shadekin/yellow/retaliate/brown icon_state = "brown" ///////////////////////////////////////////////////////////////// @@ -237,6 +210,7 @@ eye_desc = "green eyes" stalker = TRUE + check_for_observer = TRUE vore_stomach_flavor = "You slip past pointy triangle teeth and down the slick, slippery gullet \ of the creature. It's warm, and the air is thick. You can hear its body squelch and shift around you \ as you settle into its stomach! The doughy walls within cling to you heavily, churning down on you, wearing \ @@ -247,6 +221,9 @@ have more experience than your yellow-eyed cousins. You gain energy decently fast in any very dark area. You're weaker than other \ shadekin, but your slight energy generation constnatly, and especially in the dark allows for a good mix of uses." +/mob/living/simple_mob/shadekin/green + ai_holder_type = /datum/ai_holder/simple_mob/passive + /mob/living/simple_mob/shadekin/green/white icon_state = "white" /mob/living/simple_mob/shadekin/green/dark @@ -254,16 +231,6 @@ /mob/living/simple_mob/shadekin/green/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/green/ai - ai_holder_type = /datum/ai_holder/simple_mob/passive - -/mob/living/simple_mob/shadekin/green/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/green/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/green/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// /mob/living/simple_mob/shadekin/orange name = "orange-eyed shadekin" @@ -294,6 +261,9 @@ You're stronger than most shadekin, faster, and more capable in a brawl, but you don't generate much of your own energy. \ You can stand in a dark spot to gather some energy, but otherwise need to take it, by force if necessary." +/mob/living/simple_mob/shadekin/orange + ai_holder_type = /datum/ai_holder/simple_mob/melee + /mob/living/simple_mob/shadekin/orange/white icon_state = "white" /mob/living/simple_mob/shadekin/orange/dark @@ -301,22 +271,13 @@ /mob/living/simple_mob/shadekin/orange/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/orange/ai - ai_holder_type = /datum/ai_holder/simple_mob/melee - -/mob/living/simple_mob/shadekin/orange/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/orange/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/orange/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// //Fluffy specific fluffer /mob/living/simple_mob/shadekin/blue/rivyr name = "Rivyr" desc = "She appears to be a fluffer of some sort. Deep blue eyes and curious attitude." icon_state = "rivyr" + ai_holder_type = /datum/ai_holder/simple_mob/passive eye_desc = "" vore_stomach_flavor = "Blue flesh gleams in the fading light as you slip down the little mar's gullet! \ Gooey flesh and heat surrounds your form as you're tucked away into the darkness of her stomach! Thick slimes cling \ diff --git a/maps/om_adventure/grasscave.dm b/maps/om_adventure/grasscave.dm index 4474164859..01b2a2985a 100644 --- a/maps/om_adventure/grasscave.dm +++ b/maps/om_adventure/grasscave.dm @@ -10,6 +10,7 @@ #include "pois/fleshtear4.dmm" #include "pois/cabin1.dmm" #include "pois/cabin2.dmm" +#include "pois/cabin3.dmm" #include "pois/camp.dmm" #include "pois/shuttlewreck1.dmm" #include "pois/shuttlewreck2.dmm" @@ -193,6 +194,15 @@ mappath = 'pois/cabin2.dmm' cost = 20 +/area/om_adventure/poi/cabin3 + name = "POI - Cabin 3" + +/datum/map_template/om_adventure/outdoor/cabin3 + name = "cabin3" + desc = "A comfy... home?" + mappath = 'pois/cabin3.dmm' + cost = 10 + /area/om_adventure/poi/camp name = "POI - Camp" @@ -209,7 +219,7 @@ name = "Shuttle wreck" desc = "Long abandoned!" mappath = 'pois/shuttlewreck1.dmm' - cost = 10 + cost = 5 /area/om_adventure/poi/shuttlewreck2 name = "POI - Shuttlewreck 2" @@ -227,7 +237,7 @@ name = "Shuttle wreck" desc = "Long abandoned!" mappath = 'pois/shuttlewreck3.dmm' - cost = 10 + cost = 5 /area/om_adventure/poi/shuttlewreck4 name = "POI - Shuttlewreck 4" @@ -237,3 +247,85 @@ desc = "Long abandoned!" mappath = 'pois/shuttlewreck4.dmm' cost = 10 + +/area/om_adventure/poi/medicalcenter + name = "POI - medical center" + +/datum/map_template/om_adventure/outdoor/medicalcenter + name = "Medical Center" + desc = "Maybe they used to heal people here." + mappath = 'pois/medicalcenter.dmm' + cost = 10 + +/area/om_adventure/poi/shippart1 + name = "POI - ship part 1" + +/datum/map_template/om_adventure/outdoor/shippart1 + name = "Ship Part" + desc = "Something bad happened here." + mappath = 'pois/shippart1.dmm' + cost = 10 + +/area/om_adventure/poi/woodentemple + name = "POI - Wooden Temple" + +/datum/map_template/om_adventure/cave/woodentemple + name = "Wooden Temple" + desc = "A comfy wooden temple." + mappath = 'pois/woodentemple.dmm' + cost = 10 + +/area/om_adventure/poi/alienchamber1 + name = "POI - Alien Chamber 1" + +/datum/map_template/om_adventure/cave/alienchamber1 + name = "Alien Chamber" + desc = "A mysterious alien chamber!" + mappath = 'pois/alienchamber1.dmm' + cost = 10 + +/area/om_adventure/poi/alienchamber2 + name = "POI - Alien Chamber 2" + +/datum/map_template/om_adventure/cave/alienchamber2 + name = "Alien Chamber" + desc = "A mysterious alien chamber!" + mappath = 'pois/alienchamber2.dmm' + cost = 10 + +/area/om_adventure/poi/alienchamber3 + name = "POI - Alien Chamber 3" + +/datum/map_template/om_adventure/cave/alienchamber3 + name = "Alien Chamber" + desc = "A mysterious alien chamber!" + mappath = 'pois/alienchamber3.dmm' + cost = 10 + +/area/om_adventure/poi/alienchamber4 + name = "POI - Alien Chamber 4" + +/datum/map_template/om_adventure/cave/alienchamber4 + name = "Alien Chamber" + desc = "A mysterious alien chamber!" + mappath = 'pois/alienchamber4.dmm' + cost = 10 + +/obj/tether_away_spawner/spookyland + name = "Spookyland Spawner" + icon = 'icons/mob/randomlandmarks.dmi' + icon_state = "monster" + + faction = "spookyland" + prob_spawn = 50 + prob_fall = 10 + //guard = 10 //Don't wander too far, to stay alive. + mobs_to_pick_from = list( + /mob/living/simple_mob/shadekin = 1, + /mob/living/simple_mob/vore/alienanimals/space_ghost = 5, + /mob/living/simple_mob/vore/alienanimals/space_jellyfish = 5, + /mob/living/simple_mob/faithless = 3, + /mob/living/simple_mob/mechanical/infectionbot = 1, + /mob/living/simple_mob/animal/passive/cat/bluespace = 0.01, + /mob/living/simple_mob/animal/passive/dog/void_puppy = 0.01 + ) \ No newline at end of file diff --git a/maps/om_adventure/pois/alienchamber1.dmm b/maps/om_adventure/pois/alienchamber1.dmm new file mode 100644 index 0000000000..40aae71e2c --- /dev/null +++ b/maps/om_adventure/pois/alienchamber1.dmm @@ -0,0 +1,151 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/alienchamber1) +"e" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber1) +"f" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber1) +"n" = ( +/turf/template_noop, +/area/template_noop) +"x" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber1) +"D" = ( +/obj/structure/table/alien, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber1) +"P" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber1) +"Z" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber1) + +(1,1,1) = {" +n +n +n +a +a +a +a +a +a +a +"} +(2,1,1) = {" +n +n +n +a +Z +Z +x +x +x +a +"} +(3,1,1) = {" +n +n +n +a +Z +x +e +x +x +a +"} +(4,1,1) = {" +a +a +a +a +x +P +P +e +x +a +"} +(5,1,1) = {" +a +D +Z +x +x +x +P +x +Z +a +"} +(6,1,1) = {" +a +Z +x +P +x +x +x +Z +D +a +"} +(7,1,1) = {" +a +x +e +f +P +x +a +a +a +a +"} +(8,1,1) = {" +a +x +x +e +x +Z +a +n +n +n +"} +(9,1,1) = {" +a +x +x +x +Z +Z +a +n +n +n +"} +(10,1,1) = {" +a +a +a +a +a +a +a +n +n +n +"} diff --git a/maps/om_adventure/pois/alienchamber2.dmm b/maps/om_adventure/pois/alienchamber2.dmm new file mode 100644 index 0000000000..8366c7736a --- /dev/null +++ b/maps/om_adventure/pois/alienchamber2.dmm @@ -0,0 +1,261 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"i" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) +"q" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber2) +"u" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber2) +"x" = ( +/obj/random/awayloot/looseloot, +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) +"H" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber2) +"M" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) +"P" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/alienchamber2) +"Q" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) +"W" = ( +/obj/structure/table/alien, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) + +(1,1,1) = {" +a +a +a +a +P +P +P +P +P +P +a +"} +(2,1,1) = {" +a +a +a +a +P +M +M +M +x +P +P +"} +(3,1,1) = {" +a +a +a +a +P +x +i +q +i +i +P +"} +(4,1,1) = {" +a +a +a +a +P +M +i +i +u +i +P +"} +(5,1,1) = {" +a +P +P +P +P +P +P +i +i +i +P +"} +(6,1,1) = {" +P +P +W +M +M +i +P +i +i +i +P +"} +(7,1,1) = {" +P +i +i +i +i +i +P +P +Q +P +P +"} +(8,1,1) = {" +P +i +i +u +i +i +P +i +i +i +P +"} +(9,1,1) = {" +P +i +q +H +u +i +Q +i +q +i +P +"} +(10,1,1) = {" +P +i +i +u +i +i +P +i +i +i +P +"} +(11,1,1) = {" +P +i +i +i +i +i +P +P +Q +P +P +"} +(12,1,1) = {" +P +P +M +x +M +i +P +i +i +i +P +"} +(13,1,1) = {" +a +P +P +P +P +P +P +i +i +i +P +"} +(14,1,1) = {" +a +a +a +a +P +M +i +i +u +i +P +"} +(15,1,1) = {" +a +a +a +a +P +x +i +q +i +i +P +"} +(16,1,1) = {" +a +a +a +a +P +M +i +i +x +P +P +"} +(17,1,1) = {" +a +a +a +a +P +P +P +P +P +P +a +"} diff --git a/maps/om_adventure/pois/alienchamber3.dmm b/maps/om_adventure/pois/alienchamber3.dmm new file mode 100644 index 0000000000..a8c3a50974 --- /dev/null +++ b/maps/om_adventure/pois/alienchamber3.dmm @@ -0,0 +1,221 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber3) +"f" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber3) +"r" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/alienchamber3) +"P" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber3) +"V" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber3) +"X" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber3) + +(1,1,1) = {" +a +a +a +a +a +r +r +r +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +r +r +P +r +r +a +a +a +a +"} +(3,1,1) = {" +a +a +a +r +r +P +P +P +r +r +a +a +a +"} +(4,1,1) = {" +a +a +r +r +P +P +c +P +P +r +r +a +a +"} +(5,1,1) = {" +a +r +r +P +V +P +X +P +V +P +r +r +a +"} +(6,1,1) = {" +r +r +P +P +P +P +c +P +P +P +P +r +r +"} +(7,1,1) = {" +r +P +P +c +X +c +f +c +X +c +P +P +r +"} +(8,1,1) = {" +r +r +P +P +P +P +c +P +P +P +P +r +r +"} +(9,1,1) = {" +a +r +r +P +P +V +X +P +P +P +r +r +a +"} +(10,1,1) = {" +a +a +r +r +P +P +c +P +P +r +r +a +a +"} +(11,1,1) = {" +a +a +a +r +r +P +P +P +r +r +a +a +a +"} +(12,1,1) = {" +a +a +a +a +r +r +P +r +r +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +r +r +r +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/alienchamber4.dmm b/maps/om_adventure/pois/alienchamber4.dmm new file mode 100644 index 0000000000..a72674a530 --- /dev/null +++ b/maps/om_adventure/pois/alienchamber4.dmm @@ -0,0 +1,295 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"h" = ( +/obj/random/awayloot/looseloot, +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) +"n" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber4) +"o" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber4) +"q" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) +"s" = ( +/obj/structure/table/alien, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) +"L" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/alienchamber4) +"N" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber4) +"O" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) +"R" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) + +(1,1,1) = {" +a +a +L +a +a +a +L +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +L +L +L +L +L +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +L +L +L +q +h +q +L +L +L +a +a +a +a +a +a +"} +(4,1,1) = {" +a +L +q +O +O +O +O +L +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +L +h +O +n +O +O +L +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +L +O +O +O +O +O +L +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +L +O +O +O +O +O +L +a +a +a +a +L +a +a +"} +(8,1,1) = {" +a +L +O +O +O +O +O +L +L +L +L +L +L +a +a +"} +(9,1,1) = {" +a +L +O +O +R +O +O +O +O +O +O +O +L +L +L +"} +(10,1,1) = {" +a +L +O +O +o +O +O +O +O +O +O +O +s +L +a +"} +(11,1,1) = {" +a +L +q +o +N +o +R +O +O +O +n +O +q +L +a +"} +(12,1,1) = {" +a +L +q +O +o +O +O +O +O +O +O +O +q +L +a +"} +(13,1,1) = {" +L +L +L +s +q +O +O +O +O +O +q +q +L +L +L +"} +(14,1,1) = {" +a +a +L +L +L +L +L +L +L +L +L +L +L +a +a +"} +(15,1,1) = {" +a +a +L +a +a +a +a +a +a +a +a +a +L +a +a +"} diff --git a/maps/om_adventure/pois/cabin1.dmm b/maps/om_adventure/pois/cabin1.dmm index 13eb172b66..0adc084576 100644 --- a/maps/om_adventure/pois/cabin1.dmm +++ b/maps/om_adventure/pois/cabin1.dmm @@ -4,26 +4,77 @@ /area/template_noop) "b" = ( /obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/obj/random/tech_supply, /turf/simulated/floor/carpet, /area/om_adventure/poi/cabin1) "c" = ( /obj/structure/table/reinforced, /turf/simulated/floor/bmarble, /area/om_adventure/poi/cabin1) +"d" = ( +/obj/structure/table/reinforced, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"f" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/snack, +/obj/random/snack, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) "g" = ( /obj/structure/bed/chair/sofa/brown, +/obj/random/snack, /turf/simulated/floor/wood, /area/om_adventure/poi/cabin1) +"i" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) "j" = ( /turf/simulated/floor/carpet, /area/om_adventure/poi/cabin1) +"k" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/flame/candle, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"r" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) "s" = ( /turf/simulated/floor/wood, /area/om_adventure/poi/cabin1) +"t" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) "u" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/plating, /area/om_adventure/poi/cabin1) +"v" = ( +/obj/item/weapon/bedsheet/browndouble, +/obj/structure/bed/double/padded, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin1) +"w" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin1) +"x" = ( +/obj/structure/table/reinforced, +/obj/random/snack, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) "z" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/bmarble, @@ -40,14 +91,25 @@ /area/om_adventure/poi/cabin1) "F" = ( /obj/structure/table/darkglass, +/obj/random/awayloot/looseloot, +/obj/item/weapon/flame/candle, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"H" = ( +/obj/structure/table/woodentable, +/obj/random/tech_supply, /turf/simulated/floor/wood, /area/om_adventure/poi/cabin1) "I" = ( /obj/structure/closet, +/obj/random/awayloot/looseloot, +/obj/random/awayloot/looseloot, +/obj/random/tech_supply, /turf/simulated/floor/carpet, /area/om_adventure/poi/cabin1) "L" = ( /obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, /turf/simulated/floor/wood, /area/om_adventure/poi/cabin1) "Q" = ( @@ -63,11 +125,20 @@ /obj/structure/bed/chair/sofa/brown/right, /turf/simulated/floor/wood, /area/om_adventure/poi/cabin1) +"T" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin1) "X" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/om_adventure/poi/cabin1) +"Z" = ( +/obj/structure/table/woodentable, +/obj/random/tech_supply/component, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) (1,1,1) = {" a @@ -100,22 +171,22 @@ a (3,1,1) = {" a Q -c -c -c -c +x +k +x +d Q b j -j +v Q a "} (4,1,1) = {" a X -c -D +d +i D D Q @@ -134,7 +205,7 @@ D D z j -j +T j X a @@ -142,7 +213,7 @@ a (6,1,1) = {" a Q -c +f D D D @@ -157,7 +228,7 @@ a a Q Q -c +k D Q Q @@ -174,7 +245,7 @@ L s s s -s +r Q a a @@ -188,7 +259,7 @@ S s s s -s +H Q B a @@ -206,7 +277,7 @@ s u B B -B +w a "} (11,1,1) = {" @@ -214,9 +285,9 @@ a Q C R +t s -s -s +Z Q B a diff --git a/maps/om_adventure/pois/cabin2.dmm b/maps/om_adventure/pois/cabin2.dmm index cb3a875312..31b9b10e2d 100644 --- a/maps/om_adventure/pois/cabin2.dmm +++ b/maps/om_adventure/pois/cabin2.dmm @@ -2,29 +2,158 @@ "a" = ( /turf/template_noop, /area/template_noop) +"c" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) "e" = ( +/obj/structure/simple_door/wood, /turf/simulated/floor/plating/eris/under, /area/om_adventure/poi/cabin2) +"g" = ( +/obj/structure/table/rack/shelf, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"i" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/outdoors/sidewalk/side, +/area/om_adventure/poi/cabin2) "k" = ( /turf/simulated/wall/log, /area/om_adventure/poi/cabin2) +"l" = ( +/obj/structure/table/steel, +/obj/random/multiple/underdark/treasure, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"n" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"p" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"q" = ( +/obj/structure/table/steel, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"r" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"s" = ( +/obj/structure/bed/chair/sofa/corp/right, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"t" = ( +/obj/structure/bed/chair/sofa/brown/corner, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"u" = ( +/obj/structure/toilet/prison{ + dir = 8 + }, +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/techmaint, +/area/om_adventure/poi/cabin2) +"v" = ( +/obj/structure/bed/chair/sofa/brown/left{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"w" = ( +/obj/structure/table/rack, +/obj/random/maintenance, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"x" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/browndouble, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin2) +"y" = ( +/obj/structure/table/steel, +/obj/random/material, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) "z" = ( /turf/simulated/floor/outdoors/sidewalk/side, /area/om_adventure/poi/cabin2) +"A" = ( +/obj/structure/bed/chair/sofa/brown, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"B" = ( +/obj/structure/table/rack, +/obj/random/maintenance, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) "D" = ( /turf/simulated/floor/wood, /area/om_adventure/poi/cabin2) +"E" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin2) "F" = ( /turf/simulated/floor/outdoors/newdirt, /area/om_adventure/poi/cabin2) +"H" = ( +/obj/structure/table/woodentable, +/obj/random/snack, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"I" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/obj/random/maintenance, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"J" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"K" = ( +/obj/structure/bed/chair/sofa/brown/right{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"L" = ( +/obj/structure/table/woodentable, +/obj/random/maintenance, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) "M" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/om_adventure/poi/cabin2) +"N" = ( +/obj/structure/sink{ + pixel_y = 18 + }, +/turf/simulated/floor/tiled/techmaint, +/area/om_adventure/poi/cabin2) "O" = ( /turf/simulated/floor/bmarble, /area/om_adventure/poi/cabin2) +"P" = ( +/obj/structure/bed/chair/sofa/brown/corner{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) "Q" = ( /turf/simulated/floor/carpet/bcarpet, /area/om_adventure/poi/cabin2) @@ -34,6 +163,24 @@ "T" = ( /turf/simulated/floor/carpet, /area/om_adventure/poi/cabin2) +"V" = ( +/obj/structure/table/rack, +/obj/random/awayloot/looseloot, +/obj/random/tech_supply, +/obj/random/tech_supply, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"X" = ( +/obj/structure/bed/chair/sofa/corp/left, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"Y" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/obj/random/maintenance, +/obj/random/maintenance, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) (1,1,1) = {" a @@ -78,39 +225,39 @@ a (3,1,1) = {" a k +P +K Q -Q -Q -Q +B k a -z +i a k -D +I D T T -T +x k a "} (4,1,1) = {" a k -Q -Q -Q +A +H +r Q M a z a M -D +L D T -T +E T M a @@ -118,10 +265,10 @@ a (5,1,1) = {" a k +t +v Q -Q -Q -Q +w k k e @@ -143,28 +290,28 @@ k e k k +V O -O -O +V k D D -D -D -D +J +p +L k a "} (7,1,1) = {" a k -D -D +Y +L D D k -O -O +g +c O k D @@ -178,8 +325,8 @@ a (8,1,1) = {" a M -D -D +s +n D D e @@ -198,20 +345,20 @@ a (9,1,1) = {" a k +X D D -D -D +p k -O -O -O +y +q +l k -D -D +p +L k -S -S +N +u k a "} diff --git a/maps/om_adventure/pois/cabin3.dmm b/maps/om_adventure/pois/cabin3.dmm new file mode 100644 index 0000000000..02adedf2c1 --- /dev/null +++ b/maps/om_adventure/pois/cabin3.dmm @@ -0,0 +1,161 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/wood, +/area/om_adventure/poi/cabin3) +"d" = ( +/obj/structure/bonfire, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin3) +"i" = ( +/turf/template_noop, +/area/template_noop) +"k" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin3) +"n" = ( +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin3) +"r" = ( +/obj/effect/decal/remains, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin3) +"z" = ( +/turf/template_noop, +/area/om_adventure/poi/cabin3) +"M" = ( +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin3) +"S" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin3) +"T" = ( +/obj/tether_away_spawner/spookyland, +/turf/template_noop, +/area/om_adventure/poi/cabin3) +"V" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin3) + +(1,1,1) = {" +a +a +a +a +z +z +z +a +a +a +"} +(2,1,1) = {" +a +k +M +M +z +T +z +z +M +a +"} +(3,1,1) = {" +z +z +M +M +z +z +n +k +M +a +"} +(4,1,1) = {" +z +z +n +M +M +n +n +S +M +a +"} +(5,1,1) = {" +z +T +n +n +r +n +M +M +M +a +"} +(6,1,1) = {" +z +z +n +n +n +n +a +a +a +a +"} +(7,1,1) = {" +a +M +z +n +n +n +a +i +i +i +"} +(8,1,1) = {" +z +z +k +z +n +n +a +i +i +i +"} +(9,1,1) = {" +a +M +M +z +V +n +a +i +d +i +"} +(10,1,1) = {" +a +a +a +z +z +z +a +i +i +i +"} diff --git a/maps/om_adventure/pois/camp.dmm b/maps/om_adventure/pois/camp.dmm index 460c91827f..13960f3854 100644 --- a/maps/om_adventure/pois/camp.dmm +++ b/maps/om_adventure/pois/camp.dmm @@ -4,12 +4,22 @@ /area/template_noop) "n" = ( /obj/structure/table/rack/steel, +/obj/fiftyspawner/log, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/camp) +"x" = ( +/obj/tether_away_spawner/spookyland, /turf/simulated/floor/outdoors/newdirt, /area/om_adventure/poi/camp) "y" = ( /obj/structure/flora/tree/bigtree, /turf/template_noop, /area/om_adventure/poi/camp) +"z" = ( +/obj/structure/table/rack/steel, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/camp) "A" = ( /obj/structure/bonfire, /turf/simulated/floor/outdoors/newdirt, @@ -20,6 +30,11 @@ "M" = ( /turf/simulated/wall/log, /area/om_adventure/poi/camp) +"U" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/box/matches, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/camp) (1,1,1) = {" a @@ -54,8 +69,8 @@ a a M n -n -n +z +U M a H @@ -74,7 +89,7 @@ H a M H -H +x H M a @@ -89,7 +104,7 @@ a a a a -H +x H H a @@ -171,7 +186,7 @@ a a H H -H +x a a a diff --git a/maps/om_adventure/pois/darktear1.dmm b/maps/om_adventure/pois/darktear1.dmm index 3998a4c1e6..224bb457bf 100644 --- a/maps/om_adventure/pois/darktear1.dmm +++ b/maps/om_adventure/pois/darktear1.dmm @@ -5,6 +5,10 @@ "I" = ( /turf/template_noop, /area/template_noop) +"Z" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear1) (1,1,1) = {" I @@ -46,7 +50,7 @@ I I I a -a +Z a I I diff --git a/maps/om_adventure/pois/darktear2.dmm b/maps/om_adventure/pois/darktear2.dmm index ff5214f413..a4932cf5cf 100644 --- a/maps/om_adventure/pois/darktear2.dmm +++ b/maps/om_adventure/pois/darktear2.dmm @@ -2,6 +2,10 @@ "a" = ( /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/darktear2) +"Q" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear2) "S" = ( /turf/template_noop, /area/template_noop) @@ -26,7 +30,7 @@ S "} (3,1,1) = {" S -a +Q a S S @@ -65,7 +69,7 @@ S S a a -a +Q a S "} diff --git a/maps/om_adventure/pois/darktear3.dmm b/maps/om_adventure/pois/darktear3.dmm index 47db577f18..89a5dec553 100644 --- a/maps/om_adventure/pois/darktear3.dmm +++ b/maps/om_adventure/pois/darktear3.dmm @@ -5,6 +5,10 @@ "v" = ( /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/darktear3) +"Y" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear3) (1,1,1) = {" a @@ -55,7 +59,7 @@ a a v v -v +Y v v v diff --git a/maps/om_adventure/pois/darktear4.dmm b/maps/om_adventure/pois/darktear4.dmm index b9b35d88a6..655e97b230 100644 --- a/maps/om_adventure/pois/darktear4.dmm +++ b/maps/om_adventure/pois/darktear4.dmm @@ -2,6 +2,10 @@ "a" = ( /turf/template_noop, /area/template_noop) +"g" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear4) "j" = ( /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/darktear4) @@ -31,7 +35,7 @@ j (3,1,1) = {" a a -j +g j j j @@ -57,7 +61,7 @@ a a j j -j +g a a "} diff --git a/maps/om_adventure/pois/medicalcenter.dmm b/maps/om_adventure/pois/medicalcenter.dmm new file mode 100644 index 0000000000..aea560a0af --- /dev/null +++ b/maps/om_adventure/pois/medicalcenter.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) +"j" = ( +/obj/machinery/door/airlock/angled_bay/standard/glass, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/medicalcenter) +"k" = ( +/obj/random/pottedplant, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"m" = ( +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/medical, +/obj/structure/curtain/medical, +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"q" = ( +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"r" = ( +/obj/structure/salvageable/machine, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"t" = ( +/obj/effect/low_wall_spawner/eris/reinforced/rphoron, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/medicalcenter) +"v" = ( +/obj/structure/table/glass, +/obj/structure/salvageable/personal, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"y" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"z" = ( +/obj/structure/bed/chair/sofa/blue/left{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"A" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/medicalcenter) +"C" = ( +/obj/structure/bed/chair/sofa/blue/right, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"D" = ( +/obj/structure/table/glass, +/obj/random/medical, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"E" = ( +/obj/structure/salvageable/computer, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"G" = ( +/obj/structure/table/glass, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"H" = ( +/obj/structure/table/glass, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"I" = ( +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/medical, +/obj/structure/curtain/medical, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"P" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"Q" = ( +/obj/machinery/door/airlock/angled_bay/standard/glass{ + dir = 4 + }, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/medicalcenter) +"T" = ( +/obj/structure/table/glass, +/obj/random/medical, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"W" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"X" = ( +/obj/structure/table/glass, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"Z" = ( +/obj/structure/bed/chair/sofa/blue/corner, +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) + +(1,1,1) = {" +a +a +a +A +a +A +a +a +A +a +A +a +"} +(2,1,1) = {" +a +a +A +A +A +A +t +t +A +A +A +A +"} +(3,1,1) = {" +a +a +a +A +C +q +q +q +q +H +A +a +"} +(4,1,1) = {" +a +A +a +A +Z +z +q +q +q +T +A +a +"} +(5,1,1) = {" +A +A +A +A +A +A +k +y +q +X +A +a +"} +(6,1,1) = {" +a +A +E +G +q +A +A +A +Q +A +A +A +"} +(7,1,1) = {" +a +t +q +H +q +A +q +W +q +k +A +a +"} +(8,1,1) = {" +a +A +q +P +q +j +q +q +P +q +j +a +"} +(9,1,1) = {" +a +t +q +T +q +A +q +y +q +k +A +a +"} +(10,1,1) = {" +a +A +r +v +q +A +A +A +Q +A +A +A +"} +(11,1,1) = {" +A +A +A +A +A +A +m +D +q +I +A +a +"} +(12,1,1) = {" +a +A +a +A +k +q +q +q +q +k +A +a +"} +(13,1,1) = {" +a +a +a +A +H +I +H +I +T +I +A +a +"} +(14,1,1) = {" +a +a +A +A +A +A +t +t +A +A +A +A +"} +(15,1,1) = {" +a +a +a +A +a +A +a +a +A +a +A +a +"} diff --git a/maps/om_adventure/pois/shippart1.dmm b/maps/om_adventure/pois/shippart1.dmm new file mode 100644 index 0000000000..7d2831eade --- /dev/null +++ b/maps/om_adventure/pois/shippart1.dmm @@ -0,0 +1,396 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/floor/tiled/eris/dark/techfloor, +/area/om_adventure/poi/shippart1) +"d" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"g" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/shippart1) +"h" = ( +/obj/random/awayloot/looseloot, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"j" = ( +/obj/tether_away_spawner/spookyland, +/turf/template_noop, +/area/template_noop) +"p" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"q" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/eris/dark/techfloor, +/area/om_adventure/poi/shippart1) +"r" = ( +/obj/item/weapon/material/shard, +/turf/template_noop, +/area/template_noop) +"s" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/techfloor, +/area/om_adventure/poi/shippart1) +"t" = ( +/obj/structure/frame/computer, +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"v" = ( +/obj/effect/floor_decal/rust, +/obj/random/tech_supply/component, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"w" = ( +/obj/effect/decal/remains/tajaran, +/turf/template_noop, +/area/template_noop) +"D" = ( +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"F" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shippart1) +"I" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"J" = ( +/obj/structure/salvageable/bliss, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"M" = ( +/obj/item/weapon/material/shard, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"O" = ( +/obj/effect/decal/remains/ribcage, +/turf/template_noop, +/area/template_noop) +"Q" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"R" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"T" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shippart1) +"X" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/template_noop, +/area/template_noop) +"Z" = ( +/obj/effect/decal/remains/deer, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) + +(1,1,1) = {" +a +a +a +a +a +a +F +a +a +a +F +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +F +j +a +X +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +X +a +a +F +a +a +X +a +F +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +w +a +F +F +g +g +v +g +a +r +j +a +F +a +a +a +a +a +"} +(5,1,1) = {" +X +a +X +a +F +g +g +g +t +I +p +F +F +F +F +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +F +g +M +g +d +D +Z +D +I +I +F +F +F +F +F +a +a +F +F +"} +(7,1,1) = {" +a +F +T +M +t +b +q +s +b +b +b +I +I +F +F +F +F +F +a +a +a +"} +(8,1,1) = {" +a +r +F +g +I +g +R +Q +d +D +M +v +F +F +F +F +F +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +F +g +g +g +J +I +h +D +I +I +F +a +a +a +a +a +F +"} +(10,1,1) = {" +a +a +j +T +a +F +F +g +g +I +g +g +g +g +a +a +F +F +F +a +a +"} +(11,1,1) = {" +a +X +a +a +X +a +a +a +a +a +T +a +a +a +j +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +X +a +a +a +O +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +F +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/shuttlewreck1.dmm b/maps/om_adventure/pois/shuttlewreck1.dmm index 7b2bdd08fe..c57959fc95 100644 --- a/maps/om_adventure/pois/shuttlewreck1.dmm +++ b/maps/om_adventure/pois/shuttlewreck1.dmm @@ -5,6 +5,10 @@ "e" = ( /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/shuttlewreck1) +"g" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck1) "i" = ( /obj/machinery/door/airlock/external, /turf/simulated/shuttle/floor/white, @@ -20,6 +24,14 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/om_adventure/poi/shuttlewreck1) +"t" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck1) +"v" = ( +/obj/random/tech_supply/component, +/turf/template_noop, +/area/template_noop) "D" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/plating, @@ -27,6 +39,17 @@ "M" = ( /turf/simulated/shuttle/wall, /area/om_adventure/poi/shuttlewreck1) +"P" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck1) +"W" = ( +/obj/random/tech_supply, +/turf/template_noop, +/area/template_noop) (1,1,1) = {" a @@ -35,7 +58,7 @@ a a a a -a +W a a "} @@ -52,9 +75,9 @@ a "} (3,1,1) = {" e +t e -e -e +g a e a @@ -69,14 +92,14 @@ M M M D -e +g a "} (5,1,1) = {" e e s -m +P m i e @@ -91,7 +114,7 @@ M M M D -e +t a "} (7,1,1) = {" @@ -101,7 +124,7 @@ e e a e -a +v a a "} diff --git a/maps/om_adventure/pois/shuttlewreck2.dmm b/maps/om_adventure/pois/shuttlewreck2.dmm index 33e75a0064..c741ee7055 100644 --- a/maps/om_adventure/pois/shuttlewreck2.dmm +++ b/maps/om_adventure/pois/shuttlewreck2.dmm @@ -7,6 +7,8 @@ /obj/machinery/light{ dir = 8 }, +/obj/random/tech_supply/component, +/obj/random/tech_supply, /turf/simulated/shuttle/floor/white, /area/om_adventure/poi/shuttlewreck2) "e" = ( @@ -42,6 +44,7 @@ /area/om_adventure/poi/shuttlewreck2) "n" = ( /obj/structure/table/steel_reinforced, +/obj/random/awayloot/looseloot, /turf/simulated/shuttle/floor/white, /area/om_adventure/poi/shuttlewreck2) "o" = ( @@ -53,6 +56,8 @@ /obj/machinery/light{ dir = 4 }, +/obj/random/tech_supply, +/obj/random/awayloot/looseloot, /turf/simulated/shuttle/floor/white, /area/om_adventure/poi/shuttlewreck2) "q" = ( @@ -76,6 +81,10 @@ }, /turf/simulated/shuttle/floor/white, /area/om_adventure/poi/shuttlewreck2) +"w" = ( +/obj/tether_away_spawner/spookyland, +/turf/template_noop, +/area/template_noop) "x" = ( /obj/machinery/power/port_gen/pacman, /obj/structure/cable/green{ @@ -89,6 +98,12 @@ "A" = ( /turf/simulated/shuttle/wall, /area/om_adventure/poi/shuttlewreck2) +"B" = ( +/obj/structure/table/steel_reinforced, +/obj/random/tech_supply/component, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) "D" = ( /obj/structure/cable/green{ icon_state = "2-5" @@ -97,6 +112,13 @@ /area/om_adventure/poi/shuttlewreck2) "E" = ( /obj/structure/table/rack/steel, +/obj/random/tech_supply/component, +/obj/random/tech_supply/component, +/obj/random/tech_supply/component, +/obj/random/tech_supply/component, +/obj/random/tech_supply/component, +/obj/random/tech_supply, +/obj/random/tech_supply, /turf/simulated/floor/plating, /area/om_adventure/poi/shuttlewreck2) "J" = ( @@ -107,6 +129,7 @@ "K" = ( /obj/structure/table/rack/steel, /obj/item/weapon/tank/phoron, +/obj/random/awayloot/looseloot, /turf/simulated/floor/plating, /area/om_adventure/poi/shuttlewreck2) "N" = ( @@ -163,7 +186,7 @@ a "} (2,1,1) = {" a -a +w U A A @@ -249,7 +272,7 @@ a a A p -n +B P D v @@ -302,6 +325,6 @@ U a a a -a +w a "} diff --git a/maps/om_adventure/pois/shuttlewreck3.dmm b/maps/om_adventure/pois/shuttlewreck3.dmm index 6ff883c293..005ceb21c9 100644 --- a/maps/om_adventure/pois/shuttlewreck3.dmm +++ b/maps/om_adventure/pois/shuttlewreck3.dmm @@ -2,6 +2,14 @@ "a" = ( /turf/template_noop, /area/template_noop) +"c" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck3) +"f" = ( +/obj/random/tech_supply, +/turf/template_noop, +/area/template_noop) "h" = ( /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/shuttlewreck3) @@ -18,6 +26,7 @@ /area/om_adventure/poi/shuttlewreck3) "u" = ( /obj/item/weapon/material/shard/shrapnel, +/obj/random/awayloot/looseloot, /turf/simulated/shuttle/floor/white, /area/om_adventure/poi/shuttlewreck3) "x" = ( @@ -25,6 +34,7 @@ /turf/simulated/floor/plating, /area/om_adventure/poi/shuttlewreck3) "D" = ( +/obj/random/tech_supply, /turf/simulated/floor/plating, /area/om_adventure/poi/shuttlewreck3) "F" = ( @@ -33,7 +43,7 @@ /turf/simulated/floor/plating, /area/om_adventure/poi/shuttlewreck3) "H" = ( -/obj/random/awayloot, +/obj/random/tech_supply/component, /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/shuttlewreck3) "I" = ( @@ -59,7 +69,7 @@ /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/shuttlewreck3) "Z" = ( -/mob/living/simple_mob/vore/alienanimals/space_ghost, +/obj/tether_away_spawner/spookyland, /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/shuttlewreck3) @@ -96,7 +106,7 @@ a h h h -a +f a "} (5,1,1) = {" @@ -104,16 +114,16 @@ a h S h -h +H a a "} (6,1,1) = {" a a +c h h -H a a "} @@ -128,7 +138,7 @@ a "} (8,1,1) = {" a -h +H D h I @@ -159,7 +169,7 @@ h k Q k -h +H m "} (12,1,1) = {" @@ -184,7 +194,7 @@ h a a a -h +Z a a a diff --git a/maps/om_adventure/pois/shuttlewreck4.dmm b/maps/om_adventure/pois/shuttlewreck4.dmm index 8c650cde28..28fc4367d9 100644 --- a/maps/om_adventure/pois/shuttlewreck4.dmm +++ b/maps/om_adventure/pois/shuttlewreck4.dmm @@ -2,13 +2,25 @@ "a" = ( /turf/simulated/floor/weird_things/dark, /area/om_adventure/poi/shuttlewreck4) +"e" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shuttlewreck4) "g" = ( /obj/item/frame/apc, /turf/template_noop, /area/template_noop) +"h" = ( +/obj/random/tech_supply/component, +/turf/template_noop, +/area/template_noop) "j" = ( /turf/template_noop, /area/template_noop) +"o" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck4) "p" = ( /obj/machinery/light{ dir = 4 @@ -37,12 +49,30 @@ "x" = ( /turf/simulated/floor/plating/eris/airless, /area/om_adventure/poi/shuttlewreck4) +"y" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) "C" = ( /obj/structure/bed/chair/bay/shuttle{ dir = 1 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/om_adventure/poi/shuttlewreck4) +"D" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/random/tech_supply, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) +"H" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck4) "I" = ( /obj/structure/bed/chair/bay/shuttle{ dir = 8 @@ -57,11 +87,19 @@ }, /turf/simulated/floor/plating/eris/airless, /area/om_adventure/poi/shuttlewreck4) +"K" = ( +/obj/tether_away_spawner/spookyland, +/turf/template_noop, +/area/template_noop) "M" = ( /obj/structure/low_wall/eris/reinforced, /obj/structure/window/eris, /turf/simulated/floor/plating, /area/om_adventure/poi/shuttlewreck4) +"O" = ( +/obj/random/tech_supply, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shuttlewreck4) "P" = ( /obj/structure/frame/computer, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, @@ -75,10 +113,15 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/om_adventure/poi/shuttlewreck4) +"T" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shuttlewreck4) "V" = ( /obj/machinery/light{ dir = 8 }, +/obj/random/awayloot/looseloot, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/om_adventure/poi/shuttlewreck4) "X" = ( @@ -105,7 +148,7 @@ a j j j -a +H j a "} @@ -117,7 +160,7 @@ j j a j -j +h j j j @@ -130,14 +173,14 @@ j j j j -a +o a g a a a j -a +o a a v @@ -147,15 +190,15 @@ j j j j -j -a -a +h a a a a a a +H +H v v j @@ -184,9 +227,9 @@ a v V q +e q -q -q +O v M v @@ -195,7 +238,7 @@ v j "} (7,1,1) = {" -a +o v M M @@ -206,7 +249,7 @@ I q t Y -Y +y v j j @@ -217,12 +260,12 @@ M P C q -C +D v X q q -q +T q M j @@ -233,7 +276,7 @@ a v M M -q +e Y Y Y @@ -254,7 +297,7 @@ p q q q -q +e v M v @@ -325,7 +368,7 @@ j j j j -j +K j j j diff --git a/maps/om_adventure/pois/woodentemple.dmm b/maps/om_adventure/pois/woodentemple.dmm new file mode 100644 index 0000000000..4a6dd94d5f --- /dev/null +++ b/maps/om_adventure/pois/woodentemple.dmm @@ -0,0 +1,533 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/bed/chair/sofa/pew/right{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"c" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wmarble, +/area/om_adventure/poi/woodentemple) +"d" = ( +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"e" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/outdoors/grass, +/area/om_adventure/poi/woodentemple) +"f" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/floor, +/area/om_adventure/poi/woodentemple) +"g" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"j" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"k" = ( +/obj/structure/bed/pod, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"m" = ( +/obj/structure/bed/chair/sofa/pew/right{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"o" = ( +/obj/structure/table/rack/steel, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wmarble, +/area/om_adventure/poi/woodentemple) +"r" = ( +/turf/simulated/floor/outdoors/grass, +/area/om_adventure/poi/woodentemple) +"s" = ( +/obj/structure/table/woodentable, +/obj/item/trash/candle, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"v" = ( +/obj/structure/table/woodentable, +/obj/random/maintenance, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"w" = ( +/obj/structure/bed/chair/sofa/pew/left, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"x" = ( +/obj/structure/curtain/black{ + anchored = 1; + icon_state = "open"; + opacity = 0 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"A" = ( +/obj/structure/curtain/black{ + anchored = 1 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"C" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"E" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"F" = ( +/obj/structure/bed/chair/sofa/pew/right, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"G" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/wmarble, +/area/om_adventure/poi/woodentemple) +"H" = ( +/turf/simulated/floor/wmarble, +/area/om_adventure/poi/woodentemple) +"J" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/obj/item/trash/candle, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"K" = ( +/obj/structure/table/rack/steel, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"M" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"N" = ( +/obj/structure/bed/chair/sofa/pew/left{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"Q" = ( +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"R" = ( +/turf/simulated/floor/carpet, +/area/om_adventure/poi/woodentemple) +"S" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor, +/area/om_adventure/poi/woodentemple) +"U" = ( +/obj/structure/bed/chair/sofa/pew/left{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"Z" = ( +/turf/simulated/wall/hardwood, +/area/om_adventure/poi/woodentemple) + +(1,1,1) = {" +a +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +a +a +a +"} +(2,1,1) = {" +r +r +Z +r +r +r +r +r +r +r +r +r +r +r +r +r +Z +r +r +a +a +"} +(3,1,1) = {" +r +Z +Z +Z +Z +S +f +S +Z +Z +Z +S +S +S +Z +Z +Z +Z +r +r +a +"} +(4,1,1) = {" +r +r +Z +J +v +d +C +j +d +A +d +m +N +Q +J +v +Z +r +r +r +a +"} +(5,1,1) = {" +r +r +S +Q +d +j +g +d +d +x +d +d +d +g +d +d +S +r +r +r +r +"} +(6,1,1) = {" +r +r +S +w +d +d +d +C +d +A +d +d +d +d +K +K +Z +r +Z +r +r +"} +(7,1,1) = {" +r +r +S +F +d +d +Z +Z +G +Z +Z +d +R +d +Z +Z +Z +Z +Z +Z +r +"} +(8,1,1) = {" +r +r +Z +M +d +d +S +r +r +r +S +R +R +R +Z +o +H +H +Z +r +r +"} +(9,1,1) = {" +r +r +Z +E +g +d +S +r +e +r +S +R +R +R +G +H +c +H +G +r +r +"} +(10,1,1) = {" +r +r +Z +v +d +d +S +r +r +r +S +R +R +R +Z +o +H +H +Z +r +r +"} +(11,1,1) = {" +r +r +S +w +d +d +Z +Z +G +Z +Z +d +R +d +Z +Z +Z +Z +Z +Z +r +"} +(12,1,1) = {" +r +r +S +F +d +d +d +d +d +A +d +d +d +d +d +d +Z +r +Z +r +r +"} +(13,1,1) = {" +r +r +S +Q +d +d +d +g +d +x +d +g +d +d +d +s +S +r +r +r +r +"} +(14,1,1) = {" +r +r +Z +s +E +k +k +k +d +A +d +U +b +Q +v +E +Z +r +r +r +a +"} +(15,1,1) = {" +r +Z +Z +Z +Z +S +S +S +Z +Z +Z +S +S +S +Z +Z +Z +Z +r +r +a +"} +(16,1,1) = {" +r +r +Z +r +r +r +r +r +r +r +r +r +r +r +r +r +Z +r +r +a +a +"} +(17,1,1) = {" +a +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +a +a +a +"}