Skip to content
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

Space ruin: The sieged lab, a submap extravaganza. #28393

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Space ruin: The sieged lab, a submap extravaganza. #28393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7f06a4e
Space ruin: The sieged lab, a submap extravaganza.
warriorstar-orion Oct 25, 2024
b357f9a
fix airlock access
warriorstar-orion Feb 14, 2025
1f7f3cf
Merge remote-tracking branch 'upstream/master' into maps/ruins/sieged…
warriorstar-orion Feb 19, 2025
936177b
fix skiff, make whole lab teleproof for now
warriorstar-orion Feb 19, 2025
6687862
indestructible rivet command room
warriorstar-orion Feb 19, 2025
4d4d193
add strategically placed helpful items/spawners
warriorstar-orion Feb 19, 2025
36ff4be
fix gun rack placement
warriorstar-orion Feb 20, 2025
ba577fa
no butchering on harbinger murder
warriorstar-orion Feb 20, 2025
6fb9ebd
small adjustments
warriorstar-orion Feb 20, 2025
48b95a4
Merge remote-tracking branch 'upstream/master' into maps/ruins/sieged…
warriorstar-orion Feb 20, 2025
0b7f7c4
esword drop as a treat, m90 seems excessive
warriorstar-orion Feb 20, 2025
c6864b7
make boss door obvious
warriorstar-orion Feb 20, 2025
5ed449e
Merge remote-tracking branch 'upstream/master' into maps/ruins/sieged…
warriorstar-orion Feb 20, 2025
9db5c31
Lots of map/boss fixes
warriorstar-orion Feb 20, 2025
c452b1a
Update everything for razor wire, try and unfuck some weird AI behavior
warriorstar-orion Feb 21, 2025
fcc1115
stupid mines
warriorstar-orion Feb 21, 2025
4028cad
Merge remote-tracking branch 'upstream/master' into maps/ruins/sieged…
warriorstar-orion Feb 22, 2025
4938758
sort and fix comments for different ruin categories
warriorstar-orion Feb 22, 2025
4a28875
always place ruin for TM
warriorstar-orion Feb 22, 2025
9983c5b
first batch of fixes
warriorstar-orion Feb 22, 2025
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
4,008 changes: 4,008 additions & 0 deletions _maps/map_files/RandomRuins/SpaceRuins/sieged_lab.dmm
View file
Open in desktop

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions _maps/map_files/RandomRuins/SpaceRuins/sieged_lab.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
[
{
"type": "SubmapExtractInsert",
"submap_size_x": 2,
"submap_size_y": 8,
"submap_size_z": 1,
"submaps_dmm": "submaps/sieged_lab_submaps.dmm",
"marker_extract": "/obj/effect/map_effect/marker/mapmanip/submap/extract/ruin/sieged_lab/vert_hallway",
"marker_insert": "/obj/effect/map_effect/marker/mapmanip/submap/insert/ruin/sieged_lab/vert_hallway",
"submaps_can_repeat": false
},
{
// Dvorak turret room, but randomized contents
"type": "SubmapExtractInsert",
"submap_size_x": 8,
"submap_size_y": 2,
"submap_size_z": 1,
"submaps_dmm": "submaps/sieged_lab_submaps.dmm",
"marker_extract": "/obj/effect/map_effect/marker/mapmanip/submap/extract/ruin/sieged_lab/horiz_hallway",
"marker_insert": "/obj/effect/map_effect/marker/mapmanip/submap/insert/ruin/sieged_lab/horiz_hallway",
"submaps_can_repeat": false
},
{
// Dvorak turret room, but randomized contents
"type": "SubmapExtractInsert",
"submap_size_x": 5,
"submap_size_y": 6,
"submap_size_z": 1,
"submaps_dmm": "submaps/sieged_lab_submaps.dmm",
"marker_extract": "/obj/effect/map_effect/marker/mapmanip/submap/extract/ruin/sieged_lab/medium_room",
"marker_insert": "/obj/effect/map_effect/marker/mapmanip/submap/insert/ruin/sieged_lab/medium_room",
"submaps_can_repeat": false
},
{
// Dvorak turret room, but randomized contents
"type": "SubmapExtractInsert",
"submap_size_x": 9,
"submap_size_y": 4,
"submap_size_z": 1,
"submaps_dmm": "submaps/sieged_lab_submaps.dmm",
"marker_extract": "/obj/effect/map_effect/marker/mapmanip/submap/extract/ruin/sieged_lab/wide_room",
"marker_insert": "/obj/effect/map_effect/marker/mapmanip/submap/insert/ruin/sieged_lab/wide_room",
"submaps_can_repeat": false
}
]
Loading