From 29f461c8a266504a4827fec996974bed21f0c771 Mon Sep 17 00:00:00 2001 From: Jamini Date: Mon, 25 Sep 2023 16:10:16 -0400 Subject: [PATCH 1/3] Adjustment to maint based on user event in section two Adds four new deepmaint rooms --- maps/CEVEris/_CEV_Eris.dmm | 286 ++++++++++-------- .../deepmaint_rooms/normal/normal_rooms.dm | 20 ++ .../deepmaint_rooms/normal/oopsallslimes.dmm | 45 +++ .../normal/oopsallspooders.dmm | 43 +++ .../deepmaint_rooms/normal/roachracer.dmm | 40 +++ .../deepmaint_rooms/normal/worstnightmare.dmm | 22 ++ 6 files changed, 325 insertions(+), 131 deletions(-) create mode 100644 zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallslimes.dmm create mode 100644 zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallspooders.dmm create mode 100644 zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/roachracer.dmm create mode 100644 zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/worstnightmare.dmm diff --git a/maps/CEVEris/_CEV_Eris.dmm b/maps/CEVEris/_CEV_Eris.dmm index 6df56489d2..b72b9f2a75 100644 --- a/maps/CEVEris/_CEV_Eris.dmm +++ b/maps/CEVEris/_CEV_Eris.dmm @@ -11742,6 +11742,9 @@ /area/eris/hallway/side/atmosphericshallway) "aCz" = ( /obj/structure/multiz/ladder, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint_panels, /area/eris/maintenance/section2deck4port) "aCA" = ( @@ -13261,21 +13264,17 @@ /turf/simulated/floor/reinforced/airless, /area/eris/engineering/atmos) "aGG" = ( -/obj/structure/closet, -/obj/spawner/pack/tech_loot/low_chance, -/obj/spawner/pack/tech_loot/low_chance, -/obj/spawner/lowkeyrandom, -/obj/spawner/lowkeyrandom/low_chance, -/obj/spawner/lowkeyrandom/low_chance, -/turf/simulated/floor/tiled/steel, -/area/eris/maintenance/section2deck4central) +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/open, +/area/eris/maintenance/section2deck4port) "aGH" = ( -/obj/structure/closet, -/obj/spawner/ammo/lowcost/low_chance, -/obj/spawner/ammo/lowcost/low_chance, -/obj/spawner/pack/tech_loot/low_chance, -/obj/spawner/pack/tech_loot/low_chance, -/turf/simulated/floor/tiled/steel, +/obj/structure/lattice, +/obj/structure/catwalk, +/obj/spawner/traps/low_chance, +/turf/simulated/open, /area/eris/maintenance/section2deck4central) "aGI" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -13482,8 +13481,11 @@ /turf/simulated/floor/reinforced/airless, /area/eris/engineering/atmos) "aHk" = ( -/obj/spawner/traps/low_chance, -/turf/simulated/floor/tiled/steel, +/obj/machinery/door/airlock/maintenance_common{ + name = "Service Maintenance"; + req_access = list(12) + }, +/turf/simulated/floor/tiled/techmaint_cargo, /area/eris/maintenance/section2deck4central) "aHl" = ( /obj/machinery/door/firedoor, @@ -13690,11 +13692,8 @@ /turf/simulated/floor/tiled/dark/techfloor, /area/eris/engineering/atmos) "aHN" = ( -/obj/structure/table/rack/shelf, -/obj/spawner/booze, -/obj/spawner/pack/tech_loot, -/obj/spawner/pack/tech_loot, -/turf/simulated/floor/tiled/steel, +/obj/structure/girder, +/turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4central) "aHO" = ( /turf/simulated/floor/tiled/steel, @@ -13722,12 +13721,16 @@ /turf/simulated/floor/tiled/dark/danger, /area/eris/engineering/atmos) "aHR" = ( -/turf/simulated/floor/tiled/steel, +/obj/structure/railing{ + dir = 1 + }, +/obj/item/stack/rods, +/turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4central) "aHS" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck4central) "aHT" = ( /obj/structure/multiz/stairs/active/bottom{ @@ -13895,8 +13898,8 @@ /turf/simulated/floor/tiled/steel, /area/eris/rnd/chargebay) "aIs" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled/steel, +/obj/structure/lattice, +/turf/simulated/open, /area/eris/maintenance/section2deck4central) "aIt" = ( /obj/machinery/alarm{ @@ -13907,8 +13910,8 @@ /area/eris/quartermaster/disposaldrop) "aIu" = ( /obj/structure/table/reinforced, -/obj/item/hand_labeler, -/turf/simulated/floor/tiled/steel, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck4central) "aIv" = ( /obj/machinery/atmospherics/binary/pump{ @@ -14365,7 +14368,8 @@ /obj/spawner/surgery_tool/low_chance, /obj/spawner/medical_lowcost/low_chance, /obj/spawner/medical_lowcost/low_chance, -/turf/simulated/floor/tiled/steel, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck4central) "aJC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -14569,9 +14573,7 @@ /turf/simulated/floor/tiled/dark/danger, /area/turret_protected/ai) "aKe" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/steel, +/turf/simulated/wall/untinted/onestar_reinforced, /area/eris/maintenance/section2deck4central) "aKf" = ( /turf/simulated/floor/tiled/dark/danger, @@ -14594,8 +14596,12 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section4deck5starboard) "aKi" = ( -/obj/spawner/pack/machine, -/turf/simulated/floor/tiled/steel, +/obj/spawner/traps/low_chance, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4central) "aKj" = ( /obj/machinery/camera/network/command{ @@ -20036,6 +20042,7 @@ /obj/structure/bed/chair{ dir = 8 }, +/obj/landmark/join/start/assistant, /turf/simulated/floor/tiled/techmaint_perforated, /area/eris/maintenance/section2deck4port) "aWX" = ( @@ -23700,7 +23707,7 @@ /turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4starboard) "beu" = ( -/obj/spawner/traps/low_chance, +/obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck4port) "bev" = ( @@ -24149,16 +24156,8 @@ /obj/machinery/vending/cola, /turf/simulated/floor/tiled/steel/gray_platform, /area/eris/command/courtroom) -"bfD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/spawner/traps/low_chance, -/turf/simulated/floor/tiled/techmaint, -/area/eris/maintenance/section2deck4central) "bfE" = ( -/obj/structure/reagent_dispensers/fueltank, +/obj/effect/window_lwall_spawn/smartspawn, /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck4central) "bfF" = ( @@ -24199,16 +24198,8 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section3deck1central) "bfJ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/railing{ - dir = 8 - }, +/obj/structure/multiz/ladder, +/obj/structure/catwalk, /turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4central) "bfK" = ( @@ -24463,11 +24454,8 @@ /turf/simulated/floor/tiled/techmaint, /area/eris/maintenance/section2deck4central) "bgp" = ( -/obj/machinery/door/airlock/maintenance_common{ - name = "Service Maintenance"; - req_access = list(12) - }, -/turf/simulated/floor/tiled/techmaint_cargo, +/obj/item/stack/rods, +/turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4central) "bgq" = ( /obj/structure/disposalpipe/segment{ @@ -24725,7 +24713,9 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/obj/spawner/traps/low_chance, +/turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4central) "bgW" = ( /obj/structure/disposalpipe/segment, @@ -41818,10 +41808,10 @@ /area/eris/neotheology/chapelritualroom) "bVi" = ( /obj/spawner/junk/low_chance, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4central) "bVj" = ( /obj/structure/cable/green{ @@ -43081,10 +43071,6 @@ name = "Kitchen Freezer"; req_access = list(28) }, -/obj/machinery/door/airlock{ - name = "Kitchen Freezer Maintenance"; - req_access = list(28) - }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white/brown_platform, /area/eris/crew_quarters/kitchen) @@ -47139,11 +47125,9 @@ /turf/simulated/floor/tiled/steel/bar_dance, /area/eris/crew_quarters/bar) "cio" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/landmark/join/start/assistant, -/turf/simulated/floor/tiled/steel, +/obj/structure/catwalk, +/obj/item/stack/rods, +/turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4central) "cip" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -57336,11 +57320,14 @@ /turf/simulated/floor/plating, /area/eris/hallway/main/section4) "cHx" = ( -/obj/structure/table/rack/shelf, -/obj/spawner/pack/tech_loot, -/obj/spawner/pack/tech_loot, -/obj/spawner/pack/tech_loot, -/turf/simulated/floor/tiled/steel, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/item/stack/rods, +/turf/simulated/floor/plating/under, /area/eris/maintenance/section2deck4central) "cHy" = ( /obj/structure/disposalpipe/segment, @@ -101637,6 +101624,13 @@ /obj/structure/catwalk, /turf/simulated/floor/plating/under, /area/eris/maintenance/section3deck4central) +"gPs" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/spawner/junk/low_chance, +/turf/simulated/floor/plating/under, +/area/eris/maintenance/section2deck4central) "gPD" = ( /obj/effect/window_lwall_spawn/smartspawn, /obj/machinery/door/blast/shutters{ @@ -105685,6 +105679,16 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/eris/medical/medbreak) +"meE" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/eris/maintenance/section2deck4central) "meP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -107814,6 +107818,13 @@ }, /turf/simulated/floor/tiled/white, /area/eris/medical/reception) +"owJ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/eris/maintenance/section2deck4central) "owL" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4; @@ -110705,6 +110716,17 @@ /obj/structure/curtain/black, /turf/simulated/floor/wood, /area/eris/maintenance/section4deck4central) +"sny" = ( +/obj/structure/railing{ + reinforced = 1; + reinforcement_security = 40 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/eris/maintenance/section2deck4central) "snC" = ( /obj/structure/closet/secure_closet/personal/doctor, /obj/machinery/camera/network/medbay{ @@ -110955,8 +110977,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" + dir = 8 }, /turf/simulated/floor/plating/under, /area/eris/hallway/main/section2) @@ -114974,6 +114995,9 @@ }, /turf/simulated/floor/wood, /area/eris/crew_quarters/hydroponics) +"xMW" = ( +/turf/simulated/wall/untinted/onestar_reinforced, +/area/eris/hallway/side/morguehallway) "xNA" = ( /obj/structure/railing{ dir = 4 @@ -172183,7 +172207,7 @@ aaa aaa aaa cIS -blJ +aGG bew cOq bsw @@ -173399,11 +173423,11 @@ aYb aXt cOq cOq -cIS -cIS auG -auG -bcH +aKe +aKe +aKe +xMW dvI kCh dwn @@ -173601,11 +173625,11 @@ aBZ bHD baT cOq -dcf -beu -aCN -aCN -bcH +aHk +aKi +bfK +gPs +xMW bdy beA jqq @@ -173803,11 +173827,11 @@ aCc aCc aCc bew -aCc -cJp -aCN -aCD -bcH +aDd +bfJ +bfK +gPs +xMW bdJ bff jqq @@ -174005,13 +174029,13 @@ aCz aXW aXW cOq -auG -auG -auG +aHN +bfK +cHx bgp -bcH -bcH -bcH +xMW +xMW +xMW bkq bkq bkq @@ -174207,11 +174231,11 @@ baR baS bek cgV -auG -aGG +aHN +bfK bVi -aHR -aDd +bqe +aHN bgQ bhA bhN @@ -174412,8 +174436,8 @@ auG auG aGH aHR -aHR -aDd +bqe +aHN bgS bhH bhO @@ -174612,11 +174636,11 @@ bbM aCD aCN bbV -aHk -aHR +bfK +owJ aIs aDd -aDd +aHN aDd bgo biK @@ -174813,12 +174837,12 @@ aCN aDd bel aCN -aDd aHN -aHR -aHR +bfK +meE +sny aJB -aKi +beQ aDd bhP bjf @@ -175016,11 +175040,11 @@ aDd bel beK aDd -cHx -aHR +bfK cio -aHR -aHR +cio +bfK +bfK aDd nJm bjf @@ -175217,11 +175241,11 @@ aDd aDd bem aCN -aDd +aHN aDd aHS aIu -aKe +bfK aDd aDd pZm @@ -175420,10 +175444,10 @@ bbV aCN aCN bbV -bfD -bel -aCN -aCN +bgV +bfK +bfK +bfK bgV bbM qXg @@ -175623,10 +175647,10 @@ aDd aDd aDd bfE -aCN -aCN -bem -bel +bfE +bfE +bfE +bfE aDd rPO biK @@ -175824,11 +175848,11 @@ bcI ben ben beX -bfJ -bfJ -bfJ -bfJ -bfJ +ben +ben +ben +ben +ben ben bia bjl diff --git a/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/normal_rooms.dm b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/normal_rooms.dm index 02d5ee4ed8..8b1c264231 100644 --- a/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/normal_rooms.dm +++ b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/normal_rooms.dm @@ -7,3 +7,23 @@ name = "unfinished containment" desc = "hope it wasn't anything important..." mappath = 'zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/unfinishedcontainment.dmm' + +/datum/map_template/deepmaint_template/room/worstnightmare + name = "worst nightmare" + desc = "so many doors" + mappath = 'zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/worstnightmare.dmm' + +/datum/map_template/deepmaint_template/room/oopsallslimes + name = "oops all slimes" + desc = "exponential entropy" + mappath = 'zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallslimes.dmm' + +/datum/map_template/deepmaint_template/room/roachracer + name = "roach racer" + desc = "this is probably a bad idea" + mappath = 'zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/roachracer.dmm' + +/datum/map_template/deepmaint_template/room/oopsallspooders + name = "juiceboxed" + desc = "that is a lot of legs" + mappath = 'zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallspooders.dmm' diff --git a/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallslimes.dmm b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallslimes.dmm new file mode 100644 index 0000000000..44b00ac84b --- /dev/null +++ b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallslimes.dmm @@ -0,0 +1,45 @@ +"a" = (/obj/spawner/mob/roaches/cluster,/turf/simulated/floor/tiled/techmaint,/area/space) +"b" = (/turf/simulated/floor/tiled/white/brown_perforated,/area/space) +"c" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/space) +"f" = (/mob/living/carbon/slime,/turf/simulated/floor/reinforced,/area/space) +"g" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white/danger,/area/space) +"i" = (/obj/machinery/light{dir = 1},/obj/item/trash,/turf/simulated/floor/tiled/white/danger,/area/space) +"j" = (/obj/structure/table/reinforced,/obj/machinery/light,/obj/item/stack/material/phoron{layer = 2.9},/obj/item/storage/box/beakers,/obj/item/storage/box/syringes{pixel_x = 3; pixel_y = 3},/turf/simulated/floor/tiled/steel,/area/space) +"k" = (/turf/simulated/wall/r_wall,/area/space) +"l" = (/turf/simulated/floor/tiled/steel,/area/space) +"m" = (/obj/structure/table/reinforced,/obj/structure/extinguisher_cabinet{pixel_x = 24},/obj/item/device/scanner/xenobio,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel,/area/space) +"n" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel,/area/space) +"o" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techmaint,/area/space) +"p" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder/portable,/turf/simulated/floor/tiled/steel,/area/space) +"s" = (/obj/item/gun/projectile/selfload/moebius,/obj/item/ammo_magazine/pistol/highvelocity,/obj/landmark/corpse/doctor,/turf/simulated/floor/tiled/white/brown_perforated,/area/space) +"v" = (/obj/item/trash,/turf/simulated/floor/tiled/white/danger,/area/space) +"x" = (/mob/living/carbon/slime,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/reinforced,/area/space) +"y" = (/obj/spawner/mob/roaches/cluster,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/space) +"z" = (/turf/simulated/floor/tiled/white/danger,/area/space) +"B" = (/obj/structure/sink/kitchen{pixel_y = 26},/turf/simulated/floor/tiled/white/danger,/area/space) +"D" = (/obj/structure/table/reinforced,/obj/item/storage/box/monkeycubes,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel,/area/space) +"F" = (/obj/machinery/door/window/southright{dir = 1; icon_state = "left"; name = "Containment Pen"},/obj/machinery/door/window/southright{icon_state = "left"; name = "Containment Pen"},/turf/simulated/floor/reinforced,/area/space) +"G" = (/obj/effect/window_lwall_spawn/smartspawn,/turf/simulated/floor/tiled/techmaint,/area/space) +"I" = (/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techmaint,/area/space) +"J" = (/turf/simulated/floor/tiled/techmaint,/area/space) +"K" = (/turf/simulated/floor/reinforced,/area/space) +"O" = (/obj/effect/decal/cleanable/dirt,/obj/item/trash,/turf/simulated/floor/tiled/white/danger,/area/space) +"Q" = (/obj/machinery/light,/obj/machinery/computer/operating{dir = 1; name = "Xenobiology Operating Computer"},/turf/simulated/floor/tiled/steel,/area/space) +"R" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/white/danger,/area/space) +"S" = (/obj/machinery/optable{name = "Xenobiology Operating Table"},/turf/simulated/floor/tiled/steel,/area/space) +"V" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white/danger,/area/space) +"W" = (/mob/living/carbon/human/monkey,/turf/simulated/floor/reinforced,/area/space) + +(1,1,1) = {" +aJccJacccoa +JkkkklkkkkI +JkWWklkWWkc +JkfKklkxKkJ +JkGFknkGFkJ +JVzgBzzzziJ +JObbbsbbbzJ +czzRRggzvzJ +JkpjDmkQSkJ +Jkkkkkkkkkc +aJccJaJJJcy +"} diff --git a/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallspooders.dmm b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallspooders.dmm new file mode 100644 index 0000000000..1a6c56dcd3 --- /dev/null +++ b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallspooders.dmm @@ -0,0 +1,43 @@ +"a" = (/obj/effect/decal/cleanable/dirt,/obj/spawner/mob/spiders/cluster,/turf/simulated/floor/plating/under,/area/space) +"c" = (/obj/structure/railing{dir = 8},/obj/structure/railing{dir = 1},/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) +"e" = (/obj/structure/catwalk,/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) +"f" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating/under,/area/space) +"g" = (/obj/structure/railing{dir = 4},/obj/structure/railing{dir = 1},/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) +"h" = (/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 4},/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) +"i" = (/obj/structure/catwalk,/turf/simulated/floor/plating/under,/area/space) +"l" = (/obj/structure/catwalk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating/under,/area/space) +"p" = (/obj/structure/railing{dir = 8},/obj/structure/railing,/turf/simulated/floor/plating/under,/area/space) +"q" = (/obj/effect/spider/stickyweb,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating/under,/area/space) +"t" = (/obj/effect/spider/stickyweb,/obj/effect/decal/cleanable/dirt,/obj/spawner/mob/spiders/cluster,/turf/simulated/floor/plating/under,/area/space) +"u" = (/obj/effect/spider/stickyweb,/obj/structure/railing{dir = 4},/turf/simulated/floor/plating/under,/area/space) +"v" = (/obj/structure/railing,/obj/structure/railing{dir = 8},/turf/simulated/floor/plating/under,/area/space) +"x" = (/obj/structure/railing{dir = 4},/obj/structure/railing,/turf/simulated/floor/plating/under,/area/space) +"y" = (/obj/structure/railing,/obj/structure/railing{dir = 4},/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) +"G" = (/obj/spawner/mob/spiders/cluster,/turf/simulated/floor/plating/under,/area/space) +"H" = (/obj/effect/spider/stickyweb,/obj/structure/railing{dir = 1},/turf/simulated/floor/plating/under,/area/space) +"I" = (/obj/effect/spider/stickyweb,/obj/spawner/mob/spiders/cluster,/turf/simulated/floor/plating/under,/area/space) +"K" = (/obj/effect/spider/stickyweb,/obj/structure/railing,/turf/simulated/floor/plating/under,/area/space) +"L" = (/obj/structure/catwalk,/obj/structure/catwalk,/turf/simulated/floor/plating/under,/area/space) +"N" = (/obj/structure/catwalk,/obj/structure/catwalk,/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) +"O" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) +"P" = (/turf/simulated/wall/r_wall,/area/space) +"Q" = (/obj/effect/spider/stickyweb,/obj/structure/railing{dir = 8},/turf/simulated/floor/plating/under,/area/space) +"R" = (/obj/structure/catwalk,/obj/structure/catwalk,/obj/structure/spider_nest,/obj/item/storage/belt/holding,/turf/simulated/floor/plating/under,/area/space) +"S" = (/obj/structure/catwalk,/obj/structure/catwalk,/obj/effect/spider/stickyweb,/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) +"U" = (/turf/simulated/floor/plating/under,/area/space) +"W" = (/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 8},/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) +"Y" = (/obj/effect/spider/stickyweb,/obj/effect/spider/stickyweb,/turf/simulated/floor/plating/under,/area/space) + +(1,1,1) = {" +ttUOuiQOOIG +aOPPPiPPPOI +UPPOxipOPPf +OPOIiLeIOPq +KPyiNSNivPK +llieNRNiiii +HPhiNNNiWPH +OPOIeliIOPO +OPPOglcUPPO +tqPPPiPPPYI +atOOuiQOUta +"} diff --git a/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/roachracer.dmm b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/roachracer.dmm new file mode 100644 index 0000000000..f41e631f36 --- /dev/null +++ b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/roachracer.dmm @@ -0,0 +1,40 @@ +"a" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/space) +"b" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/tiled/dark,/area/space) +"c" = (/obj/machinery/door/window/southright{dir = 4; icon_state = "left"; name = "Containment Pen"},/obj/machinery/light/small{dir = 1; pixel_y = 19},/obj/item/reagent_containers/food/snacks/loadedbakedpotato,/turf/simulated/floor/tiled/dark/bluecorner,/area/space) +"f" = (/obj/item/roach_egg,/obj/machinery/light/small{dir = 1; pixel_y = 19},/turf/simulated/floor/tiled/dark,/area/space) +"g" = (/obj/machinery/door/window/southright{dir = 4; icon_state = "left"; name = "Containment Pen"},/turf/simulated/floor/tiled/dark,/area/space) +"h" = (/obj/item/roach_egg,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled/dark,/area/space) +"p" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techmaint,/area/space) +"q" = (/obj/structure/window/reinforced,/turf/simulated/floor/tiled/cafe,/area/space) +"s" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled/cafe,/area/space) +"t" = (/turf/simulated/floor/tiled/dark/bluecorner,/area/space) +"u" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/seeds/potatoseed,/obj/item/seeds/potatoseed,/obj/structure/window/reinforced,/turf/simulated/floor/tiled/cafe,/area/space) +"w" = (/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techmaint,/area/space) +"A" = (/obj/spawner/mob/roaches/cluster,/turf/simulated/floor/tiled/techmaint,/area/space) +"C" = (/obj/machinery/light/small{dir = 1; pixel_y = 19},/obj/machinery/door/window/southright{dir = 4; icon_state = "left"; name = "Containment Pen"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/cafe,/area/space) +"D" = (/obj/effect/window_lwall_spawn/smartspawn,/turf/simulated/floor/tiled/techmaint,/area/space) +"F" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/rawcutlet,/obj/item/reagent_containers/food/snacks/rawcutlet,/obj/item/reagent_containers/food/snacks/rawcutlet,/obj/item/reagent_containers/food/snacks/rawcutlet,/obj/item/reagent_containers/food/snacks/rawcutlet,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/cafe,/area/space) +"G" = (/turf/simulated/floor/tiled/techmaint,/area/space) +"I" = (/obj/structure/window/reinforced,/obj/structure/table/reinforced,/obj/item/tool/knife/butch,/turf/simulated/floor/tiled/cafe,/area/space) +"J" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled/dark,/area/space) +"K" = (/obj/item/roach_egg,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled/dark,/area/space) +"L" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/structure/window/reinforced,/turf/simulated/floor/tiled/cafe,/area/space) +"N" = (/obj/structure/window/reinforced,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/cafe,/area/space) +"P" = (/turf/simulated/wall/r_wall,/area/space) +"R" = (/obj/item/roach_egg,/obj/structure/window/reinforced,/turf/simulated/floor/tiled/dark,/area/space) +"T" = (/turf/simulated/floor/tiled/cafe,/area/space) +"Y" = (/obj/structure/bed/chair{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/cafe,/area/space) + +(1,1,1) = {" +aGGpGGGGGaG +GPPPDDDDDPa +GPAJtttttcG +pPPPDDDDDPG +GPAJtttttcG +GPPPDDDDDPG +GPAJtttttca +GPPPDDDDDPa +GKfgTYsssCa +ahRbuLNqIFG +aaGGGGpaawp +"} diff --git a/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/worstnightmare.dmm b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/worstnightmare.dmm new file mode 100644 index 0000000000..9578855221 --- /dev/null +++ b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/worstnightmare.dmm @@ -0,0 +1,22 @@ +"a" = (/turf/simulated/wall/r_wall,/area/space) +"l" = (/obj/effect/decal/cleanable/dirt,/obj/item/trash,/turf/simulated/floor/tiled/techmaint,/area/space) +"o" = (/obj/item/trash,/turf/simulated/floor/tiled/techmaint,/area/space) +"A" = (/obj/item/bikehorn/rubberducky,/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techmaint,/area/space) +"I" = (/turf/simulated/floor/tiled/techmaint,/area/space) +"L" = (/obj/machinery/door/airlock/hatch,/obj/machinery/door/airlock/hatch,/obj/machinery/door/airlock/hatch,/obj/machinery/door/airlock/hatch,/obj/machinery/door/airlock/hatch,/turf/simulated/floor/tiled/techmaint,/area/space) +"Q" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/space) +"Y" = (/obj/machinery/door/airlock/hatch,/obj/machinery/door/airlock/hatch,/obj/machinery/door/airlock/hatch,/turf/simulated/floor/tiled/techmaint,/area/space) + +(1,1,1) = {" +aaoIQaQQIaa +aaaQQaoQaaa +QaaaYaYaaaI +QQaaIQIaaQl +IoYIaLaQYQI +aaalLALQaaa +QIYQaLaIYQo +oIaaIQIaaQQ +IaaaYaYaaaI +aaaQQaIQaaa +aaIoIaQQIaa +"} From bce1848f1944155909fcea9ff78cea2a9ff58c62 Mon Sep 17 00:00:00 2001 From: Jamini Date: Mon, 25 Sep 2023 16:55:47 -0400 Subject: [PATCH 2/3] Expanded deepmaint to include additional mob spawns in the hallways --- code/modules/dungeons/procedural/deepmaint.dm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/code/modules/dungeons/procedural/deepmaint.dm b/code/modules/dungeons/procedural/deepmaint.dm index 75d831744e..003784d9cf 100644 --- a/code/modules/dungeons/procedural/deepmaint.dm +++ b/code/modules/dungeons/procedural/deepmaint.dm @@ -176,6 +176,7 @@ var/global/list/big_deepmaint_room_templates = list() var/niche_count = 20 var/try_count = niche_count * 7 //In case it somehow zig-zags all of the corridors and stucks in a loop var/trap_count = 100 + var/mob_count = 30 //Occulus Edit: Adding some spawners - MIght bump this up later var/list/path_turfs_copy = path_turfs.Copy() while(niche_count > 0 && try_count > 0) try_count = try_count - 1 @@ -188,6 +189,22 @@ var/global/list/big_deepmaint_room_templates = list() var/turf/N = pick(path_turfs_copy) path_turfs_copy -= N new /obj/spawner/traps(N) + while(mob_count > 0)//Occulus Edit Start + mob_count = mob_count -1 + var/turf/N = pick(path_turfs_copy) + path_turfs_copy -= N + if(prob(60)) //60% chance of roaches + new /obj/spawner/mob/roaches/cluster(N) + else if(prob(50)) //20% chance of spiders + new /obj/spawner/mob/spiders/cluster(N) + else if(prob(50)) //10% chance of slimes + new /obj/spawner/mob/slime/cluster(N) + else if(prob(50)) //5% chance of SPUD + new /obj/spawner/mob/spud(N) + else if(prob(80)) //4% chance of roombas + new /obj/spawner/mob/cluster/roombattler(N) + else //1% chance of rainbow slime + new /obj/spawner/mob/slime/rainbow(N)//Occulus Edit End for(var/turf/T in path_turfs) if(prob(30)) new /obj/effect/decal/cleanable/dirt(T) //Wanted to put rust on the floors in deep maint, but by god, the overlay looks like ASS From 361d48a3b61680214262c611fa694ffac91421bf Mon Sep 17 00:00:00 2001 From: Jamini Date: Mon, 25 Sep 2023 17:00:01 -0400 Subject: [PATCH 3/3] adjusting roaches in room --- .../deepmaint_rooms/normal/oopsallslimes.dmm | 85 ++++++++++--------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallslimes.dmm b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallslimes.dmm index 44b00ac84b..d368090e1c 100644 --- a/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallslimes.dmm +++ b/zzzz_modular_occulus/maps/submaps/deepmaint_rooms/normal/oopsallslimes.dmm @@ -1,45 +1,46 @@ -"a" = (/obj/spawner/mob/roaches/cluster,/turf/simulated/floor/tiled/techmaint,/area/space) -"b" = (/turf/simulated/floor/tiled/white/brown_perforated,/area/space) -"c" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/space) -"f" = (/mob/living/carbon/slime,/turf/simulated/floor/reinforced,/area/space) -"g" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white/danger,/area/space) -"i" = (/obj/machinery/light{dir = 1},/obj/item/trash,/turf/simulated/floor/tiled/white/danger,/area/space) -"j" = (/obj/structure/table/reinforced,/obj/machinery/light,/obj/item/stack/material/phoron{layer = 2.9},/obj/item/storage/box/beakers,/obj/item/storage/box/syringes{pixel_x = 3; pixel_y = 3},/turf/simulated/floor/tiled/steel,/area/space) -"k" = (/turf/simulated/wall/r_wall,/area/space) -"l" = (/turf/simulated/floor/tiled/steel,/area/space) -"m" = (/obj/structure/table/reinforced,/obj/structure/extinguisher_cabinet{pixel_x = 24},/obj/item/device/scanner/xenobio,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel,/area/space) -"n" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel,/area/space) -"o" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techmaint,/area/space) -"p" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder/portable,/turf/simulated/floor/tiled/steel,/area/space) -"s" = (/obj/item/gun/projectile/selfload/moebius,/obj/item/ammo_magazine/pistol/highvelocity,/obj/landmark/corpse/doctor,/turf/simulated/floor/tiled/white/brown_perforated,/area/space) -"v" = (/obj/item/trash,/turf/simulated/floor/tiled/white/danger,/area/space) -"x" = (/mob/living/carbon/slime,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/reinforced,/area/space) -"y" = (/obj/spawner/mob/roaches/cluster,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/space) -"z" = (/turf/simulated/floor/tiled/white/danger,/area/space) -"B" = (/obj/structure/sink/kitchen{pixel_y = 26},/turf/simulated/floor/tiled/white/danger,/area/space) -"D" = (/obj/structure/table/reinforced,/obj/item/storage/box/monkeycubes,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel,/area/space) -"F" = (/obj/machinery/door/window/southright{dir = 1; icon_state = "left"; name = "Containment Pen"},/obj/machinery/door/window/southright{icon_state = "left"; name = "Containment Pen"},/turf/simulated/floor/reinforced,/area/space) -"G" = (/obj/effect/window_lwall_spawn/smartspawn,/turf/simulated/floor/tiled/techmaint,/area/space) -"I" = (/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techmaint,/area/space) -"J" = (/turf/simulated/floor/tiled/techmaint,/area/space) -"K" = (/turf/simulated/floor/reinforced,/area/space) -"O" = (/obj/effect/decal/cleanable/dirt,/obj/item/trash,/turf/simulated/floor/tiled/white/danger,/area/space) -"Q" = (/obj/machinery/light,/obj/machinery/computer/operating{dir = 1; name = "Xenobiology Operating Computer"},/turf/simulated/floor/tiled/steel,/area/space) -"R" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/white/danger,/area/space) -"S" = (/obj/machinery/optable{name = "Xenobiology Operating Table"},/turf/simulated/floor/tiled/steel,/area/space) -"V" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white/danger,/area/space) -"W" = (/mob/living/carbon/human/monkey,/turf/simulated/floor/reinforced,/area/space) +"a" = (/turf/simulated/floor/tiled/techmaint,/area/space) +"b" = (/obj/effect/window_lwall_spawn/smartspawn,/turf/simulated/floor/tiled/techmaint,/area/space) +"d" = (/obj/machinery/light,/obj/machinery/computer/operating{dir = 1; name = "Xenobiology Operating Computer"},/turf/simulated/floor/tiled/steel,/area/space) +"e" = (/obj/item/trash,/turf/simulated/floor/tiled/white/danger,/area/space) +"f" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/white/danger,/area/space) +"g" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white/danger,/area/space) +"h" = (/obj/machinery/light{dir = 1},/obj/item/trash,/turf/simulated/floor/tiled/white/danger,/area/space) +"k" = (/turf/simulated/floor/reinforced,/area/space) +"o" = (/obj/spawner/mob/roaches/cluster,/turf/simulated/floor/tiled/white/brown_perforated,/area/space) +"p" = (/obj/structure/table/reinforced,/obj/structure/extinguisher_cabinet{pixel_x = 24},/obj/item/device/scanner/xenobio,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel,/area/space) +"q" = (/obj/structure/table/reinforced,/obj/item/storage/box/monkeycubes,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel,/area/space) +"r" = (/obj/item/gun/projectile/selfload/moebius,/obj/item/ammo_magazine/pistol/highvelocity,/obj/landmark/corpse/doctor,/turf/simulated/floor/tiled/white/brown_perforated,/area/space) +"t" = (/obj/structure/sink/kitchen{pixel_y = 26},/turf/simulated/floor/tiled/white/danger,/area/space) +"v" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder/portable,/turf/simulated/floor/tiled/steel,/area/space) +"w" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techmaint,/area/space) +"y" = (/turf/simulated/floor/tiled/white/danger,/area/space) +"z" = (/mob/living/carbon/slime,/turf/simulated/floor/reinforced,/area/space) +"A" = (/obj/machinery/door/window/southright{dir = 1; icon_state = "left"; name = "Containment Pen"},/obj/machinery/door/window/southright{icon_state = "left"; name = "Containment Pen"},/turf/simulated/floor/reinforced,/area/space) +"B" = (/mob/living/carbon/slime,/turf/simulated/floor/tiled/white/brown_perforated,/area/space) +"C" = (/mob/living/carbon/human/monkey,/turf/simulated/floor/reinforced,/area/space) +"D" = (/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techmaint,/area/space) +"E" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/space) +"F" = (/obj/structure/table/reinforced,/obj/machinery/light,/obj/item/stack/material/phoron{layer = 2.9},/obj/item/storage/box/beakers,/obj/item/storage/box/syringes{pixel_x = 3; pixel_y = 3},/turf/simulated/floor/tiled/steel,/area/space) +"H" = (/turf/simulated/floor/tiled/white/brown_perforated,/area/space) +"I" = (/obj/effect/decal/cleanable/dirt,/mob/living/carbon/slime,/turf/simulated/floor/tiled/white/danger,/area/space) +"K" = (/obj/effect/decal/cleanable/dirt,/obj/item/trash,/turf/simulated/floor/tiled/white/danger,/area/space) +"M" = (/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel,/area/space) +"S" = (/turf/simulated/floor/tiled/steel,/area/space) +"T" = (/mob/living/carbon/slime,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/reinforced,/area/space) +"U" = (/turf/simulated/wall/r_wall,/area/space) +"W" = (/obj/machinery/optable{name = "Xenobiology Operating Table"},/turf/simulated/floor/tiled/steel,/area/space) +"Y" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white/danger,/area/space) (1,1,1) = {" -aJccJacccoa -JkkkklkkkkI -JkWWklkWWkc -JkfKklkxKkJ -JkGFknkGFkJ -JVzgBzzzziJ -JObbbsbbbzJ -czzRRggzvzJ -JkpjDmkQSkJ -Jkkkkkkkkkc -aJccJaJJJcy +aaEEaaEEEwa +aUUUUSUUUUD +aUCCUSUCCUE +aUzzUSUTzUa +aUbkUMUbAUa +agyItyyyyha +aKHHBrHHoya +EyyffYYyeya +aUvFqpUdWUa +aUUUUUUUUUE +aaEEaaaaaEE "}