From 0e8c54e2d55d400268b8f5667909c8e1e2345332 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 1 Mar 2026 22:28:53 +0000 Subject: [PATCH 1/6] small spawners --- .../USASF_Point_Loma/USASF_Point_Loma.dmm | 62 +++++++++++++------ 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm b/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm index 31c1c6fd0969..4808270098af 100644 --- a/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm +++ b/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm @@ -12679,6 +12679,10 @@ /obj/effect/decal/cleanable/dirt/sand_1, /turf/open/hybrisa/street/roadlines3, /area/point_loma/airbase/exterior/west) +"aKV" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/almayer/research/containment/yautja/alt, +/area/point_loma/research_facility/crash_site) "aKW" = ( /obj/structure/surface/table, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -13621,6 +13625,10 @@ }, /turf/open/floor/whiteyellowfull, /area/point_loma/research_facility/gym/basketball) +"aNp" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/plating/burnt_platingdmg3, +/area/point_loma/research_facility/crash_site) "aNq" = ( /obj/structure/bed/chair{ pixel_x = 4; @@ -16285,6 +16293,10 @@ /obj/structure/prop/hybrisa/boulders/wide_boulderdark/wide_boulder1, /turf/open/auto_turf/sand_white/layer0, /area/point_loma/airbase/cave/south_west) +"aVi" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/shuttle/dropship/predship/tile/hunter_tile_1, +/area/point_loma/airbase/exterior/crash_site) "aVj" = ( /obj/structure/cable/white{ color = "#550d0d"; @@ -20651,6 +20663,10 @@ }, /turf/open/floor/plating/catwalk, /area/point_loma/airbase/interior/workshop/upper) +"bhq" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/shuttle/dropship/predship/hunter_grille, +/area/point_loma/airbase/exterior/crash_site) "bhr" = ( /obj/item/toy/inflatable_duck, /turf/open/gm/river/desert/shallow/pool, @@ -26674,6 +26690,7 @@ "byQ" = ( /obj/item/stool, /obj/effect/hunter/catwalk/hunter_grate, +/obj/effect/landmark/monkey_spawn, /turf/open/shuttle/dropship/predship/hunter_catwalk_alt, /area/point_loma/airbase/exterior/crash_site) "byR" = ( @@ -26692,6 +26709,7 @@ /area/point_loma/airbase/exterior/crash_site) "byU" = ( /obj/effect/hunter/catwalk/hunter_grate, +/obj/effect/landmark/monkey_spawn, /turf/open/shuttle/dropship/predship/hunter_catwalk_alt, /area/point_loma/airbase/exterior/crash_site) "byV" = ( @@ -27073,6 +27091,7 @@ /area/point_loma/airbase/exterior/crash_site) "bzW" = ( /obj/effect/hunter/catwalk/new_alpha, +/obj/effect/landmark/monkey_spawn, /turf/open/shuttle/dropship/predship/hunter_catwalk_alt, /area/point_loma/airbase/exterior/crash_site) "bzX" = ( @@ -27916,15 +27935,18 @@ /obj/structure/prop/hunter/fake_platform/hunter, /obj/structure/platform_decoration/metal/hunter, /obj/effect/decal/cleanable/dirt/sand_1, +/obj/effect/landmark/monkey_spawn, /turf/open/shuttle/dropship/predship/tile/hunter_tile_5/west, /area/point_loma/airbase/exterior/crash_site) "bCc" = ( /obj/structure/prop/hunter/fake_platform/hunter, +/obj/effect/landmark/monkey_spawn, /turf/open/shuttle/dropship/predship/tile/hunter_tile_5/west, /area/point_loma/airbase/exterior/crash_site) "bCd" = ( /obj/structure/prop/hunter/fake_platform/hunter, /obj/structure/platform_decoration/metal/hunter/north, +/obj/effect/landmark/monkey_spawn, /turf/open/shuttle/dropship/predship/tile/hunter_tile_5/west, /area/point_loma/airbase/exterior/crash_site) "bCe" = ( @@ -97728,9 +97750,9 @@ ctC brp bsm aFk -brW -brW -brW +aKV +aKV +aKV brW aFk aFk @@ -98090,7 +98112,7 @@ bNt bro bss bKe -aFk +aNp aFk brW brZ @@ -98272,7 +98294,7 @@ cfL brp bst bKe -aFk +aNp aFk brW brW @@ -98454,7 +98476,7 @@ brU ctC bsu bKe -aFk +aNp aFk brW brW @@ -98819,10 +98841,10 @@ ctC brW aFk bJv -brW -brW -brW -brW +aKV +aKV +aKV +aKV bqf bqf bqf @@ -101911,9 +101933,9 @@ cuB bpi brp ctC -brW -brW -brW +aKV +aKV +aKV brW brp brp @@ -152887,9 +152909,9 @@ aNI byh bxY bRG -bxK -bxK -bxK +aVi +aVi +aVi bxK bxK bxK @@ -153069,9 +153091,9 @@ aNI byi bxZ bRG -bxK -bxK -bxK +aVi +aVi +aVi bxK bxK bxK @@ -156692,7 +156714,7 @@ bRz aNI aZC cxb -byR +bhq byU byU byQ From bac574ff0be65351da98e122b9d4a13fefeb32e0 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 1 Mar 2026 23:36:00 +0000 Subject: [PATCH 2/6] surv loot 1.0 --- .../USASF_Point_Loma/USASF_Point_Loma.dmm | 522 ++++++++++-------- .../sprinkles/20.prison_riot.dmm | 28 +- 2 files changed, 300 insertions(+), 250 deletions(-) diff --git a/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm b/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm index 4808270098af..33ca34f5a678 100644 --- a/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm +++ b/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm @@ -490,6 +490,7 @@ pixel_x = -7 }, /obj/effect/landmark/objective_landmark/science, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/shiva/red/east, /area/point_loma/airbase/mining_colony/interior/security) "aby" = ( @@ -984,14 +985,7 @@ /obj/structure/surface/rack{ color = "#98a3ab" }, -/obj/item/weapon/gun/pistol/l54{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/weapon/gun/pistol/l54{ - pixel_x = -2; - pixel_y = -4 - }, +/obj/effect/spawner/random/gun/uscm_primary, /turf/open/floor/corsat/red/north, /area/point_loma/research_facility/security_hq) "adh" = ( @@ -3067,6 +3061,7 @@ /obj/structure/closet/secure_closet/surgical{ pixel_x = 30 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/corsat/retrosquareslight, /area/point_loma/research_facility/medical) "ajM" = ( @@ -3700,6 +3695,7 @@ layer = 2; color = "#d3d3d3" }, +/obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/corsat/retrosquareslight, /area/point_loma/research_facility/medical) "alz" = ( @@ -4432,6 +4428,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/effect/spawner/random/pills, /turf/open/floor/corsat/retrosquareslight, /area/point_loma/research_facility/medical) "anC" = ( @@ -5305,6 +5302,7 @@ /area/point_loma/research_facility/super_death_cannon/ammo_elevator) "aqj" = ( /obj/structure/surface/table/reinforced/prison, +/obj/item/device/defibrillator/compact_adv, /turf/open/floor/corsat/retrosquareslight, /area/point_loma/research_facility/medical) "aqk" = ( @@ -5320,6 +5318,7 @@ /obj/item/restraint/handcuffs{ pixel_y = 4 }, +/obj/effect/spawner/random/gun/uscm_secondary, /turf/open/floor/shiva/red/west, /area/point_loma/airbase/mining_colony/interior/security) "aqm" = ( @@ -7511,6 +7510,8 @@ dir = 4 }, /obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/pills, +/obj/effect/spawner/random/pills, /turf/open/floor/corsat/greenwhite/east, /area/point_loma/research_facility/medical) "awd" = ( @@ -8292,6 +8293,7 @@ /obj/structure/morgue{ dir = 2 }, +/obj/effect/landmark/corpsespawner/point_loma/alphatech, /turf/open/floor/corsat/greenwhite/northwest, /area/point_loma/research_facility/medical) "ayb" = ( @@ -8370,6 +8372,7 @@ /obj/structure/morgue{ dir = 2 }, +/obj/effect/landmark/corpsespawner/point_loma/alphatech, /turf/open/floor/corsat/greenwhite/north, /area/point_loma/research_facility/medical) "ayl" = ( @@ -8426,6 +8429,7 @@ /obj/structure/morgue{ dir = 2 }, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/floor/corsat/greenwhite/northeast, /area/point_loma/research_facility/medical) "ayt" = ( @@ -8987,6 +8991,7 @@ dir = 8 }, /obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/pills, /turf/open/floor/corsat/greenwhite/northwest, /area/point_loma/research_facility/medical) "aAh" = ( @@ -12925,6 +12930,7 @@ pixel_y = -9 }, /obj/effect/landmark/objective_landmark/medium, +/obj/effect/spawner/random/gun/uscm_secondary, /turf/open/floor/shiva/yellowfull/west, /area/point_loma/airbase/interior/cargo/lower) "aLC" = ( @@ -13297,6 +13303,7 @@ "aMA" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/device/binoculars/civ, +/obj/effect/spawner/random/gun/uscm_secondary, /turf/open/floor/corsat, /area/point_loma/airbase/interior/cargo/lower) "aMB" = ( @@ -16801,15 +16808,9 @@ /obj/structure/surface/rack{ color = "#98a3ab" }, -/obj/effect/landmark/wo_supplies/storage/belts/shotgunbelt, -/obj/item/weapon/gun/shotgun/pump{ - pixel_y = 10 - }, /obj/item/ammo_magazine/shotgun/beanbag, -/obj/item/ammo_magazine/shotgun/buckshot{ - pixel_y = -5 - }, /obj/effect/landmark/objective_landmark/close, +/obj/effect/spawner/random/gun/shotgun, /turf/open/floor/shiva/red/southeast, /area/point_loma/airbase/mining_colony/interior/security) "aWP" = ( @@ -17794,13 +17795,16 @@ pixel_x = 8; pixel_y = 7 }, -/obj/item/stack/sheet/metal/small_stack{ - pixel_x = -6; - pixel_y = 1 - }, /obj/structure/machinery/light/double{ dir = 8 }, +/obj/item/stack/sheet/metal/large_stack{ + pixel_x = -4 + }, +/obj/item/stack/sheet/plasteel/large_stack{ + pixel_x = 3; + pixel_y = -9 + }, /turf/open/floor/shiva/yellow/west, /area/point_loma/airbase/mining_colony/interior/engineering) "aZS" = ( @@ -17823,7 +17827,7 @@ /turf/open/new_varadero/alt_concrete/warning/east, /area/point_loma/airbase/interior/workshop/upper) "aZV" = ( -/obj/effect/landmark/corpsespawner/colonist/random, +/obj/effect/landmark/corpsespawner/point_loma/alphatech, /turf/open/new_varadero/taupe_concrete, /area/point_loma/airbase/exterior/west) "aZW" = ( @@ -17965,9 +17969,10 @@ /turf/open/floor/corsat/officetiles, /area/point_loma/airbase/interior/atc) "bap" = ( -/obj/effect/landmark/corpsespawner/colonist/random, +/obj/effect/landmark/corpsespawner/point_loma/alphatech, /obj/effect/decal/cleanable/blood/xeno, /obj/effect/decal/cleanable/blood/xeno, +/obj/effect/spawner/random/gun/corporate, /turf/open/floor/corsat/officetiles, /area/point_loma/airbase/interior/atc) "baq" = ( @@ -18133,10 +18138,6 @@ /obj/effect/decal/hybrisa/dirt_2, /turf/open/floor/shiva/yellowcorners/east, /area/point_loma/airbase/mining_colony/interior/engineering) -"baQ" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/corsat/officesquares, -/area/point_loma/airbase/interior/atc) "baR" = ( /obj/structure/stairs/multiz/up{ dir = 1 @@ -18164,9 +18165,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#98a3ab" }, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{ - pixel_y = 3 - }, +/obj/effect/spawner/random/gun/shotgun, /turf/open/floor/corsat/brown/southeast, /area/point_loma/airbase/interior/atc) "baW" = ( @@ -18216,7 +18215,8 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 26 }, -/obj/effect/landmark/corpsespawner/colonist/random, +/obj/effect/landmark/corpsespawner/point_loma/alphatech, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/plating/warnplate/northwest, /area/point_loma/airbase/interior/atc) "bbd" = ( @@ -18364,7 +18364,6 @@ icon_state = "NW-out"; pixel_y = 1 }, -/obj/effect/landmark/survivor_spawner, /turf/open/floor/almayer/plate, /area/point_loma/airbase/interior/atc/upper) "bbx" = ( @@ -18525,10 +18524,8 @@ icon_state = "lattice12"; pixel_y = 16 }, -/obj/item/weapon/gun/rifle/mar40/carbine, /obj/structure/surface/rack, -/obj/item/ammo_magazine/rifle/mar40, -/obj/item/ammo_magazine/rifle/mar40, +/obj/effect/spawner/random/gun/uscm_primary, /turf/open/floor/corsat, /area/point_loma/airbase/interior/atc/upper) "bbP" = ( @@ -20842,6 +20839,10 @@ /obj/item/toy/beach_ball, /turf/open/floor/whiteblue, /area/point_loma/research_facility/pool) +"bhV" = ( +/obj/effect/spawner/random/sentry, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/south) "bhW" = ( /obj/structure/bed/chair/comfy/hybrisa/brown{ dir = 1 @@ -21127,6 +21128,7 @@ /obj/item/clothing/suit/armor/riot, /obj/item/clothing/head/helmet/riot/vintage_riot, /obj/item/clothing/head/helmet/riot/vintage_riot, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/corsat/red/southwest, /area/point_loma/research_facility/security_hq) "biR" = ( @@ -21155,14 +21157,10 @@ /turf/open/floor/corsat/red, /area/point_loma/research_facility/security_hq) "biT" = ( -/obj/item/ammo_magazine/pistol/l54, -/obj/item/ammo_magazine/pistol/l54, -/obj/item/ammo_magazine/pistol/l54, -/obj/item/ammo_magazine/pistol/l54, -/obj/item/ammo_box/magazine/l54, /obj/structure/surface/rack{ color = "#98a3ab" }, +/obj/effect/spawner/random/gun/shotgun, /turf/open/floor/corsat/red, /area/point_loma/research_facility/security_hq) "biU" = ( @@ -21173,9 +21171,9 @@ pixel_x = 4; pixel_y = 6 }, -/obj/effect/spawner/random/tool{ - pixel_x = -7; - pixel_y = -1 +/obj/effect/spawner/random/technology_scanner{ + pixel_y = -3; + pixel_x = -3 }, /turf/open/floor/corsat/red, /area/point_loma/research_facility/security_hq) @@ -21444,6 +21442,7 @@ /obj/item/clothing/suit/armor/riot, /obj/item/clothing/head/helmet/riot/vintage_riot, /obj/item/clothing/head/helmet/riot/vintage_riot, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/corsat/red/northwest, /area/point_loma/research_facility/security_hq) "bjF" = ( @@ -21457,10 +21456,7 @@ /obj/structure/surface/rack{ color = "#98a3ab" }, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{ - pixel_y = -7 - }, +/obj/effect/spawner/random/gun/shotgun, /turf/open/floor/corsat/red/north, /area/point_loma/research_facility/security_hq) "bjH" = ( @@ -22927,6 +22923,13 @@ }, /turf/open/new_varadero/alt_concrete/floor, /area/point_loma/research_facility/engineering) +"bnA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/prop/alien/hugger, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/west) "bnB" = ( /obj/structure/window/framed/new_varadero/foundation, /turf/open/new_varadero/alt_concrete/floor, @@ -23707,7 +23710,7 @@ /area/point_loma/research_facility/crash_site) "bpP" = ( /obj/item/prop/alien/hugger, -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/dorms) @@ -23790,6 +23793,7 @@ "bqa" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/crap_item, +/obj/item/stack/sheet/metal/large_stack, /turf/open/new_varadero/alt_concrete/floor, /area/point_loma/research_facility/engineering) "bqb" = ( @@ -23803,6 +23807,7 @@ pixel_x = 8; pixel_y = 7 }, +/obj/item/stack/sheet/metal/large_stack, /turf/open/new_varadero/alt_concrete/floor, /area/point_loma/research_facility/engineering) "bqc" = ( @@ -23810,7 +23815,7 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/engineering) "bqd" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/floor/corsat/green/southwest, /area/point_loma/research_facility/dorms) "bqe" = ( @@ -23890,7 +23895,7 @@ /area/point_loma/research_facility/dorms) "bqt" = ( /obj/item/prop/alien/hugger, -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/floor/plating/burnt_platingdmg3, /area/point_loma/research_facility/dorms) "bqu" = ( @@ -24639,7 +24644,7 @@ /turf/open/floor/strata/blue2, /area/point_loma/research_facility/laundry) "bsF" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/floor/strata/blue2, /area/point_loma/research_facility/laundry) "bsG" = ( @@ -25066,6 +25071,7 @@ pixel_x = -4; pixel_y = 12 }, +/obj/item/device/defibrillator/compact_adv, /turf/open/floor/almayer/sterile_green_side/north, /area/point_loma/airbase/mining_colony/exterior/security/south) "btZ" = ( @@ -25540,6 +25546,7 @@ /obj/structure/largecrate/empty{ pixel_y = 3 }, +/obj/item/stack/sheet/metal/small_stack, /turf/open/floor/shiva, /area/point_loma/airbase/mining_colony/interior/engineering) "bvy" = ( @@ -27165,7 +27172,7 @@ /obj/structure/bed/bedroll/comfy/green{ dir = 10 }, -/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/auto_turf/sand_white/layer1, /area/point_loma/airbase/mining_colony/interior/engineering/communications) "bAi" = ( @@ -28226,7 +28233,7 @@ /turf/open/hybrisa/street/sidewalkcenter/south, /area/point_loma/airbase/exterior/west) "bCH" = ( -/obj/effect/landmark/corpsespawner/ua_riot, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/hybrisa/street/asphalt, /area/point_loma/airbase/exterior/crash_site) "bCI" = ( @@ -28275,6 +28282,13 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/new_varadero/taupe_concrete, /area/point_loma/airbase/exterior/west) +"bCR" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/west) "bCS" = ( /obj/item/alien_embryo, /turf/open/new_varadero/dock_concrete, @@ -28331,7 +28345,8 @@ /turf/open/floor/corsat/officesquares, /area/point_loma/airbase/interior/atc) "bDf" = ( -/obj/effect/landmark/corpsespawner/colonist/random, +/obj/effect/landmark/corpsespawner/point_loma/alphatech, +/obj/effect/spawner/random/gun/uscm_secondary, /turf/open/floor/corsat/officetiles, /area/point_loma/airbase/interior/atc) "bDg" = ( @@ -28349,7 +28364,7 @@ /turf/open/floor/corsat/officetiles, /area/point_loma/airbase/interior/atc) "bDj" = ( -/obj/effect/landmark/corpsespawner/ua_riot, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/new_varadero/taupe_concrete, /area/point_loma/airbase/exterior/west) "bDk" = ( @@ -28373,6 +28388,10 @@ /obj/structure/platform/metal/hybrisa/metalplatform6/east, /turf/open/new_varadero/dock_concrete, /area/point_loma/research_facility/super_death_cannon/cannon) +"bDo" = ( +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/west) "bDp" = ( /obj/structure/platform/metal/hybrisa/metalplatform6/west, /turf/open/new_varadero/dock_concrete, @@ -28427,7 +28446,8 @@ /turf/open/floor/corsat/officesquares, /area/point_loma/airbase/interior/atc) "bDy" = ( -/obj/effect/landmark/corpsespawner/ua_riot, +/obj/effect/landmark/corpsespawner/point_loma/usasf, +/obj/effect/spawner/random/gun/uscm_primary, /turf/open/floor/corsat/officesquares, /area/point_loma/airbase/interior/atc) "bDz" = ( @@ -28461,10 +28481,11 @@ /turf/open/floor/podhatchfloor, /area/point_loma/airbase/interior/atc) "bDF" = ( -/obj/effect/landmark/corpsespawner/ua_riot, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/structure/machinery/light/double{ dir = 4 }, +/obj/effect/spawner/random/gun/uscm_primary, /turf/open/floor/plating/warnplate/east, /area/point_loma/airbase/interior/atc) "bDG" = ( @@ -28567,7 +28588,8 @@ /area/point_loma/airbase/interior/atc) "bDY" = ( /obj/item/ammo_casing/cartridge, -/obj/effect/landmark/corpsespawner/ua_riot, +/obj/effect/landmark/corpsespawner/point_loma/usasf, +/obj/effect/spawner/random/gun/uscm_primary, /turf/open/floor/corsat/officesquares, /area/point_loma/airbase/interior/atc) "bDZ" = ( @@ -28912,10 +28934,14 @@ "bFg" = ( /turf/open/floor/corsat/blue/east, /area/point_loma/airbase/interior/atc/upper) -"bFh" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/corsat/box, -/area/point_loma/airbase/interior/atc/upper) +"bFi" = ( +/obj/structure/barricade/handrail{ + dir = 1; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/west) "bFj" = ( /turf/open/floor/corsat/blue/west, /area/point_loma/airbase/interior/atc/upper) @@ -30333,6 +30359,13 @@ "bIW" = ( /turf/closed/wall/new_varadero, /area/point_loma/research_facility/gym) +"bIX" = ( +/obj/structure/barricade/handrail{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/west) "bIY" = ( /turf/open/floor/corsat, /area/point_loma/research_facility/security_hq) @@ -30808,7 +30841,7 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/crash_site) "bKF" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/crash_site) "bKG" = ( @@ -31025,6 +31058,7 @@ icon_state = "cargo" }, /obj/structure/closet/crate, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/shiva/north, /area/point_loma/airbase/interior/cargo/lower) "bLk" = ( @@ -32077,10 +32111,7 @@ /area/point_loma/airbase/interior/cargo/lower) "bOh" = ( /obj/structure/surface/table/woodentable/poor, -/obj/item/weapon/gun/boltaction{ - pixel_y = 3; - pixel_x = -17 - }, +/obj/effect/spawner/random/gun/rifle, /turf/open/floor/shiva/north, /area/point_loma/airbase/interior/cargo/lower) "bOi" = ( @@ -35219,7 +35250,7 @@ /area/point_loma/research_facility/hallway/south) "caA" = ( /obj/effect/decal/cleanable/blood/gibs/core, -/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/floor/corsat/purple/west, /area/point_loma/research_facility/hallway/south) "caB" = ( @@ -35227,7 +35258,7 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/south) "caC" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/south) "caD" = ( @@ -35255,7 +35286,7 @@ /turf/open/floor/corsat/purple/west, /area/point_loma/research_facility/hallway/south) "caH" = ( -/obj/effect/spawner/random/gun/corporate, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/south) "caI" = ( @@ -35408,10 +35439,6 @@ }, /turf/open/floor/corsat, /area/point_loma/research_facility/pool) -"cbc" = ( -/obj/effect/bloodsplatter/yautjasplatter, -/turf/open/floor/corsat/purple/west, -/area/point_loma/research_facility/hallway/south) "cbd" = ( /obj/structure/bed/chair, /turf/open/floor/corsat, @@ -36109,6 +36136,7 @@ /obj/structure/barricade/handrail{ dir = 4 }, +/obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/west) "cdm" = ( @@ -36235,8 +36263,9 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/central) "cdJ" = ( -/obj/effect/landmark/corpsespawner/prison_security, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/effect/spawner/gibspawner/human, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/central) "cdK" = ( @@ -36253,6 +36282,13 @@ }, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/central) +"cdN" = ( +/obj/structure/barricade/handrail{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/west) "cdO" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -36292,7 +36328,8 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/central) "cdV" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/central) "cdW" = ( @@ -36347,7 +36384,7 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/west) "cee" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/structure/pipes/vents/pump, /turf/open/floor/corsat/green, /area/point_loma/research_facility/dorms) @@ -36396,7 +36433,7 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/dorms) "cem" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/dorms) "cen" = ( @@ -36810,7 +36847,6 @@ pixel_x = -19 }, /obj/structure/barricade/deployable, -/obj/effect/decal/cleanable/blood/oil/streak, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/east) "cfv" = ( @@ -36829,29 +36865,9 @@ "cfx" = ( /turf/open/floor/corsat/green/west, /area/point_loma/research_facility/crash_site) -"cfy" = ( -/obj/effect/spawner/random/gun/shotgun, -/turf/open/floor/corsat/squares, -/area/point_loma/research_facility/hallway/east) -"cfz" = ( -/obj/effect/decal/hybrisa/road/road_edge{ - icon_state = "road_edge_decal2"; - pixel_x = -19 - }, -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/asphalt/cement_shaded, -/area/point_loma/research_facility/hallway/east) -"cfA" = ( -/obj/effect/decal/hybrisa/road/road_edge{ - icon_state = "road_edge_decal2"; - pixel_x = 13 - }, -/obj/effect/spawner/random/gun/uscm_primary, -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/asphalt/cement_shaded, -/area/point_loma/research_facility/hallway/east) "cfB" = ( -/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/landmark/corpsespawner/point_loma/usasf, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) "cfC" = ( @@ -36879,7 +36895,8 @@ icon_state = "road_edge_decal2"; pixel_x = -19 }, -/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/landmark/corpsespawner/point_loma/usasf, +/obj/effect/spawner/random/gun/smg, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/east) "cfI" = ( @@ -36890,14 +36907,6 @@ /obj/item/ammo_casing/bullet, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/east) -"cfJ" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/corsat/squares, -/area/point_loma/research_facility/hallway/east) -"cfK" = ( -/obj/effect/bloodsplatter/synthsplatter, -/turf/open/floor/corsat/squares, -/area/point_loma/research_facility/hallway/east) "cfL" = ( /obj/item/stack/rods, /obj/effect/decal/hybrisa/road/road_edge{ @@ -36918,17 +36927,9 @@ }, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) -"cfO" = ( -/obj/structure/barricade/deployable{ - dir = 8 - }, -/obj/item/ammo_casing/bullet, -/obj/effect/spawner/random/gun/civ, -/turf/open/floor/corsat/squares, -/area/point_loma/research_facility/hallway/east) "cfP" = ( -/obj/effect/bloodsplatter/human, -/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/landmark/corpsespawner/point_loma/usasf, +/obj/effect/spawner/random/gun/rifle, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) "cfQ" = ( @@ -36979,7 +36980,8 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) "cga" = ( -/obj/effect/landmark/corpsespawner/colonist/random/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf/burst, +/obj/effect/spawner/random/gun/uscm_secondary/highchance, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) "cgb" = ( @@ -37010,14 +37012,6 @@ /obj/structure/inflatable/door, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/north) -"cgf" = ( -/obj/effect/decal/hybrisa/road/road_edge{ - icon_state = "road_edge_decal3"; - pixel_y = -12 - }, -/obj/effect/bloodsplatter/xenosplatter, -/turf/open/asphalt/cement_shaded, -/area/point_loma/research_facility/hallway/east) "cgg" = ( /obj/effect/decal/hybrisa/road/road_edge{ icon_state = "road_edge_decal3"; @@ -37027,11 +37021,6 @@ dir = 1 }, /obj/item/ammo_casing/bullet, -/obj/effect/spawner/random/gun/uscm_primary, -/turf/open/asphalt/cement_shaded, -/area/point_loma/research_facility/hallway/east) -"cgh" = ( -/obj/effect/bloodsplatter/human, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/east) "cgi" = ( @@ -37039,7 +37028,8 @@ icon_state = "road_edge_decal2"; pixel_x = 13 }, -/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/landmark/corpsespawner/point_loma/usasf, +/obj/effect/spawner/random/gun/rifle, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/east) "cgj" = ( @@ -37093,22 +37083,6 @@ /obj/structure/largecrate/empty, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) -"cgr" = ( -/obj/effect/decal/hybrisa/road/road_edge{ - icon_state = "road_edge_decal2"; - pixel_x = -19 - }, -/obj/effect/decal/cleanable/blood/gibs/xeno, -/turf/open/asphalt/cement_shaded, -/area/point_loma/research_facility/hallway/east) -"cgs" = ( -/obj/effect/decal/hybrisa/road/road_edge{ - icon_state = "road_edge_decal3"; - pixel_y = 18 - }, -/obj/effect/bloodsplatter/xenosplatter, -/turf/open/asphalt/cement_shaded, -/area/point_loma/research_facility/hallway/east) "cgt" = ( /obj/effect/decal/hybrisa/road/road_edge{ icon_state = "road_edge_decal3"; @@ -37189,18 +37163,6 @@ /obj/structure/largecrate/empty/secure, /turf/open/floor/corsat/green/southwest, /area/point_loma/research_facility/hallway/east) -"cgC" = ( -/obj/effect/decal/hybrisa/road/road_edge{ - icon_state = "road_edge_decal2"; - pixel_x = 13 - }, -/obj/effect/bloodsplatter/xenosplatter, -/turf/open/asphalt/cement_shaded, -/area/point_loma/research_facility/hallway/east) -"cgD" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno, -/turf/open/floor/corsat/squares, -/area/point_loma/research_facility/hallway/east) "cgE" = ( /obj/structure/prop/dam/crane/cargo{ dir = 1; @@ -37286,10 +37248,6 @@ }, /turf/open/floor/corsat/greencorner/west, /area/point_loma/research_facility/hallway/east) -"cgS" = ( -/obj/effect/bloodsplatter/xenosplatter, -/turf/open/floor/corsat/squares, -/area/point_loma/research_facility/hallway/east) "cgT" = ( /turf/open/floor/corsat, /area/point_loma/airbase/interior/cargo/lower) @@ -37317,17 +37275,14 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/north) "cgY" = ( -/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/corsat/green, /area/point_loma/research_facility/hallway/north) "cgZ" = ( -/obj/item/ammo_casing{ - dir = 8; - icon_state = "cartridge_2" - }, -/obj/effect/spawner/random/gun/pistol, /obj/effect/decal/cleanable/blood, +/obj/effect/spawner/random/gun/uscm_secondary, +/obj/item/ammo_casing/bullet, /turf/open/floor/corsat/green, /area/point_loma/research_facility/hallway/north) "cha" = ( @@ -37372,9 +37327,9 @@ /area/point_loma/research_facility/hallway/north) "chg" = ( /obj/structure/bed/roller/hospital_empty/bigrollerbloodempty, -/obj/effect/landmark/corpsespawner/colonist/burst, /obj/effect/decal/cleanable/blood/gibs/xeno/core, /obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/corpsespawner/point_loma/alphatech/burst, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/north) "chh" = ( @@ -37403,6 +37358,7 @@ /area/point_loma/research_facility/corporate) "chn" = ( /obj/structure/closet/crate/science, +/obj/effect/spawner/random/gun/smg, /turf/open/floor/shiva/yellowfull/west, /area/point_loma/research_facility/hallway/north) "cho" = ( @@ -37442,6 +37398,7 @@ /area/point_loma/research_facility/hallway/north) "chv" = ( /obj/structure/closet/crate/plastic, +/obj/effect/spawner/random/gun/rifle, /turf/open/floor/shiva/yellowfull/west, /area/point_loma/research_facility/hallway/north) "chw" = ( @@ -37788,8 +37745,8 @@ /turf/open/floor/shiva/yellowfull, /area/point_loma/airbase/interior/cargo/lower) "cit" = ( -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /turf/open/floor/shiva/yellowfull, /area/point_loma/airbase/interior/cargo/lower) "ciu" = ( @@ -39529,11 +39486,9 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) "cor" = ( -/obj/structure/barricade/deployable{ - dir = 1 - }, /obj/item/ammo_casing, /obj/structure/pipes/standard/simple/hidden/green, +/obj/item/stack/sheet/metal, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/south) "cos" = ( @@ -40332,7 +40287,7 @@ /turf/open/floor/strata/blue2, /area/point_loma/research_facility/laundry) "cqT" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/crash_site) @@ -40389,6 +40344,7 @@ /area/point_loma/research_facility/medical) "crd" = ( /obj/structure/pipes/vents/pump, +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/corsat/retrosquareslight, /area/point_loma/research_facility/medical) "cre" = ( @@ -40457,7 +40413,7 @@ /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/north) "crr" = ( -/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/dorms) @@ -42182,10 +42138,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/whiteyellow/northeast, /area/point_loma/airbase/mining_colony/interior/corporate) -"cwN" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/shiva/multi_tiles, -/area/point_loma/airbase/mining_colony/interior/security) "cwO" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/corsat/lightplate, @@ -42330,6 +42282,20 @@ "cxt" = ( /turf/open/floor/almayer_hull/outerhull_dir/northeast, /area/point_loma/oob/sky) +"cxu" = ( +/obj/structure/barricade/handrail{ + dir = 4 + }, +/obj/effect/spawner/random/gun/rifle, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/west) +"cxv" = ( +/obj/structure/machinery/optable, +/obj/structure/machinery/light, +/obj/effect/landmark/corpsespawner/point_loma/usasf/burst, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/corsat/retrosquareslight, +/area/point_loma/research_facility/medical) "cxw" = ( /obj/structure/barricade/handrail/hybrisa/handrail{ dir = 8 @@ -42497,7 +42463,7 @@ /turf/open/floor/corsat/purple/northwest, /area/point_loma/research_facility/hallway/south) "cyd" = ( -/obj/effect/spawner/random/gun/corporate, +/obj/effect/spawner/random/gun/uscm_primary/midchance, /turf/open/floor/corsat/purplecorner/north, /area/point_loma/research_facility/hallway/south) "cye" = ( @@ -43056,6 +43022,102 @@ "cAv" = ( /turf/closed/wall/rock/brown, /area/point_loma/airbase/interior/workshop/upper) +"cAw" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaltop"; + layer = 2; + color = "#d3d3d3" + }, +/obj/effect/decal/cleanable/blood/xeno, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/corsat/retrosquareslight, +/area/point_loma/research_facility/medical) +"cAx" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaltop"; + layer = 2; + color = "#d3d3d3" + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/corsat/retrosquareslight, +/area/point_loma/research_facility/medical) +"cAy" = ( +/obj/structure/bed/hybrisa/hospital/hospitaldivider, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/corsat/greenwhite, +/area/point_loma/research_facility/medical) +"cAz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/corsat/retrosquareslight, +/area/point_loma/research_facility/medical) +"cAA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/corsat/retrosquareslight, +/area/point_loma/research_facility/medical) +"cAB" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/barricade/deployable, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/central) +"cAC" = ( +/obj/structure/barricade/deployable, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/central) +"cAD" = ( +/obj/structure/morgue{ + dir = 2 + }, +/obj/effect/landmark/corpsespawner/point_loma/usasf, +/turf/open/floor/corsat/greenwhite/north, +/area/point_loma/research_facility/medical) +"cAE" = ( +/obj/effect/decal/hybrisa/road/road_edge{ + icon_state = "road_edge_decal2"; + pixel_x = -19 + }, +/obj/effect/landmark/corpsespawner/point_loma/alphatech, +/obj/effect/spawner/random/gun/corporate, +/turf/open/asphalt/cement_shaded, +/area/point_loma/research_facility/hallway/north) +"cAF" = ( +/obj/effect/landmark/corpsespawner/point_loma/usasf, +/obj/effect/spawner/random/gun/uscm_secondary, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/north) +"cAG" = ( +/obj/structure/surface/table, +/obj/item/storage/box/bodybags{ + pixel_x = -4; + pixel_y = 12 + }, +/obj/item/device/defibrillator/compact_adv, +/turf/open/floor/shiva/snow_mat/east, +/area/point_loma/airbase/interior/hospital) +"cAH" = ( +/obj/effect/landmark/corpsespawner/point_loma/alphatech, +/obj/effect/spawner/random/gun/pistol, +/turf/open/floor/corsat/officetiles, +/area/point_loma/airbase/interior/atc) +"cAI" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/metal/large_stack, +/turf/open/floor/shiva/multi_tiles, +/area/point_loma/airbase/interior/cargo) +"cAJ" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/plasteel/medium_stack, +/turf/open/floor/shiva/multi_tiles, +/area/point_loma/airbase/interior/cargo) (1,1,1) = {" ayZ @@ -98128,16 +98190,16 @@ brn ccI czT bqW +cxu +cdN +bIX cdl cdl cdl cdl cdl -cdl -cdl -cdl -ccI -bJL +bDo +bnA ccI ccI cyI @@ -98286,7 +98348,7 @@ cfR cfR cfR cfR -cfR +cAE cfR cgd cfR @@ -98318,8 +98380,8 @@ cdv cdv cdv cdm -cdh -bJL +bFi +bCR ccI ccI cyI @@ -98648,7 +98710,7 @@ chF chy bKZ bKZ -bKZ +cAF bKZ bKZ bsJ @@ -100894,7 +100956,7 @@ bIP cyh cyd caD -abP +bhV bYH bIP cah @@ -101069,8 +101131,8 @@ abP bYC bYx bYx -cbc -cbc +bYx +bYx bYx caW caS @@ -103020,7 +103082,7 @@ cuS cuO cAe cpg -cpg +cAB crj cpg cpg @@ -103202,7 +103264,7 @@ cAi cAh cAf cAd -bJf +cAC cfW bJf cuu @@ -108848,10 +108910,10 @@ arE avr ata arv -cqU -apb -alM -ajK +cAz +cAy +cAw +cxv cup cug afh @@ -109030,9 +109092,9 @@ aik aik atr ary -cqU +cAA apd -alM +cAx ajL cup agY @@ -109389,7 +109451,7 @@ bIO bIO cgP cup -ayk +cAD aik aik ats @@ -110481,7 +110543,7 @@ ceZ ceZ ceZ ceZ -cgr +ceZ ceS bIO bMo @@ -110662,7 +110724,7 @@ crD ceU ceU ceU -cgC +ceU ceK ceT bIO @@ -111025,7 +111087,7 @@ cqc coF bIO bIO -cgD +bIO bIO cfa ceT @@ -111209,8 +111271,8 @@ cth bIO bIO bIO -cgs -cgf +cfa +ceT cdP cfN bIO @@ -111571,7 +111633,7 @@ afa adN adn ack -cgS +bIO bIO cfa ceT @@ -111753,8 +111815,8 @@ crH bMk bIO acn -cgS -cgD +bIO +bIO cfa ceT cdP @@ -112122,7 +112184,7 @@ bIO cfa ceT cfY -cfO +cfY cfG coI bIO @@ -112303,10 +112365,10 @@ bIO bIO cfa cgg -cfJ +bIO cfP bIO -cfy +bIO cft bIO bIO @@ -112484,11 +112546,11 @@ cbm bIO bIO cgt -cgh +ceK ceZ ceZ cfH -cfz +ceZ cfu ceZ ceZ @@ -112670,7 +112732,7 @@ cgi ceU ceU cfI -cfA +ceU cfv ceK ceK @@ -112850,8 +112912,8 @@ cbm bIO bIO bIO -cfK -cfJ +bIO +bIO cfB cfw cfa @@ -113032,8 +113094,8 @@ cgv cbm cth bIO -cfK -cfK +bIO +bIO bIO bIO cfa @@ -140846,8 +140908,8 @@ bTS bTS bTS bzI -aoH -aoH +cAJ +cAI aUk clm clm @@ -147220,7 +147282,7 @@ bbe bEI bDz bDe -baQ +bDe bDe baA baH @@ -148858,7 +148920,7 @@ bEP auW bED aXB -bDf +cAH bDh bDT bCU @@ -162386,8 +162448,8 @@ asb asb bPR asB -cwN -cwN +aaK +aaK bPV abt bQC @@ -165253,7 +165315,7 @@ ami aWY aHR bTZ -ami +cAG aXo aHR bTZ @@ -194362,7 +194424,7 @@ bFo bbR bbM bbI -bFh +bVi bFe bbu bVg diff --git a/maps/map_files/USASF_Point_Loma/sprinkles/20.prison_riot.dmm b/maps/map_files/USASF_Point_Loma/sprinkles/20.prison_riot.dmm index 48a98f490b07..0a87b3249880 100644 --- a/maps/map_files/USASF_Point_Loma/sprinkles/20.prison_riot.dmm +++ b/maps/map_files/USASF_Point_Loma/sprinkles/20.prison_riot.dmm @@ -148,14 +148,10 @@ /turf/open/floor/corsat/red/northeast, /area/point_loma/research_facility/security_hq) "dT" = ( -/obj/item/ammo_magazine/pistol/l54, -/obj/item/ammo_magazine/pistol/l54, -/obj/item/ammo_magazine/pistol/l54, -/obj/item/ammo_magazine/pistol/l54, -/obj/item/ammo_box/magazine/l54, /obj/structure/surface/rack{ color = "#98a3ab" }, +/obj/effect/spawner/random/gun/shotgun, /turf/open/floor/corsat/red, /area/point_loma/research_facility/security_hq) "el" = ( @@ -207,9 +203,7 @@ "gh" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/prison_security, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{ - pixel_y = -1 - }, +/obj/effect/spawner/random/gun/shotgun, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/security_hq) "gx" = ( @@ -266,7 +260,7 @@ /obj/structure/surface/rack{ color = "#98a3ab" }, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/effect/spawner/random/gun/shotgun, /turf/open/floor/corsat/red/north, /area/point_loma/research_facility/security_hq) "hB" = ( @@ -388,14 +382,7 @@ /obj/structure/surface/rack{ color = "#98a3ab" }, -/obj/item/weapon/gun/pistol/l54{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/weapon/gun/pistol/l54{ - pixel_x = -2; - pixel_y = -4 - }, +/obj/effect/spawner/random/gun/uscm_primary, /turf/open/floor/corsat/red/north, /area/point_loma/research_facility/security_hq) "kU" = ( @@ -467,6 +454,7 @@ pixel_y = -3; pixel_x = 12 }, +/obj/effect/spawner/random/gun/clf_secondary, /turf/open/floor/corsat/red/west, /area/point_loma/research_facility/security_hq) "lV" = ( @@ -1344,9 +1332,9 @@ pixel_x = 4; pixel_y = 6 }, -/obj/effect/spawner/random/tool{ - pixel_x = -7; - pixel_y = -1 +/obj/effect/spawner/random/technology_scanner{ + pixel_y = -3; + pixel_x = -3 }, /turf/open/floor/corsat/red, /area/point_loma/research_facility/security_hq) From 604ca7b26a65815a4e612ebe0e116b8db3d92468 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 1 Mar 2026 23:36:30 +0000 Subject: [PATCH 3/6] disables alpha_tech survivors (for now) --- maps/usasf_point_loma.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/maps/usasf_point_loma.json b/maps/usasf_point_loma.json index 8697f49d0e96..0a5666cf9a48 100644 --- a/maps/usasf_point_loma.json +++ b/maps/usasf_point_loma.json @@ -6,9 +6,6 @@ "weather_holder": "/datum/weather_ss_map_holder/new_varadero", "survivor_types": [ - "/datum/equipment_preset/survivor/alphatech/corporate", - "/datum/equipment_preset/survivor/alphatech/miner", - "/datum/equipment_preset/survivor/alphatech/scientist", "/datum/equipment_preset/survivor/usasf/crew/duty", "/datum/equipment_preset/survivor/usasf/crew/duty/hangar_tech", "/datum/equipment_preset/survivor/usasf/crew/duty/mess_tech", From 373f212f4e5057a719e100a17c3642e926ce9e79 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 1 Mar 2026 23:37:33 +0000 Subject: [PATCH 4/6] more loot changes From e89d83c6e32d37e3327dd460571d506e3ab57ae1 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 1 Mar 2026 23:41:45 +0000 Subject: [PATCH 5/6] more map changes --- .../USASF_Point_Loma/USASF_Point_Loma.dmm | 100 +++++++++++++----- 1 file changed, 75 insertions(+), 25 deletions(-) diff --git a/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm b/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm index 33ca34f5a678..288363b011ba 100644 --- a/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm +++ b/maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm @@ -2119,7 +2119,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/point_loma/airbase/mining_colony/exterior/west) "agM" = ( -/obj/structure/machinery/power/apc/no_power/north, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/corsat/purple/northeast, /area/point_loma/research_facility/hallway/south) "agN" = ( @@ -9366,7 +9366,7 @@ /turf/open/floor/strata/fake_wood, /area/point_loma/research_facility/command/mess) "aBh" = ( -/obj/structure/machinery/power/apc/no_power/east, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/corsat/blue/east, /area/point_loma/research_facility/command) "aBi" = ( @@ -10472,7 +10472,7 @@ /turf/open/floor/plating/burnt_platingdmg3, /area/point_loma/research_facility/research/west) "aEq" = ( -/obj/structure/machinery/power/apc/no_power/east, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/west) "aEr" = ( @@ -10572,7 +10572,7 @@ /turf/open/floor/shiva/multi_tiles, /area/point_loma/airbase/interior/cargo) "aEH" = ( -/obj/structure/machinery/power/apc/no_power/north, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) "aEI" = ( @@ -11096,7 +11096,7 @@ /turf/open/floor/corsat, /area/point_loma/research_facility/research/east) "aGu" = ( -/obj/structure/machinery/power/apc/no_power/east, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/corsat/greenwhite/east, /area/point_loma/research_facility/medical) "aGv" = ( @@ -11226,7 +11226,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/machinery/power/apc/no_power/north, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/north) "aGP" = ( @@ -12083,10 +12083,6 @@ }, /turf/open/hybrisa/street/roadlines, /area/point_loma/airbase/interior/hospital) -"aJg" = ( -/obj/structure/machinery/power/apc/fully_broken/no_cell/west, -/turf/open/floor/plating/burnt_platingdmg3, -/area/point_loma/research_facility/crash_site) "aJh" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -18138,6 +18134,10 @@ /obj/effect/decal/hybrisa/dirt_2, /turf/open/floor/shiva/yellowcorners/east, /area/point_loma/airbase/mining_colony/interior/engineering) +"baQ" = ( +/obj/item/device/flashlight/flare/on, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/south) "baR" = ( /obj/structure/stairs/multiz/up{ dir = 1 @@ -22100,13 +22100,13 @@ /turf/open/floor/corsat/red/north, /area/point_loma/research_facility/security_hq) "bli" = ( -/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/light{ dir = 1 }, /obj/structure/pipes/standard/simple/hidden/purple{ dir = 4 }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/corsat/red/north, /area/point_loma/research_facility/security_hq) "blj" = ( @@ -28934,6 +28934,11 @@ "bFg" = ( /turf/open/floor/corsat/blue/east, /area/point_loma/airbase/interior/atc/upper) +"bFh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/gun/uscm_secondary, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/central) "bFi" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -31805,7 +31810,7 @@ /turf/open/floor/shiva/north, /area/point_loma/airbase/interior/cargo/lower) "bNq" = ( -/obj/structure/machinery/power/apc/no_power/east, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/shiva/yellow/east, /area/point_loma/airbase/interior/cargo/lower) "bNr" = ( @@ -35439,6 +35444,10 @@ }, /turf/open/floor/corsat, /area/point_loma/research_facility/pool) +"cbc" = ( +/obj/item/device/flashlight/flare/on, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/central) "cbd" = ( /obj/structure/bed/chair, /turf/open/floor/corsat, @@ -36865,9 +36874,26 @@ "cfx" = ( /turf/open/floor/corsat/green/west, /area/point_loma/research_facility/crash_site) +"cfy" = ( +/obj/item/ammo_box/magazine/misc/flares, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/central) +"cfz" = ( +/obj/structure/machinery/power/apc/fully_broken/no_cell/north, +/turf/open/floor/plating/platingdmg1, +/area/point_loma/research_facility/crash_site) +"cfA" = ( +/obj/effect/decal/hybrisa/road/road_edge{ + icon_state = "road_edge_decal2"; + pixel_x = -19 + }, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/asphalt/cement_shaded, +/area/point_loma/research_facility/hallway/east) "cfB" = ( /obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/effect/spawner/random/gun/smg, +/obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) "cfC" = ( @@ -36897,6 +36923,7 @@ }, /obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/effect/spawner/random/gun/smg, +/obj/effect/decal/cleanable/blood/gibs/core, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/east) "cfI" = ( @@ -36907,6 +36934,14 @@ /obj/item/ammo_casing/bullet, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/east) +"cfJ" = ( +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/east) +"cfK" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/corsat/squares, +/area/point_loma/research_facility/hallway/east) "cfL" = ( /obj/item/stack/rods, /obj/effect/decal/hybrisa/road/road_edge{ @@ -36927,9 +36962,14 @@ }, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) +"cfO" = ( +/obj/structure/machinery/power/apc/fully_broken/no_cell/west, +/turf/open/floor/plating/burnt_platingdmg3, +/area/point_loma/research_facility/dorms) "cfP" = ( /obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/effect/spawner/random/gun/rifle, +/obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) "cfQ" = ( @@ -36982,6 +37022,7 @@ "cga" = ( /obj/effect/landmark/corpsespawner/point_loma/usasf/burst, /obj/effect/spawner/random/gun/uscm_secondary/highchance, +/obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/corsat/squares, /area/point_loma/research_facility/hallway/east) "cgb" = ( @@ -37012,6 +37053,14 @@ /obj/structure/inflatable/door, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/north) +"cgf" = ( +/obj/effect/decal/hybrisa/road/road_edge{ + icon_state = "road_edge_decal2"; + pixel_x = 13 + }, +/obj/item/ammo_box/magazine/misc/flares, +/turf/open/asphalt/cement_shaded, +/area/point_loma/research_facility/hallway/north) "cgg" = ( /obj/effect/decal/hybrisa/road/road_edge{ icon_state = "road_edge_decal3"; @@ -37030,6 +37079,7 @@ }, /obj/effect/landmark/corpsespawner/point_loma/usasf, /obj/effect/spawner/random/gun/rifle, +/obj/effect/decal/cleanable/blood/gibs/body, /turf/open/asphalt/cement_shaded, /area/point_loma/research_facility/hallway/east) "cgj" = ( @@ -37973,7 +38023,7 @@ /turf/open/floor/corsat/squares, /area/point_loma/airbase/interior/workshop) "cjk" = ( -/obj/structure/machinery/power/apc/no_power/north, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/corsat/yellow, /area/point_loma/research_facility/hallway/central) "cjl" = ( @@ -98528,7 +98578,7 @@ chF chx cgn cgn -cgn +cgf cgn cgn cgn @@ -101112,7 +101162,7 @@ agx czo bJf cpx -ccX +bFh bJf cyM bJi @@ -101137,7 +101187,7 @@ bYx caW caS caC -abP +baQ abP bYH bIP @@ -101264,8 +101314,8 @@ cdE cdE cdE cdE -bpi -aJg +cfO +aFk aFk bqf bqf @@ -102722,7 +102772,7 @@ ccP cfW agx agx -bJE +cfz bqg bqf bqf @@ -104926,7 +104976,7 @@ bJf bJf bJf cdW -bJf +cbc bJf bJf bUI @@ -105108,7 +105158,7 @@ bJf bJf bJf bJf -bJf +cfy bJf bJf cpi @@ -112365,7 +112415,7 @@ bIO bIO cfa cgg -bIO +cfJ cfP bIO bIO @@ -112550,7 +112600,7 @@ ceK ceZ ceZ cfH -ceZ +cfA cfu ceZ ceZ @@ -113095,8 +113145,8 @@ cbm cth bIO bIO -bIO -bIO +cfK +cfJ bIO cfa ceK From dfb6f8c8bb53c085c09ea2a7c8fb6a79ba5f26ab Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 1 Mar 2026 23:43:41 +0000 Subject: [PATCH 6/6] include loma turf --- colonialmarines.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/colonialmarines.dme b/colonialmarines.dme index 9a6714ca2e77..b70b4ae96858 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1537,6 +1537,7 @@ #include "code\game\turfs\hybrisa.dm" #include "code\game\turfs\kutjevo.dm" #include "code\game\turfs\light.dm" +#include "code\game\turfs\loma.dm" #include "code\game\turfs\new_varadero.dm" #include "code\game\turfs\open.dm" #include "code\game\turfs\open_space.dm"