From 1b26ee62b61e65cbaef40a5d8264dd9c9ccfa0e1 Mon Sep 17 00:00:00 2001 From: InsightfulParasite Date: Mon, 10 Jun 2024 12:59:22 -0400 Subject: [PATCH] Replaces General Mob Spawns in Rooms with Spawners Mod Spawners are less haredcoded and can be edited in the code more easily. Mobs that have map edited names will remain untouched. fix: scatter/steel_noon_fly being the same path as scatter/steel_noon tweak: gcorp.dmm tweak: sweeper_ca.dmm tweak: apartment_lna.dmm tweak: apartment_lsa.dmm tweak: scorp.dmm replaced mobs with spawners. tweak: scorp_warehouse.dmm replaced mobs with spawners tweak: gcorp_armory replaced mobs with spawners tweak: supermarket.dmm replaced mobs with spawners. tweak: gmanager_house.dmm added a wallvent and plate for livelyness. tweak: love_train.dmm i opened the map and a bunch of charge weapons were removed due to not existing anymore. tweak: robot_city.dmm i noticed 2 turrets were shooting constantly at some robots outside of their sight lines so i changed their stat to off. Did not touch turrets at vault door. tweak: shrimp_vault.dmm replaced most with spawners but certain deliberately placed shrimp were left to their own devices. tweak: lcorp_office.dmm rearranged some things for better perspective such as doors and posters. tweak: moved office_kcorp .dmm from medium east to west tweak: dry_cleaners.dmm tweak: freezer_sw contained a varient of amber_bug/morsel that no longer exists. tweak: pet_store puts all the pets in pet boxes because that might make them not process their AI as much. tweak: gcorp_swa.dmm tweak: rat_ssa.dmm replaced the two rats with a elite spawner so its two random elite rats every intialization. Update scorp_vault.dmm replace scatter with mobspawners --- ModularTegustation/lc13_spawners.dm | 82 +- .../backstreets/random_rooms/medium/east.dm | 10 +- .../backstreets/random_rooms/medium/west.dm | 5 + .../backstreets/bossroom/gcorp.dmm | 203 +++- .../backstreets/connector/sweeper_ca.dmm | 33 +- .../backstreets/large_north/apartment_lna.dmm | 1 + .../backstreets/large_north/scorp.dmm | 34 +- .../large_north/scorp_warehouse.dmm | 24 +- .../backstreets/large_south/apartment_lsa.dmm | 9 +- .../backstreets/large_south/gcorp_armory.dmm | 39 +- .../backstreets/large_south/supermarket.dmm | 48 +- .../medium_north/gmanager_house.dmm | 22 +- .../backstreets/medium_south/eyes_temple.dmm | 23 +- .../backstreets/medium_south/theatre.dmm | 20 +- .../medium_west/butcher_medium.dmm | 4 +- .../backstreets/medium_west/lcorp_office.dmm | 81 +- .../office_kcorp.dmm | 0 .../pointofinterest/love_train.dmm | 20 +- .../pointofinterest/robot_city.dmm | 19 +- .../pointofinterest/scorp_vault.dmm | 937 ++++++++++++------ .../backstreets/small_north/apartment_sna.dmm | 9 +- .../backstreets/small_north/pet_store.dmm | 12 + .../backstreets/small_south/rat_ssa.dmm | 22 +- .../small_south/wcorp_base_ssa.dmm | 23 +- .../backstreets/small_west/dry_cleaners.dmm | 33 +- .../backstreets/small_west/freezer_sw.dmm | 13 +- .../backstreets/small_west/gcorp_swa.dmm | 8 +- code/game/objects/effects/spawners/scatter.dm | 10 +- 28 files changed, 1184 insertions(+), 560 deletions(-) rename _maps/RandomRooms/backstreets/{medium_east => medium_west}/office_kcorp.dmm (100%) diff --git a/ModularTegustation/lc13_spawners.dm b/ModularTegustation/lc13_spawners.dm index 711bef4a245a..be7f3798cdac 100644 --- a/ModularTegustation/lc13_spawners.dm +++ b/ModularTegustation/lc13_spawners.dm @@ -106,75 +106,129 @@ /obj/item/tresmetal/indigo = 1 ) +///This spawner scatters the spawned stuff around where it is placed. +/obj/effect/spawner/mobspawner + icon = 'icons/effects/landmarks_static.dmi' + icon_state = "xeno_spawn" + ///determines how many things to scatter + var/max_spawns = 3 + ///determines how big of a range we should scatter things in. + var/radius = 1 + ///This weighted list acts as the loot table for the spawner + var/list/loot_table + + +/obj/effect/spawner/mobspawner/Initialize() + ..() + if(!length(loot_table)) + return INITIALIZE_HINT_QDEL + + var/list/candidate_locations = ReturnPlacementTurfs() + + if(!candidate_locations.len) + return INITIALIZE_HINT_QDEL + + PlaceMobs(candidate_locations) + + return INITIALIZE_HINT_QDEL + +/obj/effect/spawner/mobspawner/proc/ReturnPlacementTurfs() + . = list() + for(var/turf/turf_in_view in view(radius, get_turf(src))) + if(turf_in_view.density) + continue + if(locate(/obj/machinery/door) in turf_in_view) + continue + . += turf_in_view + +/obj/effect/spawner/mobspawner/proc/PlaceMobs(list/places_to_place) + for(var/i = 1 to max_spawns) + if(!places_to_place.len) + break + var/turf/place_to_spawn = pick_n_take(places_to_place) + var/spawned_thing = pickweight(loot_table) + SpawnMob(spawned_thing, place_to_spawn) + +/obj/effect/spawner/mobspawner/proc/SpawnMob(type, turf/spawn_turf) + var/mob/living/L = new type(spawn_turf) + if(ishostile(L)) + var/mob/living/simple_animal/hostile/H = L + H.wander = FALSE + //Pseudo Group Spawners //Amber Worms -/obj/effect/spawner/scatter/amber_dawn +/obj/effect/spawner/mobspawner/amber_dawn name = "amber swarm spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/ordeal/amber_bug = 1) //Green Bots -/obj/effect/spawner/scatter/green_dawn +/obj/effect/spawner/mobspawner/green_dawn name = "bot package spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/ordeal/green_bot = 1) -/obj/effect/spawner/scatter/green_noon +/obj/effect/spawner/mobspawner/green_noon name = "big bot package spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/ordeal/green_bot_big = 1) //Indigo Sweepers -/obj/effect/spawner/scatter/indigo_dawn +/obj/effect/spawner/mobspawner/indigo_dawn name = "sweeper scout pack spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/ordeal/indigo_dawn = 1) -/obj/effect/spawner/scatter/indigo_noon +/obj/effect/spawner/mobspawner/indigo_noon name = "sweeper pack spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/ordeal/indigo_noon = 1) //Steel Roaches -/obj/effect/spawner/scatter/steel_dawn +/obj/effect/spawner/mobspawner/steel_dawn name = "g corp squad spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/ordeal/steel_dawn = 1) -/obj/effect/spawner/scatter/steel_noon +/obj/effect/spawner/mobspawner/steel_noon name = "g corp assault squad spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon = 1) -/obj/effect/spawner/scatter/steel_noon +/obj/effect/spawner/mobspawner/steel_noon_fly + name = "g corp air assault squad spawn" + max_spawns = 5 + loot_table = list(/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying = 1) + +/obj/effect/spawner/mobspawner/steel_dusk_squad name = "g corp air assault squad spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying = 1) //Shrimp -/obj/effect/spawner/scatter/shrimp +/obj/effect/spawner/mobspawner/shrimp name = "shrimp squad spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/shrimp = 4, /mob/living/simple_animal/hostile/shrimp_soldier = 1) -/obj/effect/spawner/scatter/shrimp_melee +/obj/effect/spawner/mobspawner/shrimp_melee name = "fishin shrimp squad spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/shrimp = 1) -/obj/effect/spawner/scatter/shrimp_ranged +/obj/effect/spawner/mobspawner/shrimp_ranged name = "shrimp soldier squad spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/shrimp_soldier = 1) //Backstreet Humanoids -/obj/effect/spawner/scatter/rat +/obj/effect/spawner/mobspawner/rat name = "rat syndicate spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/humanoid/rat = 1) -/obj/effect/spawner/scatter/rat_elite +/obj/effect/spawner/mobspawner/rat_elite name = "rat elite spawn" max_spawns = 1 loot_table = list( @@ -183,7 +237,7 @@ /mob/living/simple_animal/hostile/humanoid/rat/hammer = 3, /mob/living/simple_animal/hostile/humanoid/rat/zippy = 1) -/obj/effect/spawner/scatter/rat_random +/obj/effect/spawner/mobspawner/rat_random name = "rat gang spawn" max_spawns = 5 loot_table = list(/mob/living/simple_animal/hostile/humanoid/rat = 6, diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm index 22b6afb20d99..f417c3bd2298 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm @@ -20,22 +20,16 @@ room_id = "arcade_me" mappath = "_maps/RandomRooms/backstreets/medium_east/arcade_me.dmm" -/datum/map_template/random_room/backstreets/medium_east/office_kcorp - name = "KCorp Office - Medium East" - room_id = "office_kcorp_me" - mappath = "_maps/RandomRooms/backstreets/medium_east/office_kcorp.dmm" - /datum/map_template/random_room/backstreets/medium_east/kcorp_storage name = "KCorp Storage - Medium East" room_id = "kcorp_storage_me" mappath = "_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm" - /datum/map_template/random_room/backstreets/medium_east/zwei_office_mea name = "Zwei Office - Medium East" room_id = "zwei_office_mea" mappath = "_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm" - + /datum/map_template/random_room/backstreets/medium_east/church name = "Church - Medium East" room_id = "church" @@ -50,4 +44,4 @@ name = "Robot - Medium East A" room_id = "robot_mea" mappath = "_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm" - + diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm index 052072a44137..673ac79c883b 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm @@ -21,6 +21,11 @@ mappath = "_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm" stock = 1 +/datum/map_template/random_room/backstreets/medium_east/office_kcorp + name = "KCorp Office - Medium West" + room_id = "office_kcorp_me" + mappath = "_maps/RandomRooms/backstreets/medium_west/office_kcorp.dmm" + /datum/map_template/random_room/backstreets/medium_west/officemwa name = "Office - Medium West A" room_id = "office_mwa" diff --git a/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm b/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm index 2be2ece50a12..8b626340d141 100644 --- a/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm @@ -1,12 +1,51 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"cK" = ( +/obj/effect/spawner/lootdrop/food_random, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"cL" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"cT" = ( +/obj/effect/decal/cleanable/insectguts, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"eb" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "ej" = ( /obj/structure/lootcrate/money, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"gY" = ( +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"hi" = ( +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "hy" = ( /obj/machinery/light/floor, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"iV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"jG" = ( +/obj/machinery/light/broken{ + dir = 1; + pixel_y = 14 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "kx" = ( /obj/item/workshop_mod/sapping/pale, /turf/open/floor/plasteel/dark, @@ -15,8 +54,34 @@ /obj/item/workshop_mod/curing/pale, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"pO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"qZ" = ( +/obj/effect/wall_vent{ + pixel_y = 26 + }, +/obj/effect/decal/cleanable/insectguts, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"sm" = ( +/obj/item/clothing/head/beret/black, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "vv" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/obj/effect/spawner/mobspawner/steel_noon{ + max_spawns = 1; + radius = 2 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"yh" = ( +/obj/effect/decal/cleanable/wrapping, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "An" = ( @@ -27,6 +92,10 @@ /obj/structure/lootcrate/money, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"Dh" = ( +/obj/item/broken_bottle, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "Dt" = ( /obj/item/workshop_mod/throwforce/pale, /turf/open/floor/plasteel/dark, @@ -36,19 +105,49 @@ /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "EQ" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, +/obj/effect/spawner/mobspawner/steel_noon_fly, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "Gl" = ( /obj/effect/gibspawner/generic, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"GZ" = ( +/obj/effect/spawner/lootdrop/medical_random, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Ho" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"HE" = ( +/obj/effect/wall_vent{ + pixel_y = -6; + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "HN" = ( /obj/item/workshop_mod/sharp/pale, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"JZ" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plasteel/airless/dark, +/area/city/backstreets_room) "LC" = ( /obj/item/workshop_mod/healing/pale, +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"LK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/decal/cleanable/plastic, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "NK" = ( @@ -59,13 +158,35 @@ /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "SY" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/obj/effect/spawner/mobspawner/steel_dawn{ + radius = 2 + }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "Td" = ( /obj/effect/landmark/cratespawn, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"UR" = ( +/obj/structure/lootcrate/money, +/obj/effect/decal/cleanable/wrapping, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Xw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"XG" = ( +/obj/effect/decal/cleanable/blood/splatter/over_window, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"XN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/airless/dark, +/area/city/backstreets_room) "ZT" = ( /turf/open/floor/plasteel/dark, /area/city/backstreets_room) @@ -102,16 +223,16 @@ An An An ZT -ZT +gY Gl ZT -An +XG ZT ZT ZT ZT Gl -ZT +yh An "} (3,1,1) = {" @@ -120,17 +241,17 @@ An An An An -An -ZT +XG +cL ZT ZT An ZT ZT ZT +cT ZT -ZT -ZT +pO ZT ZT An @@ -145,17 +266,17 @@ ZT ZT ZT ZT -ZT +eb An ZT +pO ZT ZT ZT ZT ZT ZT -ZT -An +XG An "} (5,1,1) = {" @@ -173,8 +294,8 @@ ZT ZT ZT ZT -ZT -ZT +sm +Xw ZT ZT ZT @@ -195,32 +316,32 @@ ZT ZT ZT ZT +LK +iV ZT -ZT -ZT -ZT +Dh ZT An "} (7,1,1) = {" An ZT -SY ZT +vv ZT ZT ZT ZT ZT An -An +XG ZT ZT Gl +Ho +Ho ZT -ZT -ZT -ZT +pO ZT An "} @@ -229,14 +350,14 @@ An ZT ZT ZT -vv +ZT Eb ZT ZT ZT An An -ZT +qZ ZT ZT ZT @@ -253,14 +374,14 @@ hy ZT ZT ZT -EQ +ZT ZT hy An An An -An -ZT +XG +jG ZT ZT ZT @@ -273,19 +394,19 @@ An ZT ZT ZT -SY ZT ZT +EQ ZT ZT An -ej +UR oq An +XN NK -NK -ZT ZT +pO ZT ZT An @@ -315,19 +436,19 @@ An (12,1,1) = {" An ZT -SY +ZT ZT ZT hy ZT -SY +ZT ZT An ZT An Td An -NK +JZ An ZT ZT @@ -344,7 +465,7 @@ SY ZT ZT An -ZT +GZ ZT ZT HN @@ -366,7 +487,7 @@ ZT ZT ZT An -ZT +cK ZT ZT ZT @@ -388,11 +509,11 @@ ZT ZT ZT ZT +hi ZT ZT ZT -ZT -ZT +HE Gl An An @@ -410,13 +531,13 @@ ZT ZT ZT ZT +hi ZT ZT ZT ZT ZT -ZT -ZT +gY ZT ZT ZT diff --git a/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm b/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm index ef683693c516..26be37783300 100644 --- a/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm @@ -24,6 +24,10 @@ /obj/effect/decal/cleanable/blood/footprints{ dir = 8 }, +/obj/effect/spawner/mobspawner/indigo_dawn{ + max_spawns = 3; + radius = 3 + }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "g" = ( @@ -100,11 +104,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"F" = ( -/obj/structure/stone_tile/slab/cracked, -/mob/living/simple_animal/hostile/ordeal/indigo_noon, -/turf/open/floor/plating/dirt/jungle/wasteland, -/area/city/backstreets_room) "G" = ( /obj/effect/decal/cleanable/blood{ pixel_x = -3; @@ -112,10 +111,6 @@ }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"H" = ( -/mob/living/simple_animal/hostile/ordeal/indigo_noon, -/turf/open/floor/plating/dirt/jungle/dark, -/area/city/backstreets_room) "I" = ( /obj/structure/stone_tile/slab/cracked, /turf/open/floor/plating/dirt/jungle/wasteland, @@ -189,7 +184,11 @@ /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "X" = ( -/mob/living/simple_animal/hostile/ordeal/indigo_spawn, +/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/spawner/mobspawner/indigo_noon{ + max_spawns = 3; + radius = 3 + }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "Y" = ( @@ -244,10 +243,10 @@ q B S x -H +S S L -X +S V a a @@ -290,7 +289,7 @@ Q Q S S -X +S x S D @@ -310,7 +309,7 @@ S g S S -V +X T f S @@ -341,14 +340,14 @@ Q Q S I -F +I S S Z S Y S -X +S S c A @@ -378,7 +377,7 @@ Z S i Y -H +S S V D diff --git a/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm b/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm index 987f1adbef3f..46cc8500f3dc 100644 --- a/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm @@ -319,6 +319,7 @@ }, /obj/structure/closet/secure_closet/freezer/meat/open, /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/food_random, /turf/open/floor/plasteel/sepia, /area/city/backstreets_room) "Y" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/scorp.dmm b/_maps/RandomRooms/backstreets/large_north/scorp.dmm index 8ca7bf48feef..bc22ca735769 100644 --- a/_maps/RandomRooms/backstreets/large_north/scorp.dmm +++ b/_maps/RandomRooms/backstreets/large_north/scorp.dmm @@ -117,16 +117,30 @@ /obj/effect/turf_decal/siding/purple{ dir = 4 }, -/mob/living/simple_animal/hostile/shrimp, /obj/structure/chair/comfy/lime{ dir = 8 }, +/obj/effect/spawner/mobspawner/shrimp_melee{ + max_spawns = 2 + }, /turf/open/floor/carpet/purple, /area/city/backstreets_room) "u" = ( -/mob/living/simple_animal/hostile/shrimp_soldier, +/obj/effect/spawner/mobspawner/shrimp_ranged{ + max_spawns = 1; + radius = 0 + }, /turf/open/floor/wood, /area/city/backstreets_room) +"v" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/structure/chair/comfy/lime{ + dir = 8 + }, +/turf/open/floor/carpet/purple, +/area/city/backstreets_room) "w" = ( /obj/effect/turf_decal/siding/purple{ dir = 6 @@ -147,8 +161,12 @@ /turf/open/floor/carpet/purple, /area/city/backstreets_room) "y" = ( -/mob/living/simple_animal/hostile/shrimp_soldier, -/turf/open/floor/plasteel/vaporwave, +/obj/effect/spawner/mobspawner/shrimp_melee{ + max_spawns = 2 + }, +/turf/open/floor/plasteel/rockvault/alien{ + name = "floor" + }, /area/city/backstreets_room) "z" = ( /obj/effect/turf_decal/siding/purple{ @@ -387,7 +405,7 @@ L L T d -t +v t w T @@ -416,10 +434,10 @@ L (12,1,1) = {" L G -y U U -y +U +U G L "} @@ -427,7 +445,7 @@ L L R o -o +y o o A diff --git a/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm b/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm index 3340021e3ed7..d307b7617d5a 100644 --- a/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm +++ b/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm @@ -10,7 +10,6 @@ max_integrity = 10000; name = "shrimp display window" }, -/mob/living/simple_animal/hostile/shrimp_soldier, /turf/open/floor/plasteel/rockvault/alien{ name = "floor" }, @@ -43,9 +42,18 @@ /obj/structure/window/reinforced, /turf/open/floor/mineral/gold, /area/city/backstreets_room) +"p" = ( +/obj/effect/spawner/mobspawner/shrimp_ranged, +/turf/open/floor/plasteel/rockvault/alien{ + name = "floor" + }, +/area/city/backstreets_room) "r" = ( /obj/structure/chair/office, -/mob/living/simple_animal/hostile/shrimp, +/obj/effect/spawner/mobspawner/shrimp_melee{ + radius = 0; + max_spawns = 1 + }, /turf/open/floor/carpet/purple, /area/city/backstreets_room) "t" = ( @@ -115,7 +123,6 @@ /turf/open/floor/carpet/purple, /area/city/backstreets_room) "N" = ( -/mob/living/simple_animal/hostile/shrimp_soldier, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) "O" = ( @@ -154,7 +161,6 @@ /turf/open/floor/mineral/gold, /area/city/backstreets_room) "Z" = ( -/mob/living/simple_animal/hostile/shrimp_soldier, /turf/open/floor/plasteel/rockvault/alien{ name = "floor" }, @@ -225,7 +231,7 @@ L J Z Z -Z +p Z J L @@ -233,7 +239,7 @@ L (8,1,1) = {" L J -Z +p Z Z Z @@ -256,7 +262,7 @@ J Z W W -Z +p J L "} @@ -273,7 +279,7 @@ L (12,1,1) = {" L J -Z +p W W Z @@ -286,7 +292,7 @@ J Z Z Z -Z +p J L "} diff --git a/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm b/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm index a3e57d50939b..70b860e3af30 100644 --- a/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm +++ b/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm @@ -27,7 +27,8 @@ }, /mob/living/simple_animal/hostile/ordeal/indigo_noon{ dir = 1; - name = "Prost" + name = "Prost"; + wander = 0 }, /turf/open/floor/wood, /area/city/backstreets_room) @@ -217,7 +218,8 @@ /obj/effect/decal/cleanable/blood/gibs, /mob/living/simple_animal/hostile/ordeal/indigo_noon{ dir = 1; - name = "Lex" + name = "Lex"; + wander = 0 }, /turf/open/floor/wood, /area/city/backstreets_room) @@ -227,7 +229,8 @@ }, /mob/living/simple_animal/hostile/ordeal/indigo_dawn{ dir = 1; - name = "Willy" + name = "Willy"; + wander = 0 }, /turf/open/floor/wood, /area/city/backstreets_room) diff --git a/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm b/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm index 12be8170a45b..918e1b79df9e 100644 --- a/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm +++ b/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm @@ -4,7 +4,9 @@ /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "e" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, +/obj/effect/spawner/mobspawner/steel_dawn{ + radius = 4 + }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "h" = ( @@ -28,7 +30,9 @@ /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "s" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/obj/effect/spawner/mobspawner/steel_noon_fly{ + max_spawns = 1 + }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "u" = ( @@ -54,16 +58,15 @@ "O" = ( /turf/open/floor/plasteel/dark, /area/city/backstreets_room) -"Q" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, -/turf/open/floor/plasteel/dark, -/area/city/backstreets_room) "T" = ( /obj/effect/landmark/cratespawn, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "W" = ( -/obj/effect/mine/shrapnel, +/obj/effect/spawner/mobspawner/steel_noon{ + radius = 4; + max_spawns = 2 + }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "Y" = ( @@ -95,7 +98,7 @@ L L O O -s +O O O O @@ -104,7 +107,7 @@ L (4,1,1) = {" L O -O +W O O O @@ -113,12 +116,12 @@ L "} (5,1,1) = {" L -Q +O l a h O -s +O L "} (6,1,1) = {" @@ -127,7 +130,7 @@ O O O O -O +s O L "} @@ -153,10 +156,10 @@ L "} (9,1,1) = {" L -e O O -s +e +O O x L @@ -173,7 +176,7 @@ L "} (11,1,1) = {" L -Q +O O O O @@ -188,12 +191,12 @@ l u F O -s +O L "} (13,1,1) = {" L -s +O O O O @@ -213,7 +216,7 @@ L "} (15,1,1) = {" n -W +O O k O diff --git a/_maps/RandomRooms/backstreets/large_south/supermarket.dmm b/_maps/RandomRooms/backstreets/large_south/supermarket.dmm index 66a0685ba75c..8fae2ae4b5a9 100644 --- a/_maps/RandomRooms/backstreets/large_south/supermarket.dmm +++ b/_maps/RandomRooms/backstreets/large_south/supermarket.dmm @@ -24,11 +24,16 @@ /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "k" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/obj/effect/spawner/mobspawner/steel_noon_fly{ + max_spawns = 2 + }, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "l" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, +/obj/effect/spawner/mobspawner/steel_noon_fly{ + max_spawns = 1; + radius = 0 + }, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "m" = ( @@ -72,6 +77,13 @@ dir = 1 }, /area/city/backstreets_room) +"B" = ( +/obj/item/stack/spacecash/c100, +/obj/effect/spawner/mobspawner/steel_noon{ + max_spawns = 2 + }, +/turf/open/floor/plasteel/shuttle, +/area/city/backstreets_room) "C" = ( /obj/item/stack/spacecash/c100, /turf/open/floor/plasteel/shuttle, @@ -95,6 +107,13 @@ /obj/item/dice/fourdd6, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) +"K" = ( +/obj/effect/spawner/mobspawner/steel_dawn{ + max_spawns = 3; + radius = 2 + }, +/turf/open/floor/plasteel/shuttle, +/area/city/backstreets_room) "L" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -104,7 +123,10 @@ /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "O" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/obj/effect/spawner/mobspawner/steel_noon_fly{ + radius = 0; + max_spawns = 1 + }, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "Q" = ( @@ -154,14 +176,14 @@ n b o b -l +O c b L "} (4,1,1) = {" n -O +b x o x @@ -175,16 +197,16 @@ b b b b -O +b b L "} (6,1,1) = {" n b -l b -C +b +B b G L @@ -212,7 +234,7 @@ L (9,1,1) = {" b b -k +b H p b @@ -223,9 +245,9 @@ L n b b +K b -b -l +k f L "} @@ -234,14 +256,14 @@ n C b b -k +b C a L "} (12,1,1) = {" n -k +b b b b diff --git a/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm b/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm index 83fb6d0c106d..5b5c453fd0d9 100644 --- a/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm @@ -41,6 +41,13 @@ /obj/structure/fluff/paper/stack, /turf/open/floor/carpet/purple, /area/city/backstreets_room) +"w" = ( +/obj/structure/chair/wood, +/obj/effect/wall_vent{ + pixel_y = 26 + }, +/turf/open/floor/carpet/purple, +/area/city/backstreets_room) "x" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -71,6 +78,17 @@ /mob/living/simple_animal/hostile/ordeal/steel_dusk, /turf/open/floor/carpet/blue, /area/city/backstreets_room) +"O" = ( +/obj/structure/table/wood, +/obj/item/paper/crumpled{ + pixel_x = 8; + pixel_y = 11 + }, +/obj/item/trash/plate{ + pixel_x = -4 + }, +/turf/open/floor/carpet/purple, +/area/city/backstreets_room) "Q" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -125,9 +143,9 @@ Q "} (7,1,1) = {" Q -B +w t -f +O k Q "} diff --git a/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm b/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm index e0e640fd5bc0..1f21fe3a9468 100644 --- a/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm @@ -5,7 +5,6 @@ /turf/open/indestructible/cult, /area/city/backstreets_room) "g" = ( -/obj/structure/trap/stun, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/stairs{ dir = 8 @@ -17,13 +16,25 @@ /area/city/backstreets_room) "u" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/bigBirdEye, +/mob/living/simple_animal/hostile/ordeal/bigBirdEye{ + wander = 0 + }, +/turf/open/indestructible/cult, +/area/city/backstreets_room) +"y" = ( +/mob/living/simple_animal/hostile/ordeal/bigBirdEye{ + wander = 0 + }, +/obj/structure/trap/stun, +/obj/effect/decal/cleanable/crayon, /turf/open/indestructible/cult, /area/city/backstreets_room) "z" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/bigBirdEye, +/mob/living/simple_animal/hostile/ordeal/bigBirdEye{ + wander = 0 + }, /turf/open/indestructible/cult, /area/city/backstreets_room) "A" = ( @@ -49,7 +60,9 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "L" = ( -/mob/living/simple_animal/hostile/ordeal/bigBirdEye, +/mob/living/simple_animal/hostile/ordeal/bigBirdEye{ + wander = 0 + }, /turf/open/indestructible/cult, /area/city/backstreets_room) "M" = ( @@ -109,8 +122,8 @@ Y "} (5,1,1) = {" Y -L E +y E X Y diff --git a/_maps/RandomRooms/backstreets/medium_south/theatre.dmm b/_maps/RandomRooms/backstreets/medium_south/theatre.dmm index e0b08fdfa0b9..17d84ac2b9f1 100644 --- a/_maps/RandomRooms/backstreets/medium_south/theatre.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/theatre.dmm @@ -30,7 +30,9 @@ /turf/open/floor/carpet/stellar, /area/city/backstreets_room) "k" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/obj/effect/spawner/mobspawner/steel_dawn{ + max_spawns = 2 + }, /turf/open/floor/carpet/stellar, /area/city/backstreets_room) "m" = ( @@ -51,10 +53,9 @@ /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) "q" = ( -/obj/structure/chair/wood{ - dir = 8 +/obj/effect/spawner/mobspawner/steel_dawn{ + max_spawns = 2 }, -/mob/living/simple_animal/hostile/ordeal/steel_dawn, /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) "s" = ( @@ -70,7 +71,10 @@ /turf/open/floor/plating, /area/city/backstreets_room) "v" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/obj/effect/spawner/mobspawner/steel_noon{ + max_spawns = 1; + radius = 0 + }, /turf/open/floor/carpet/stellar, /area/city/backstreets_room) "x" = ( @@ -191,8 +195,8 @@ Q (8,1,1) = {" a W -q -q +W +W x Q "} @@ -200,7 +204,7 @@ Q u x p -x +q x Q "} diff --git a/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm b/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm index 7428d468e83d..4bed3338fe9d 100644 --- a/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm @@ -63,7 +63,9 @@ /turf/open/floor/plasteel/sepia, /area/city/backstreets_room) "E" = ( -/mob/living/simple_animal/hostile/butcher, +/mob/living/simple_animal/hostile/butcher{ + wander = 0 + }, /turf/open/floor/plasteel/sepia, /area/city/backstreets_room) "H" = ( diff --git a/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm b/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm index 4872a10ae7ac..f2dfb431ab80 100644 --- a/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm @@ -3,19 +3,11 @@ /obj/effect/wall_vent, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"b" = ( -/obj/structure/cavein_door, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "d" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/molten_object, /turf/open/floor/facility, /area/city/backstreets_room) -"f" = ( -/obj/structure/sign/poster/lobotomycorp/suckmyenegy, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "i" = ( /obj/machinery/door/airlock/wood, /turf/open/floor/plasteel, @@ -46,7 +38,8 @@ /obj/item/keycard{ pixel_x = -2; pixel_y = -6; - puzzle_id = 00012 + puzzle_id = 00012; + desc = "A keycard for clerk level access to a L corp facility." }, /turf/open/floor/plasteel, /area/city/backstreets_room) @@ -54,21 +47,15 @@ /obj/structure/showcase/machinery/tv, /turf/open/floor/plasteel, /area/city/backstreets_room) -"q" = ( -/obj/structure/sign/poster/contraband/city_cola, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "r" = ( /obj/effect/spawner/randomcolavend, /turf/open/floor/plasteel, /area/city/backstreets_room) -"s" = ( -/obj/structure/sign/departments/l_corp, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "t" = ( -/obj/structure/sign/poster/contraband/eat, -/turf/closed/indestructible/reinforced, +/obj/structure/sign/poster/contraband/eat{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, /area/city/backstreets_room) "x" = ( /turf/closed/indestructible/reinforced, @@ -77,6 +64,9 @@ /obj/structure/chair/sofa/right{ dir = 1 }, +/obj/structure/sign/poster/contraband/city_cola{ + pixel_y = -32 + }, /turf/open/floor/plasteel, /area/city/backstreets_room) "A" = ( @@ -85,7 +75,8 @@ /area/city/backstreets_room) "C" = ( /obj/machinery/door/keycard{ - puzzle_id = 00012 + puzzle_id = 00012; + desc = "A standard high security door. This door only opens when a keycard is swiped. It looks virtually indestructable." }, /obj/effect/step_trigger/sound_effect{ extra_range = 4; @@ -131,6 +122,12 @@ /obj/structure/chair/sofa/left{ dir = 1 }, +/obj/structure/sign/poster/contraband/kudzu{ + pixel_y = -32 + }, +/obj/structure/sign/poster/lobotomycorp/suckmyenegy{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/city/backstreets_room) "L" = ( @@ -153,23 +150,27 @@ /turf/open/floor/facility, /area/city/backstreets_room) "T" = ( -/obj/structure/sign/poster/contraband/bountyhunters, -/turf/closed/indestructible/reinforced, +/obj/structure/sign/poster/official/moth8{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, /area/city/backstreets_room) "U" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/chaotic_random, +/obj/structure/sign/departments/l_corp{ + pixel_y = 32 + }, /turf/open/floor/facility, /area/city/backstreets_room) "V" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/molten_object/large, +/obj/structure/cavein_door{ + pixel_y = 24 + }, /turf/open/floor/facility, /area/city/backstreets_room) -"W" = ( -/obj/structure/sign/poster/official/moth8, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "X" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/wrapping, @@ -180,8 +181,10 @@ /turf/open/floor/plasteel, /area/city/backstreets_room) "Z" = ( -/obj/structure/sign/poster/contraband/kudzu, -/turf/closed/indestructible/reinforced, +/obj/structure/sign/poster/contraband/bountyhunters{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, /area/city/backstreets_room) (1,1,1) = {" @@ -189,27 +192,27 @@ x x x x -t x x -T -f +x +x +x x "} (2,1,1) = {" -b +x V X a -Y +t n p -Y -K Z +K +x "} (3,1,1) = {" -s +x U d A @@ -218,7 +221,7 @@ O E E y -q +x "} (4,1,1) = {" x @@ -236,8 +239,8 @@ x x k P -W -Y +x +T J Y D diff --git a/_maps/RandomRooms/backstreets/medium_east/office_kcorp.dmm b/_maps/RandomRooms/backstreets/medium_west/office_kcorp.dmm similarity index 100% rename from _maps/RandomRooms/backstreets/medium_east/office_kcorp.dmm rename to _maps/RandomRooms/backstreets/medium_west/office_kcorp.dmm diff --git a/_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm b/_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm index 07f317ece410..f85becd38993 100644 --- a/_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm +++ b/_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm @@ -155,11 +155,6 @@ /obj/structure/meatfloor, /turf/open/floor/carpet/blue, /area/city/backstreets_room) -"wh" = ( -/obj/item/ego_weapon/city/charge/wcorp/shield/spear, -/obj/structure/meatfloor, -/turf/open/floor/wood, -/area/city/backstreets_room) "wu" = ( /obj/effect/rune/wall, /turf/open/floor/wood, @@ -309,10 +304,6 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) -"LN" = ( -/obj/item/ego_weapon/city/charge/wcorp/hammer, -/turf/open/floor/wood, -/area/city/backstreets_room) "MA" = ( /turf/closed/mineral/ash_rock, /area/city/backstreets_room) @@ -391,11 +382,6 @@ /obj/structure/meatfloor, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) -"Za" = ( -/obj/item/ego_weapon/city/charge/wcorp, -/obj/structure/meatfloor, -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_room) "ZW" = ( /obj/structure/meatfloor, /obj/structure/meatfloor, @@ -741,7 +727,7 @@ mA Dd mA DB -wh +Dd dX Is Is @@ -920,7 +906,7 @@ MA MA OW zZ -Za +Is Is Is Is @@ -1085,7 +1071,7 @@ zZ zZ zZ dX -LN +mA mA mA Lw diff --git a/_maps/RandomRooms/backstreets/pointofinterest/robot_city.dmm b/_maps/RandomRooms/backstreets/pointofinterest/robot_city.dmm index 808712f2c1c7..780db9d03e2c 100644 --- a/_maps/RandomRooms/backstreets/pointofinterest/robot_city.dmm +++ b/_maps/RandomRooms/backstreets/pointofinterest/robot_city.dmm @@ -173,6 +173,12 @@ }, /turf/open/floor/engine, /area/city/backstreets_room) +"ou" = ( +/obj/machinery/porta_turret/syndicate/energy{ + dir = 10 + }, +/turf/open/floor/engine, +/area/city/backstreets_room) "oG" = ( /obj/structure/table/reinforced, /obj/item/gun/energy/e_gun/rabbitdash, @@ -388,7 +394,10 @@ /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "Be" = ( -/obj/machinery/porta_turret/syndicate/energy, +/obj/machinery/porta_turret/syndicate/energy{ + dir = 1; + on = 0 + }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "BJ" = ( @@ -598,7 +607,9 @@ /turf/open/floor/engine, /area/city/backstreets_room) "PC" = ( -/obj/machinery/porta_turret/syndicate/energy, +/obj/machinery/porta_turret/syndicate/energy{ + dir = 9 + }, /turf/open/floor/engine, /area/city/backstreets_room) "Qg" = ( @@ -1358,7 +1369,7 @@ Ej Zw Zw zZ -PC +ou Zw Zw PC @@ -1390,7 +1401,7 @@ Zw Zw Zw zZ -PC +ou Zw Zw PC diff --git a/_maps/RandomRooms/backstreets/pointofinterest/scorp_vault.dmm b/_maps/RandomRooms/backstreets/pointofinterest/scorp_vault.dmm index 5682986113ab..a182d30fc7b2 100644 --- a/_maps/RandomRooms/backstreets/pointofinterest/scorp_vault.dmm +++ b/_maps/RandomRooms/backstreets/pointofinterest/scorp_vault.dmm @@ -1,22 +1,97 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ap" = ( +/obj/structure/sign/picture_frame/showroom, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"az" = ( +/obj/structure/table/reinforced, +/obj/item/paper/fluff, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"aA" = ( +/obj/structure/table, +/obj/item/food/watermelonslice, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"aP" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plating/dirt/jungle/dark, +/area/city/backstreets_room) "ba" = ( -/obj/effect/mine/explosive, -/obj/machinery/door/airlock/grunge, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "bC" = ( +/obj/effect/spawner/mobspawner/shrimp_melee, +/obj/effect/turf_decal/trimline/brown/filled/arrow_ccw{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"bU" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/dirt/jungle/dark, +/area/city/backstreets_room) +"bZ" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, /obj/structure/lootcrate/s_corp, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) +"cd" = ( +/obj/structure/sign/poster/contraband/eat{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "co" = ( -/mob/living/simple_animal/hostile/shrimp, +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/dirt/jungle/dark, +/area/city/backstreets_room) +"cN" = ( +/obj/effect/turf_decal/sand, +/obj/effect/spawner/mobspawner/shrimp_ranged{ + max_spawns = 1; + radius = 0 + }, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) +"dm" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "dD" = ( -/mob/living/simple_animal/hostile/shrimp, -/obj/item/stack/spacecash/c1000, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) +"ew" = ( +/obj/effect/spawner/mobspawner/shrimp_ranged{ + max_spawns = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"eB" = ( +/obj/effect/spawner/mobspawner/shrimp_melee, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"ft" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/trimline/brown/arrow_ccw, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) "fx" = ( /obj/effect/turf_decal/siding/yellow{ dir = 5 @@ -34,16 +109,37 @@ /obj/effect/turf_decal/siding/yellow, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) +"fO" = ( +/obj/structure/table, +/obj/item/food/cherrycupcake, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "gq" = ( /obj/structure/chair/office{ dir = 8 }, -/mob/living/simple_animal/hostile/shrimp/friendly, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) "hi" = ( /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"iq" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) +"iu" = ( +/obj/effect/turf_decal/caution/stand_clear, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"iy" = ( +/obj/structure/lootcrate/s_corp, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "iB" = ( /obj/machinery/door/airlock/grunge, /turf/open/floor/plasteel/dark, @@ -59,12 +155,26 @@ }, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) +"ji" = ( +/obj/effect/spawner/mobspawner/shrimp_melee, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "kc" = ( /obj/structure/fence/corner{ dir = 3 }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"kf" = ( +/obj/structure/showcase/machinery/tv, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"kx" = ( +/obj/effect/spawner/mobspawner/shrimp_ranged{ + max_spawns = 4 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "kW" = ( /obj/structure/fence/corner, /turf/open/floor/plating/dirt/jungle/dark, @@ -72,12 +182,25 @@ "lB" = ( /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"lI" = ( +/obj/structure/sign/poster/lobotomycorp/wellcheers{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"lZ" = ( +/obj/structure/chair/comfy/teal{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "mn" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal{ dir = 8 }, /obj/item/clipboard, +/obj/item/paper/fluff, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "mA" = ( @@ -89,6 +212,10 @@ }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"mH" = ( +/obj/structure/flora/ash/garden/waste, +/turf/open/floor/plating/dirt/jungle/dark, +/area/city/backstreets_room) "np" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -101,6 +228,21 @@ }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"oZ" = ( +/obj/structure/closet/crate/wooden, +/obj/item/aquarium_kit, +/obj/item/aquarium_prop/lcorp, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"pO" = ( +/obj/effect/turf_decal/trimline/brown/filled/arrow_cw{ + dir = 4 + }, +/obj/structure/sign/poster/lobotomycorp/wellcheers{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "qn" = ( /obj/machinery/door/window/brigdoor/westleft, /obj/effect/turf_decal/siding/yellow{ @@ -114,6 +256,10 @@ }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"tF" = ( +/obj/effect/turf_decal/caution/stand_clear/red, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "us" = ( /obj/structure/table/wood/fancy/green, /obj/effect/turf_decal/siding/yellow{ @@ -124,21 +270,30 @@ }, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) +"uV" = ( +/obj/effect/decal/cleanable/garbage, +/turf/open/floor/plating/dirt/jungle/dark, +/area/city/backstreets_room) "vo" = ( /obj/machinery/door/airlock/survival_pod, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "vH" = ( -/mob/living/simple_animal/hostile/shrimp_soldier, -/turf/open/floor/plasteel/vaporwave, +/obj/structure/sign/poster/lobotomycorp/wellcheers, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"vK" = ( +/obj/structure/table, +/obj/item/paper/crumpled/fluff, +/turf/open/floor/plasteel/dark, /area/city/backstreets_room) "wa" = ( -/mob/living/simple_animal/hostile/shrimp_soldier, +/obj/structure/chair/stool, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "we" = ( -/obj/machinery/door/airlock/grunge, -/obj/effect/mine/explosive, +/obj/item/reagent_containers/food/drinks/sillycup/smallcarton, +/obj/structure/table, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "wu" = ( @@ -153,6 +308,13 @@ }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"xv" = ( +/obj/item/paper/crumpled/bloody/fluff, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "zZ" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -160,12 +322,54 @@ /obj/effect/turf_decal/siding/wideplating/light{ dir = 8 }, -/obj/machinery/door/window/brigdoor/westleft, /obj/effect/turf_decal{ dir = 8 }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"Bw" = ( +/obj/effect/spawner/mobspawner/shrimp_melee{ + max_spawns = 3 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"CM" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/waterbottle/empty, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"CX" = ( +/obj/structure/closet/crate/bin, +/obj/item/stack/spacecash/c100, +/obj/item/reagent_containers/food/drinks/waterbottle/empty, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"DW" = ( +/obj/structure/table, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"DZ" = ( +/obj/effect/decal/cleanable/confetti, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Ea" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Ek" = ( +/obj/effect/decal/cleanable/generic, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Fi" = ( +/obj/effect/turf_decal/sand, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) +"GY" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "Hb" = ( /obj/structure/fence/corner{ dir = 8 @@ -176,24 +380,77 @@ /obj/structure/fence/cut, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"Iw" = ( +/obj/effect/turf_decal/siding/yellow, +/obj/structure/sign/poster/lobotomycorp/wellcheers{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) "Jp" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal{ dir = 8 }, +/obj/item/food/toastedsandwich, /obj/item/stack/spacecash/c100, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"Kc" = ( +/obj/structure/sign/poster/lobotomycorp/wellcheers{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "KF" = ( /obj/machinery/door/airlock/survival_pod, /turf/open/floor/engine, /area/city/backstreets_room) +"KV" = ( +/obj/effect/spawner/mobspawner/shrimp_melee{ + max_spawns = 3 + }, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) +"Ls" = ( +/obj/effect/spawner/mobspawner/shrimp_ranged{ + max_spawns = 4 + }, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) +"LR" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Mg" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "ME" = ( /obj/effect/turf_decal/siding/yellow{ dir = 1 }, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) +"Nq" = ( +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/brown/corner, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) +"NW" = ( +/obj/structure/lootcrate/s_corp, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Pb" = ( +/obj/structure/sign/poster/lobotomycorp/wellcheers{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) "Pf" = ( /obj/structure/table/reinforced, /obj/item/kirbyplants/dead{ @@ -203,20 +460,61 @@ }, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) +"Py" = ( +/obj/effect/turf_decal/trimline/brown/filled/arrow_cw{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "PC" = ( -/obj/structure/table/reinforced, /obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "Qy" = ( -/obj/structure/rack, -/obj/item/stack/spacecash/c1000, +/obj/effect/turf_decal/siding/brown, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) +"QS" = ( +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/plasteel/vaporwave, +/area/city/backstreets_room) +"QV" = ( +/obj/effect/turf_decal/trimline/brown/filled/arrow_ccw{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Rk" = ( +/obj/effect/turf_decal/delivery, +/obj/vehicle/ridden/simple_boat{ + name = "shipping boat"; + desc = "A deceptively small boat used for hauling cargo on water. It looks like at max it can hold one crate. May require an oar to be installed into it for sailing." + }, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) +"Se" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Su" = ( +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "armoryinnerinterest" + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "SS" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"TJ" = ( +/obj/effect/decal/cleanable/food/tomato_smudge, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "TM" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -228,7 +526,7 @@ }, /obj/machinery/button/door/indestructible{ id = "armoryinnerinterest"; - name = "Inner Armory Lockdown Button"; + name = "Shipping Shutters Button"; pixel_x = 28 }, /turf/open/floor/plasteel/vaporwave, @@ -254,10 +552,46 @@ }, /turf/open/floor/engine, /area/city/backstreets_room) +"UX" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/obj/structure/sign/poster/lobotomycorp/wellcheers{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"UY" = ( +/obj/effect/spawner/mobspawner/shrimp_ranged{ + max_spawns = 1; + radius = 0 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Wl" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Wu" = ( +/obj/item/paper/crumpled/muddy/fluff, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "Ya" = ( /obj/structure/lootcrate/s_corp, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"Yn" = ( +/obj/structure/filingcabinet{ + pixel_x = 10 + }, +/obj/structure/filingcabinet, +/obj/structure/filingcabinet{ + pixel_x = -9 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) "YL" = ( /obj/structure/table/reinforced, /obj/item/stack/spacecash/c100, @@ -267,8 +601,9 @@ /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) "ZW" = ( -/mob/living/simple_animal/hostile/shrimp, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/plastic, +/turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) (1,1,1) = {" @@ -311,6 +646,7 @@ hi hi hi hi +bU hi hi hi @@ -321,14 +657,13 @@ hi hi hi hi +bU hi hi hi hi hi -hi -hi -hi +co hi hi hi @@ -349,6 +684,7 @@ hi hi hi hi +co hi hi hi @@ -363,8 +699,7 @@ hi hi hi hi -hi -hi +bU wu "} (4,1,1) = {" @@ -408,24 +743,24 @@ YL Pf YL zZ -TX -lB -lB -TX zZ +zZ +zZ +zZ +vH lB lB -ZW -Ya -lB -lB +lI +lI lB -Ya -Ya -Ya lB +zZ +Mg lB +lI Ya +oZ +kf zZ hi hi @@ -439,14 +774,13 @@ zZ ZS ZS ZS +vH +zZ +Yn +Yn zZ -TX -lB -lB -TX zZ lB -wa lB lB lB @@ -454,10 +788,11 @@ lB lB lB lB -ZW lB lB lB +lB +lZ zZ hi hi @@ -469,27 +804,27 @@ hi hi zZ ZS -vH +Ls ZS zZ TX -wa -lB +ba +ba TX zZ lB lB lB -zZ -zZ -zZ -we -zZ -zZ -zZ lB lB -wa +lB +lB +lB +Bw +lB +lB +DZ +lB zZ hi hi @@ -498,27 +833,27 @@ wu (8,1,1) = {" wu hi -hi +bU zZ -ZS +Pb ZS ZS KF -lB -lB -wa +ba +ew +ba TX zZ lB lB lB +lB +Ya +lB zZ -vH -ZS -ZS -ZS -vH -zZ +lB +lB +lB lB lB lB @@ -534,29 +869,29 @@ hi zZ ZS ZS -vH +ZS zZ TX +ba +ba +TX +vH lB +Ya lB -TX -zZ -ZW lB lB -zZ -ZS -Qy -vH -Qy -ZS -zZ lB +vH lB +wa +DW +aA +wa lB zZ hi -hi +co wu "} (10,1,1) = {" @@ -567,25 +902,25 @@ zZ ZS ZS ZS -zZ +vH TX -lB -lB +ba +ba TX zZ lB lB lB -ba -ZS -vH -Qy -vH -ZS -we lB +Wu lB -ZW +zZ +Ek +wa +we +DW +wa +Kc zZ hi hi @@ -601,24 +936,24 @@ jh qn zZ TX -lB -wa +ba +ba TX zZ lB lB -ZW -zZ -ZS -Qy -vH -Qy -ZS -zZ lB +Ya lB lB zZ +lB +wa +DW +vK +wa +lB +zZ hi hi wu @@ -630,26 +965,26 @@ hi zZ ME gq -fy +Iw zZ TX -wa +ba +ba +ba +vo lB lB -vo -Ya +lB +ji lB lB -zZ -vH -ZS -ZS -ZS vH -zZ lB lB lB +lB +ji +CX zZ hi hi @@ -657,31 +992,31 @@ wu "} (13,1,1) = {" wu -hi +co hi zZ ME ZS fy zZ -TX +LR +mn +Jp +Av +zZ lB lB lB -zZ -Ya -lB lB -zZ -zZ -zZ -we -zZ -zZ -zZ lB lB +zZ lB +wa +vK +DW +wa +Kc zZ hi hi @@ -690,29 +1025,29 @@ wu (14,1,1) = {" wu hi -hi +co zZ fx TM TN zZ -Jp -mn -Jp -Av -zZ -lB -lB -lB -lB lB +UY lB lB +zZ +Se +Ya lB lB lB lB +zZ lB +wa +fO +we +wa lB zZ hi @@ -724,30 +1059,30 @@ wu hi hi zZ +vH zZ +ap zZ -zZ -zZ -lB -lB -wa -lB -zZ -lB -lB -ZW +Ya +Ya +Ya +Ya +vH lB -ZW lB -ZW lB lB lB lB +vH lB wa +DW +DW +wa +cd zZ -hi +mH hi wu "} @@ -756,9 +1091,9 @@ wu hi hi zZ -lB -lB -lB +zZ +zZ +zZ zZ Ya Ya @@ -766,18 +1101,18 @@ Ya Ya zZ lB -ZW lB lB lB lB lB +zZ +DZ lB +Ya lB lB -ZW lB -Ya zZ hi hi @@ -788,28 +1123,28 @@ wu hi hi zZ -Ya -Ya -lB zZ -Ya -Ya -Ya -Ya +zZ +zZ +zZ +vH +vH +vH +vH zZ lB lB lB lB -wa lB lB +zZ +lB lB lB lB lB lB -Ya zZ hi hi @@ -820,58 +1155,58 @@ wu hi hi zZ -Ya -Ya -lB -zZ zZ +vH +vH zZ zZ +vH +vH zZ zZ +az +SS +CM lB lB +SS +zZ lB lB lB lB +TJ lB -lB -lB -lB -lB -lB -Ya zZ hi -hi +aP wu "} (19,1,1) = {" wu -hi +mH hi zZ +NW +NW +NW +NW +NW +NW +NW +NW +NW lB +kx lB lB lB -lB -lB -lB -lB -lB -lB -ZW -ZW -lB -lB -zZ zZ zZ +vH iB iB -zZ +vH zZ zZ zZ @@ -884,30 +1219,30 @@ wu hi hi zZ -lB -lB -lB -lB -lB -wa -lB +NW +NW +NW +NW +NW +NW +NW PC -lB +GY lB lB lB lB lB zZ -bC -bC ZS ZS ZS -co +ZS +ZS +ZS ZS zZ -hi +aP hi kW "} @@ -916,31 +1251,31 @@ wu hi hi zZ +NW +NW +GY +NW +NW +NW +GY +GY +GY Ya -Ya -Ya -Ya -lB -lB -lB -SS -lB -lB lB lB lB lB -zZ -bC -co -ZS -ZS +vH ZS +cN ZS +QS +KV ZS +Fi iB -lB -lB +dm +dm np "} (22,1,1) = {" @@ -948,155 +1283,155 @@ wu hi hi zZ -Ya -Ya -Ya -Ya +UX +Wl +iy +Wl +Wl +Wl +Wl +eB +Wl lB -wa -lB -SS lB lB -wa lB lB -ZW zZ -vH ZS ZS ZS ZS -co +ZS +Fi ZS iB -lB -lB +Ea +xv nU "} (23,1,1) = {" -wu +wG hi hi -zZ +tF lB +Ya lB +Ya lB +Ya lB lB -wa -lB -PC lB lB lB lB lB lB -zZ -bC -ZS -co -ZS +tF ZS ZS ZS -zZ -hi +Nq +iq +bZ +bZ +iu +uV hi sP "} (24,1,1) = {" -wu hi hi -zZ -lB -lB -lB -lB -lB -lB -wa -PC -lB -lB -lB -lB -lB -lB -zZ -zZ -zZ -iB -iB -zZ -zZ -zZ +hi +Su +QV +QV +QV +QV +QV +QV +QV +QV +QV +QV +bC +QV +QV +QV +Su +Fi +ZS +ZS +Qy +dD +dD +dD zZ hi hi wu "} (25,1,1) = {" -wu hi hi -zZ -Ya -Ya -Ya -Ya +hi +Su lB lB lB lB lB lB -ZW lB lB lB -zZ -ZW -ZW -ZW -ZW -ZW -ZW +lB +lB +lB +lB +lB +Su +ZS +ZS +Fi +Qy ZW +Rk +dD zZ hi hi wu "} (26,1,1) = {" -wu hi hi -zZ -Ya -Ya -Ya -Ya -lB -lB -lB -lB -lB -lB -lB -lB -lB -lB -zZ -ZW +hi +Su +Py +Py +pO +Py +pO +Py +pO +Py +pO +Py +pO +Py +Py +Py +Su +ZS +ZS +ZS +Qy dD -ZW -ZW -ZW -ZW +ft dD zZ hi @@ -1104,7 +1439,7 @@ hi wu "} (27,1,1) = {" -wu +sP hi hi zZ @@ -1132,7 +1467,7 @@ zZ zZ zZ hi -hi +mH wu "} (28,1,1) = {" @@ -1142,9 +1477,11 @@ hi hi hi hi +co hi hi hi +bU hi hi hi @@ -1154,9 +1491,7 @@ hi hi hi hi -hi -hi -hi +co hi hi hi @@ -1170,10 +1505,12 @@ wu (29,1,1) = {" wu hi +mH hi hi hi hi +co hi hi hi @@ -1184,13 +1521,11 @@ hi hi hi hi +co hi hi hi -hi -hi -hi -hi +bU hi hi hi diff --git a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm index 4e016e3a62a4..df6499283061 100644 --- a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm +++ b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm @@ -23,9 +23,14 @@ /obj/item/food/cake/holy_cake, /turf/open/floor/wood, /area/city/backstreets_room) +"n" = ( +/obj/effect/spawner/mobspawner/steel_noon_fly{ + max_spawns = 2 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) "p" = ( /obj/structure/spider/stickyweb, -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, /turf/open/floor/wood, /area/city/backstreets_room) "w" = ( @@ -74,7 +79,7 @@ H (3,1,1) = {" a w -g +n g g m diff --git a/_maps/RandomRooms/backstreets/small_north/pet_store.dmm b/_maps/RandomRooms/backstreets/small_north/pet_store.dmm index 9b775934da0b..b8270bcd1c2c 100644 --- a/_maps/RandomRooms/backstreets/small_north/pet_store.dmm +++ b/_maps/RandomRooms/backstreets/small_north/pet_store.dmm @@ -31,6 +31,9 @@ /mob/living/simple_animal/pet/dog/corgi/exoticcorgi, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/critter{ + name = "corgi crate" + }, /turf/open/floor/wood, /area/city/backstreets_room) "u" = ( @@ -63,6 +66,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/pet/dog/corgi/puppy/void, +/obj/structure/closet/crate/critter{ + name = "corgi crate" + }, /turf/open/floor/wood, /area/city/backstreets_room) "D" = ( @@ -70,6 +76,9 @@ /mob/living/simple_animal/hostile/retaliate/tegu, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/critter{ + name = "tegu crate" + }, /turf/open/floor/wood, /area/city/backstreets_room) "M" = ( @@ -83,6 +92,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/critter{ + name = "corgi crate" + }, /turf/open/floor/wood, /area/city/backstreets_room) "P" = ( diff --git a/_maps/RandomRooms/backstreets/small_south/rat_ssa.dmm b/_maps/RandomRooms/backstreets/small_south/rat_ssa.dmm index 915dc7e40dbc..e34d37b01fde 100644 --- a/_maps/RandomRooms/backstreets/small_south/rat_ssa.dmm +++ b/_maps/RandomRooms/backstreets/small_south/rat_ssa.dmm @@ -6,16 +6,16 @@ /obj/effect/spawner/lootdrop/garbage_spawner, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) -"x" = ( -/mob/living/simple_animal/hostile/humanoid/rat/hammer, -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_room) "C" = ( +/obj/structure/closet/crate/trashcart/filled, /obj/item/ego_weapon/city/rats/brick, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "M" = ( -/mob/living/simple_animal/hostile/humanoid/rat/zippy, +/obj/structure/closet/crate/trashcart/filled, +/obj/effect/spawner/scatter/rat_elite{ + radius = 1 + }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "P" = ( @@ -41,33 +41,33 @@ U t a t -R +C U "} (3,1,1) = {" P -M +a P -R +M U "} (4,1,1) = {" a a a -C +a U "} (5,1,1) = {" a t a -R +M U "} (6,1,1) = {" t -x +a P R U diff --git a/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm b/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm index 900700bbb19c..0333c353085a 100644 --- a/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm +++ b/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm @@ -13,25 +13,26 @@ "x" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/suit/lobotomy/wcorp, -/obj/item/clothing/head/wcorp, /turf/open/floor/carpet/stellar, /area/city/backstreets_alley) "y" = ( /obj/item/ego_weapon/city/wcorp, +/obj/effect/spawner/mobspawner/indigo_noon{ + max_spawns = 3; + radius = 2 + }, /turf/open/floor/carpet/stellar, /area/city/backstreets_alley) "M" = ( -/mob/living/simple_animal/hostile/ordeal/indigo_dawn, +/obj/effect/spawner/mobspawner/indigo_dawn{ + max_spawns = 2 + }, /turf/open/floor/carpet/stellar, /area/city/backstreets_alley) "P" = ( /obj/machinery/door/airlock/shuttle, /turf/open/floor/carpet/stellar, /area/city/backstreets_alley) -"R" = ( -/mob/living/simple_animal/hostile/ordeal/indigo_noon, -/turf/open/floor/carpet/stellar, -/area/city/backstreets_alley) "U" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) @@ -45,7 +46,7 @@ U "} (2,1,1) = {" P -M +a a t U @@ -53,27 +54,27 @@ U (3,1,1) = {" m a -R +a x U "} (4,1,1) = {" U +M a -R y U "} (5,1,1) = {" m a -R +a x U "} (6,1,1) = {" P -M +a a t U diff --git a/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm b/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm index 5aff1e3e72e4..91eec3af1156 100644 --- a/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm +++ b/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm @@ -5,41 +5,44 @@ "b" = ( /obj/machinery/washing_machine, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/airless/white, +/turf/open/floor/plasteel/white, /area/city/backstreets_room) "v" = ( /obj/machinery/washing_machine, -/turf/open/floor/plasteel/airless/white, +/turf/open/floor/plasteel/white, /area/city/backstreets_room) "w" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/steel_dawn, -/turf/open/floor/plasteel/airless/white, +/obj/effect/spawner/mobspawner/steel_dawn{ + max_spawns = 1 + }, +/turf/open/floor/plasteel/white, /area/city/backstreets_room) "x" = ( -/turf/open/floor/plasteel/airless/white, +/turf/open/floor/plasteel/white, /area/city/backstreets_room) "E" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/lootcrate/money, -/turf/open/floor/plasteel/airless/white, +/turf/open/floor/plasteel/white, /area/city/backstreets_room) "J" = ( /obj/structure/lootcrate/money, -/turf/open/floor/plasteel/airless/white, +/turf/open/floor/plasteel/white, /area/city/backstreets_room) "N" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/airless/white, +/turf/open/floor/plasteel/white, /area/city/backstreets_room) "T" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, -/turf/open/floor/plasteel/airless/white, +/obj/effect/spawner/mobspawner/steel_noon{ + max_spawns = 2 + }, +/turf/open/floor/plasteel/white, /area/city/backstreets_room) "X" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/mineral_door/iron, -/turf/open/floor/plasteel/airless/white, +/turf/open/floor/plasteel/white, /area/city/backstreets_room) (1,1,1) = {" @@ -54,7 +57,7 @@ a (2,1,1) = {" a v -w +N v N v @@ -63,10 +66,10 @@ a (3,1,1) = {" a E +T x +w x -T -T a "} (4,1,1) = {" diff --git a/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm b/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm index d989795ae159..d846e666ae32 100644 --- a/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm +++ b/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm @@ -24,7 +24,9 @@ /obj/structure/closet/secure_closet/freezer/meat, /mob/living/simple_animal/hostile/ordeal/amber_bug, /mob/living/simple_animal/hostile/ordeal/amber_bug, -/mob/living/simple_animal/hostile/ordeal/amber_bug, +/mob/living/simple_animal/hostile/ordeal/amber_bug{ + wander = 0 + }, /obj/effect/turf_decal/weather/snow/corner{ dir = 9 }, @@ -41,7 +43,9 @@ /obj/structure/closet/secure_closet/freezer/fridge, /mob/living/simple_animal/hostile/ordeal/amber_bug, /mob/living/simple_animal/hostile/ordeal/amber_bug, -/mob/living/simple_animal/hostile/ordeal/amber_bug, +/mob/living/simple_animal/hostile/ordeal/amber_bug{ + wander = 0 + }, /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, @@ -67,7 +71,6 @@ /area/city/backstreets_alley) "P" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/mob/living/simple_animal/hostile/ordeal/amber_bug/morsel, /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, @@ -88,7 +91,9 @@ /obj/structure/closet/secure_closet/freezer/cream_pie, /mob/living/simple_animal/hostile/ordeal/amber_bug, /mob/living/simple_animal/hostile/ordeal/amber_bug, -/mob/living/simple_animal/hostile/ordeal/amber_bug, +/mob/living/simple_animal/hostile/ordeal/amber_bug{ + wander = 0 + }, /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, diff --git a/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm b/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm index ceb28668d792..702eba5e5c33 100644 --- a/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm @@ -43,7 +43,9 @@ /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "U" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/obj/effect/spawner/mobspawner/steel_dawn{ + max_spawns = 2 + }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "X" = ( @@ -75,8 +77,8 @@ a K N Q -U N +U a "} (4,1,1) = {" @@ -85,7 +87,7 @@ N J a x -U +N a "} (5,1,1) = {" diff --git a/code/game/objects/effects/spawners/scatter.dm b/code/game/objects/effects/spawners/scatter.dm index 1318a0943b5a..b5ec19d493ae 100644 --- a/code/game/objects/effects/spawners/scatter.dm +++ b/code/game/objects/effects/spawners/scatter.dm @@ -14,10 +14,10 @@ var/list/candidate_locations = list() - for(var/turf/turf_in_view in oview(radius, get_turf(src))) - if(!turf_in_view.density) - - candidate_locations += turf_in_view + for(var/turf/turf_in_view in view(radius, get_turf(src))) + if(turf_in_view.density) + continue + candidate_locations += turf_in_view if(!candidate_locations.len) return INITIALIZE_HINT_QDEL @@ -37,7 +37,6 @@ name = "trash and grime scatterer" max_spawns = 5 loot_table = list(/obj/effect/spawner/lootdrop/garbage_spawner = 30, - /mob/living/simple_animal/hostile/cockroach = 25, /obj/effect/decal/cleanable/garbage = 20, /obj/effect/decal/cleanable/vomit/old = 15, /obj/effect/spawner/lootdrop/cigbutt = 10) @@ -48,7 +47,6 @@ radius = 1 loot_table = list(/obj/item/clothing/head/cone = 35, /obj/item/clothing/suit/caution = 15, - /mob/living/simple_animal/hostile/retaliate/frog = 10, /obj/item/reagent_containers/glass/rag = 10, /obj/item/reagent_containers/glass/bucket = 10, /obj/effect/decal/cleanable/blood/old = 10,