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.

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

BAPI - mapmanip submap area/turf handling and submap repeating #19523

Merged
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
Binary file modified bapi.dll
Binary file not shown.
5 changes: 5 additions & 0 deletions code/modules/effects/map_effects/marker/mapmanip.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@
icon_state = "mapmanip_insert"
pixel_x = -32
pixel_y = -32

/obj/effect/map_effect/marker_helper/mapmanip/submap/edge
name = "mapmanip helper marker, edge of submap"
icon = 'icons/effects/map_effects.dmi'
icon_state = "mapmanip_submap_edge"
2 changes: 1 addition & 1 deletion code/modules/maps/reader.dm
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ GLOBAL_LIST_INIT(_preloader_path, null)

/area/template_noop
name = "Area Passthrough"
icon_state = "space"
icon_state = "noop"

/turf/template_noop
name = "Turf Passthrough"
Expand Down
8 changes: 8 additions & 0 deletions html/changelogs/DreamySkrell-bapi-mapmanip-submaps-noop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

author: DreamySkrell

delete-after: True

changes:
- rscadd: "BAPI - mapmanip submap noop handling."
- rscadd: "BAPI - mapmanip submap repeat setting."
Binary file modified icons/effects/map_effects.dmi
Binary file not shown.
Binary file modified icons/effects/map_effects_96x96.dmi
Binary file not shown.
Binary file modified icons/turf/areas.dmi
Binary file not shown.
79 changes: 64 additions & 15 deletions maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,12 @@
/obj/machinery/power/apc/low/east,
/turf/simulated/floor/plating,
/area/maintenance/operations)
"aEj" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/turf/simulated/floor/tiled,
/area/operations/storage)
"aEl" = (
/obj/machinery/door/blast/shutters/open{
dir = 2;
Expand Down Expand Up @@ -3305,6 +3311,10 @@
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"crL" = (
/obj/machinery/firealarm/south,
/turf/simulated/floor/tiled,
/area/operations/storage)
"crZ" = (
/obj/effect/floor_decal/industrial/warning{
dir = 5
Expand Down Expand Up @@ -8642,6 +8652,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"fTV" = (
/obj/effect/map_effect/marker_helper/mapmanip/submap/edge{
dir = 1
},
/turf/simulated/floor/tiled,
/area/operations/storage)
"fUb" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -12977,6 +12993,15 @@
/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/dark,
/area/hangar/intrepid)
"iZa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/turf/simulated/floor/tiled,
/area/operations/storage)
"iZi" = (
/turf/simulated/wall/shuttle/unique/scc/mining{
icon_state = "7,3"
Expand Down Expand Up @@ -16009,6 +16034,13 @@
},
/turf/simulated/floor/reinforced/oxygen,
/area/engineering/atmos/air)
"ldd" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/map_effect/marker_helper/mapmanip/submap/edge{
dir = 4
},
/turf/simulated/floor/tiled,
/area/operations/storage)
"ldI" = (
/obj/machinery/light/small/emergency{
dir = 1
Expand Down Expand Up @@ -21051,8 +21083,12 @@
/turf/simulated/floor/tiled/dark,
/area/hangar/auxiliary)
"owJ" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/light/small{
dir = 8
},
/obj/effect/map_effect/marker/mapmanip/submap/insert/sccv_horizon/ops_warehouse_small_storage,
/turf/simulated/floor/plating,
/turf/simulated/floor/tiled,
/area/operations/storage)
"owM" = (
/obj/structure/shuttle_part/scc/research{
Expand Down Expand Up @@ -23954,6 +23990,11 @@
},
/turf/simulated/floor/lino,
/area/shuttle/intrepid/quarters)
"qtt" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/alarm/west,
/turf/simulated/floor/tiled,
/area/operations/storage)
"qtO" = (
/obj/structure/closet/crate,
/obj/item/circuitboard/autolathe,
Expand Down Expand Up @@ -30363,7 +30404,11 @@
/turf/simulated/floor/plating,
/area/shuttle/intrepid/cockpit)
"uTy" = (
/turf/simulated/floor/plating,
/obj/machinery/camera/network/supply{
c_tag = "Operations - Warehouse Starboard Aft Storage Room";
dir = 4
},
/turf/simulated/floor/tiled,
/area/operations/storage)
"uTz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
Expand Down Expand Up @@ -35438,6 +35483,10 @@
},
/turf/space/dynamic,
/area/horizon/exterior)
"ygk" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled,
/area/operations/storage)
"ygx" = (
/obj/effect/floor_decal/corner/dark_green{
dir = 9
Expand Down Expand Up @@ -45624,10 +45673,10 @@ hdK
bmx
fif
qdE
tiV
qtt
uTy
uTy
uTy
uTy
giX
owJ
qdE
tiV
Expand Down Expand Up @@ -45827,11 +45876,11 @@ lVt
vtn
fif
qdE
uTy
uTy
uTy
uTy
uTy
fTV
ygk
iZa
aEj
crL
qdE
aQN
nCV
Expand Down Expand Up @@ -46030,11 +46079,11 @@ fif
uCB
fif
qdE
uTy
uTy
uTy
uTy
uTy
iQI
ldd
sWr
giX
iQI
qdE
iQI
giX
Expand Down
5 changes: 3 additions & 2 deletions maps/sccv_horizon/sccv_horizon-1_deck_1.jsonc
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[
{
"type": "InsertExtract",
"type": "SubmapExtractInsert",
"submap_size_x": 3,
"submap_size_y": 5,
"submaps_dmm": "submaps/ops_warehouse_small_storage.dmm",
"marker_extract": "/obj/effect/map_effect/marker/mapmanip/submap/extract/sccv_horizon/ops_warehouse_small_storage",
"marker_insert": "/obj/effect/map_effect/marker/mapmanip/submap/insert/sccv_horizon/ops_warehouse_small_storage"
"marker_insert": "/obj/effect/map_effect/marker/mapmanip/submap/insert/sccv_horizon/ops_warehouse_small_storage",
"submaps_can_repeat": true
}
]
Loading
Loading