Skip to content

forgot to push #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cuberound merged 2 commits into from
Mar 2, 2026
Merged

forgot to push #107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
710e1bc
more surv loot changes
DangerRevolution Mar 1, 2026
de5ff6c
Merge branch 'multiz-nv' of https://github.com/cuberound/cmss13 into …
DangerRevolution Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 39 additions & 7 deletions maps/map_files/USASF_Point_Loma/USASF_Point_Loma.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6162,6 +6162,7 @@
/area/point_loma/airbase/interior/hospital)
"asG" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/weapon/gun/flamer/survivor,
/turf/open/floor/corsat/box,
/area/point_loma/airbase/interior/workshop)
"asH" = (
Expand Down Expand Up @@ -7360,8 +7361,8 @@
/turf/open/floor/plating/plating_catwalk,
/area/point_loma/research_facility/medical)
"avC" = (
/obj/effect/landmark/corpsespawner/miner,
/obj/effect/decal/cleanable/blood,
/obj/effect/landmark/corpsespawner/point_loma/alphatech,
/turf/open/floor/shiva/multi_tiles,
/area/point_loma/airbase/interior/cargo)
"avD" = (
Expand Down Expand Up @@ -8183,6 +8184,7 @@
/obj/structure/window/framed/new_varadero{
dir = 4
},
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/corsat/squares,
/area/point_loma/airbase/interior/workshop)
"axO" = (
Expand Down Expand Up @@ -12083,6 +12085,13 @@
},
/turf/open/hybrisa/street/roadlines,
/area/point_loma/airbase/interior/hospital)
"aJg" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
/obj/item/ammo_magazine/flamer_tank/survivor,
/turf/open/floor/corsat,
/area/point_loma/airbase/interior/cargo/lower)
"aJh" = (
/obj/structure/bed/chair/comfy/beige{
dir = 8
Expand Down Expand Up @@ -12970,6 +12979,7 @@
pixel_x = -5;
pixel_y = 33
},
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/corsat/squares,
/area/point_loma/airbase/interior/workshop)
"aLH" = (
Expand Down Expand Up @@ -13003,6 +13013,7 @@
/obj/item/stock_parts/capacitor/super{
pixel_y = 39
},
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/corsat/squares,
/area/point_loma/airbase/interior/workshop)
"aLK" = (
Expand Down Expand Up @@ -14170,6 +14181,7 @@
/obj/structure/window/framed/new_varadero{
dir = 4
},
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/corsat/squares,
/area/point_loma/airbase/interior/workshop)
"aPa" = (
Expand Down Expand Up @@ -17609,7 +17621,7 @@
/area/point_loma/airbase/mining_colony/interior/security)
"aZo" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/landmark/corpsespawner/miner,
/obj/effect/landmark/corpsespawner/point_loma/alphatech,
/turf/open/auto_turf/sand_white/layer1,
/area/point_loma/airbase/exterior/west)
"aZp" = (
Expand Down Expand Up @@ -25767,10 +25779,12 @@
"bvZ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/donut_box,
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/shiva/red/southwest,
/area/point_loma/airbase/interior/workshop)
"bwa" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/shiva/red,
/area/point_loma/airbase/interior/workshop)
"bwb" = (
Expand Down Expand Up @@ -25937,6 +25951,7 @@
/area/point_loma/airbase/interior/workshop)
"bwC" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/shiva/red/north,
/area/point_loma/airbase/interior/workshop)
"bwD" = (
Expand Down Expand Up @@ -28254,7 +28269,7 @@
/area/point_loma/airbase/mining_colony/caves)
"bCL" = (
/obj/effect/decal/cleanable/blood/xeno,
/obj/effect/landmark/corpsespawner/forecon_spotter,
/obj/effect/landmark/corpsespawner/point_loma/usasf,
/turf/open/new_varadero/taupe_concrete,
/area/point_loma/airbase/exterior/west)
"bCM" = (
Expand Down Expand Up @@ -37072,6 +37087,17 @@
/obj/item/ammo_casing/bullet,
/turf/open/asphalt/cement_shaded,
/area/point_loma/research_facility/hallway/east)
"cgh" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/ammo_magazine/flamer_tank/survivor{
pixel_y = 3
},
/obj/item/ammo_magazine/flamer_tank/survivor{
pixel_y = -2;
pixel_x = -9
},
/turf/open/floor/corsat/box,
/area/point_loma/airbase/interior/workshop)
"cgi" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal2";
Expand Down Expand Up @@ -37133,6 +37159,12 @@
/obj/structure/largecrate/empty,
/turf/open/floor/corsat/squares,
/area/point_loma/research_facility/hallway/east)
"cgr" = (
/obj/item/ammo_magazine/flamer_tank/survivor{
pixel_y = 3
},
/turf/closed/wall/new_varadero/reinforced,
/area/point_loma/airbase/interior/workshop)
"cgt" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal3";
Expand Down Expand Up @@ -38719,11 +38751,11 @@
/turf/open/floor/shiva/multi_tiles,
/area/point_loma/airbase/interior/cargo)
"clM" = (
/obj/effect/landmark/corpsespawner/miner,
/obj/effect/decal/cleanable/blood{
dir = 4;
icon_state = "gib6"
},
/obj/effect/landmark/corpsespawner/point_loma/alphatech,
/turf/open/floor/shiva/multi_tiles,
/area/point_loma/airbase/interior/cargo)
"clN" = (
Expand Down Expand Up @@ -96572,7 +96604,7 @@ chV
bLc
bKU
cgT
crL
aJg
bsQ
bsP
aJB
Expand Down Expand Up @@ -156322,7 +156354,7 @@ bQd
bQd
bQd
bQd
bPq
cgr
bdZ
aWP
aWP
Expand Down Expand Up @@ -157599,7 +157631,7 @@ bQd
bPq
aJA
aWP
asG
cgh
aWP
acx
aiL
Expand Down