Skip to content

Map system thing #9

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
TheCaramelion merged 4 commits into from
May 15, 2026
Merged

Map system thing #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
397ba5e
Map system thing
TheCaramelion May 14, 2026
6cca0ba
Makes the linter happy
TheCaramelion May 14, 2026
943b6f6
hate NIFs
TheCaramelion May 15, 2026
a452183
Fixup maps in TGM format
TheCaramelion May 15, 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
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
needs: start_gate
uses: ./.github/workflows/perform_regular_version_tests.yml
with:
maps: '{"paths":["USE_MAP_MINITEST"]}'
maps: '{"paths":["USE_MAP_GROUNDBASE"]}'
max_required_byond_client: 516

#run_extra_map_tests:
Expand All @@ -43,10 +43,9 @@ jobs:
completion_gate: # Serves as a non-moving target for branch rulesets
if: always() && !cancelled()
name: Completion Gate
needs:
[
needs: [
run_all_tests,
# run_extra_map_tests,
# run_extra_map_tests,
run_linters,
]
runs-on: ubuntu-24.04
Expand Down
11 changes: 1 addition & 10 deletions archive/maps/submaps/depreciated_vr/ert_base.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,15 +857,6 @@
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/specops/centcom)
"bI" = (
/obj/machinery/vending/nifsoft_shop{
categories = 111;
emagged = 1;
name = "Hacked NIFSoft Shop";
prices = list()
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/specops/centcom)
"bJ" = (
/obj/machinery/door/airlock/multi_tile/glass{
req_access = list(103)
Expand Down Expand Up @@ -3250,7 +3241,7 @@ ap
ba
bn
by
bI
aH
bd
ch
ch
Expand Down
17 changes: 1 addition & 16 deletions archive/maps/submaps/depreciated_vr/mercbase.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,21 +1910,6 @@
icon_state = "dark"
},
/area/antag/antag_base)
"cK" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 8
},
/obj/machinery/vending/nifsoft_shop{
categories = 111;
emagged = 1;
name = "Hacked NIFSoft Shop";
prices = list()
},
/turf/unsimulated/floor{
dir = 2;
icon_state = "dark"
},
/area/antag/antag_base)
"cL" = (
/obj/machinery/telecomms/allinone{
intercept = 1
Expand Down Expand Up @@ -5691,7 +5676,7 @@ cf
cn
ah
cz
cK
dh
cR
bq
dd
Expand Down
6 changes: 0 additions & 6 deletions archive/maps/submaps/depreciated_vr/talon1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,22 +719,16 @@
},
/obj/structure/table/steel,
/obj/item/radio/off{
channels = list("Talon" = 1);
pixel_y = 6
},
/obj/item/radio/off{
channels = list("Talon" = 1);
pixel_x = -6;
pixel_y = 4
},
/obj/item/radio/off{
channels = list("Talon" = 1);
pixel_x = 6;
pixel_y = 4
},
/obj/item/radio/off{
channels = list("Talon" = 1)
},
/turf/simulated/floor/tiled/eris/dark/orangecorner,
/area/space)
"bM" = (
Expand Down
15 changes: 0 additions & 15 deletions archive/maps/submaps/depreciated_vr/talon2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,6 @@
dir = 1
},
/obj/structure/closet/secure_closet/talon_captain,
/obj/item/radio/off{
channels = list("Talon" = 1)
},
/turf/simulated/floor/wood,
/area/space)
"aN" = (
Expand Down Expand Up @@ -341,19 +338,13 @@
dir = 1
},
/obj/structure/closet/secure_closet/talon_engineer,
/obj/item/radio/off{
channels = list("Talon" = 1)
},
/turf/simulated/floor/wood,
/area/space)
"bg" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/structure/closet/secure_closet/talon_pilot,
/obj/item/radio/off{
channels = list("Talon" = 1)
},
/turf/simulated/floor/wood,
/area/space)
"bh" = (
Expand Down Expand Up @@ -506,9 +497,6 @@
dir = 1
},
/obj/structure/closet/secure_closet/talon_doctor,
/obj/item/radio/off{
channels = list("Talon" = 1)
},
/turf/simulated/floor/wood,
/area/space)
"bx" = (
Expand All @@ -530,9 +518,6 @@
dir = 1
},
/obj/structure/closet/secure_closet/talon_guard,
/obj/item/radio/off{
channels = list("Talon" = 1)
},
/turf/simulated/floor/wood,
/area/space)
"bz" = (
Expand Down
5 changes: 0 additions & 5 deletions maps/gateway_vr/isle_de_monch.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,11 +538,6 @@
/obj/item/cell/emergency_light{
pixel_x = -4
},
/obj/item/radio/off{
channels = list("Talon" = 1);
pixel_x = 4;
pixel_y = -3
},
/turf/simulated/floor/outdoors/grass/forest,
/area/tether_away/beach/resort)
"xS" = (
Expand Down
52 changes: 5 additions & 47 deletions maps/groundbase/gb-centcomm.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,6 @@
/obj/effect/floor_decal/corner/green/bordercorner2{
dir = 8
},
/obj/machinery/computer/centrifuge,
/turf/simulated/floor/tiled/white,
/area/centcom/medical)
"eF" = (
Expand Down Expand Up @@ -2801,17 +2800,6 @@
},
/turf/simulated/floor/tiled,
/area/centcom/security)
"jY" = (
/obj/machinery/computer/diseasesplicer,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
/obj/effect/floor_decal/corner/green/border{
dir = 1
},
/obj/machinery/camera/network/crescent,
/turf/simulated/floor/tiled/white,
/area/centcom/medical)
"jZ" = (
/obj/effect/floor_decal/fancy_shuttle{
fancy_shuttle_tag = "tram"
Expand Down Expand Up @@ -3307,10 +3295,6 @@
/obj/item/pen,
/turf/simulated/floor/tiled,
/area/centcom/command)
"lD" = (
/obj/machinery/vending/nifsoft_shop,
/turf/simulated/floor/wood,
/area/centcom/restaurant)
"lG" = (
/obj/machinery/camera/network/crescent,
/turf/simulated/floor/tiled/freezer,
Expand Down Expand Up @@ -4950,12 +4934,6 @@
},
/turf/simulated/floor/tiled/white,
/area/centcom/control)
"qT" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/blue/border,
/obj/machinery/vending/nifsoft_shop,
/turf/simulated/floor/tiled,
/area/centcom/security)
"qU" = (
/obj/machinery/door/airlock/research{
id_tag = "researchdoor";
Expand Down Expand Up @@ -7814,24 +7792,6 @@
},
/turf/simulated/floor/tiled,
/area/centcom/security)
"At" = (
/obj/machinery/vending/nifsoft_shop{
categories = 111;
emagged = 1;
name = "Hacked NIFSoft Shop"
},
/turf/simulated/floor/tiled/dark,
/area/centcom/specops)
"Au" = (
/obj/machinery/disease2/incubator,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
/obj/effect/floor_decal/corner/green/border{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/centcom/medical)
"Aw" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 5
Expand Down Expand Up @@ -11928,7 +11888,6 @@
/turf/simulated/floor/tiled/eris/dark/cargo,
/area/shuttle/ccboat)
"NZ" = (
/obj/machinery/disease2/isolator,
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
},
Expand Down Expand Up @@ -12101,7 +12060,6 @@
/turf/simulated/floor/tiled/dark,
/area/centcom/security)
"OG" = (
/obj/machinery/disease2/diseaseanalyser,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
Expand Down Expand Up @@ -25096,7 +25054,7 @@ ZX
bR
bR
wY
jY
DM
we
pb
pb
Expand Down Expand Up @@ -25238,7 +25196,7 @@ ZX
bR
bR
wY
Au
OG
dh
aH
Iw
Expand Down Expand Up @@ -27681,7 +27639,7 @@ dR
dR
dR
Ls
lD
DF
DF
DF
Bm
Expand Down Expand Up @@ -30604,7 +30562,7 @@ Bh
Bh
Bh
Bh
At
wZ
wZ
wZ
Bh
Expand Down Expand Up @@ -33208,7 +33166,7 @@ vM
vM
be
be
qT
oC
rV
Lu
bm
Expand Down
Loading
Loading