Skip to content

Commit

Permalink
TGS Test Merge (#1432)
Browse files Browse the repository at this point in the history
  • Loading branch information
tgstation-server committed Dec 25, 2024
2 parents c7f1fd3 + 74a2572 commit b66c44c
Show file tree
Hide file tree
Showing 26 changed files with 329,780 additions and 85 deletions.
3 changes: 2 additions & 1 deletion _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
#include "map_files\CogStation\CogStation.dmm"
#include "map_files\TauStation\TauStation.dmm"
#include "splurt_maps\map_files\Smexistation\Snaxi_Splurt.dmm"
// BLUEMOON EDIT
#include "map_files\bluemoon_maps\icemoonstation.dmm"
// #include "modular_bluemoon\_maps\PrisonStation\PrisonStation.dmm"
#include "splurt_maps\map_files\4Nalstation\4Nal_station.dmm"

#ifdef CIBUILDING
#include "templates.dm"
#endif
Expand Down
1 change: 1 addition & 0 deletions _maps/icemoonstation.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define FORCE_MAP "_maps/icemoonstation.json"
43 changes: 43 additions & 0 deletions _maps/icemoonstation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"map_name": "IceMoon Station",
"map_path": "map_files/bluemoon_maps",
"map_file": "icemoonstation.dmm",
"station_ruin_budget": 0,
"space_ruin_levels": 0,
"space_empty_levels": 0,
"shuttles": {
"cargo": "cargo_box",
"ferry": "ferry_fancy",
"whiteship": "whiteship_box",
"emergency": "emergency_box"
},
"traits": [
{
"Up": 1,
"Gravity": true,
"Baseturf": "/turf/open/lava/plasma/ice_moon",
"Ice Ruins Underground": true,
"Linkage": "null",
"Mining": true
},
{
"Up": 1,
"Down": -1,
"Gravity": true,
"Baseturf": "/turf/open/openspace/icemoon",
"Ice Ruins Underground": true,
"Linkage": "null",
"Mining": true
},
{
"Down": -1,
"Gravity": true,
"Baseturf": "/turf/open/openspace",
"Ice Ruins Underground": true,
"Weather_Snowstorm": true,
"Linkage": "null",
"Mining": true
}
],
"minetype": "none"
}
149 changes: 149 additions & 0 deletions _maps/map_files/bluemoon_maps/ice_taxi.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/snowtaxi)
"b" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light,
/turf/open/floor/mineral/titanium/tiled,
/area/shuttle/snowtaxi)
"e" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"f" = (
/obj/structure/chair/comfy/shuttle,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/titanium/tiled,
/area/shuttle/snowtaxi)
"g" = (
/obj/machinery/door/airlock/titanium{
name = "Mining Shuttle Airlock"
},
/obj/docking_port/mobile{
callTime = 5;
dwidth = 3;
height = 4;
shuttle_id = "snow_taxi";
name = "snow taxi";
port_direction = 8;
width = 6
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"i" = (
/obj/machinery/light,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/tiled,
/area/shuttle/snowtaxi)
"j" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/tiled,
/area/shuttle/snowtaxi)
"k" = (
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/snowtaxi)
"l" = (
/obj/structure/fans/tiny/invisible,
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating/airless,
/area/shuttle/snowtaxi)
"u" = (
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium/tiled,
/area/shuttle/snowtaxi)
"D" = (
/obj/structure/fans/tiny/invisible,
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"E" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"S" = (
/obj/machinery/light{
dir = 1
},
/obj/machinery/computer/shuttle/snow_taxi{
dir = 2
},
/turf/open/floor/mineral/titanium/tiled,
/area/shuttle/snowtaxi)
"W" = (
/obj/machinery/door/airlock/titanium{
name = "Mining Shuttle Airlock"
},
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)

(1,1,1) = {"
a
e
D
e
a
"}
(2,1,1) = {"
a
S
k
i
a
"}
(3,1,1) = {"
e
u
k
j
l
"}
(4,1,1) = {"
W
k
k
k
g
"}
(5,1,1) = {"
e
u
k
j
D
"}
(6,1,1) = {"
a
f
k
b
a
"}
(7,1,1) = {"
a
E
E
E
a
"}
Loading

0 comments on commit b66c44c

Please sign in to comment.