shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mapfix

Browse Source
This commit is contained in:
LetterN
2021-03-15 21:02:50 +08:00
parent 42c04ea087
commit a478555dbd
25 changed files with 1279 additions and 1278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1807
_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
View File

File diff suppressed because it is too large Load Diff

2
_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm
View File

@@ -3,7 +3,7 @@
/turf/closed/indestructible/riveted/uranium,
/area/icemoon/surface/outdoors)
"b" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/surface/outdoors)
"c" = (
/turf/open/water/cursed_spring,

2
_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
View File

@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/surface/outdoors)
"b" = (
/obj/structure/sign/poster/contraband/lusty_xenomorph,

6
_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
View File

@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/surface/outdoors)
"b" = (
/turf/closed/wall/mineral/wood/nonmetal,
@@ -38,7 +38,7 @@
/area/ruin/unpowered)
"h" = (
/obj/structure/flora/rock/icy,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/surface/outdoors)
"i" = (
/turf/template_noop,
@@ -62,7 +62,7 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"n" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered)
"o" = (
/obj/item/reagent_containers/food/drinks/beer,

2
_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View File

@@ -233,7 +233,7 @@
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
"tN" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/underground/explored)
"tX" = (
/obj/structure/table/wood,

2
_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
View File

@@ -13,7 +13,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/powered/bathhouse)
"d" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/underground/explored)
"e" = (
/obj/structure/mirror{

8
_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
View File

@@ -1,9 +1,9 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/mineral/random/volcanic/more_caves,
/turf/closed/mineral/random/volcanic,
/area/icemoon/surface/outdoors/unexplored)
"b" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/underground/explored)
"y" = (
/mob/living/simple_animal/hostile/megafauna/dragon{
@@ -13,7 +13,7 @@
/turf/open/floor/mineral/gold,
/area/icemoon/underground/explored)
"B" = (
/turf/closed/mineral/random/no_caves,
/turf/closed/mineral/random,
/area/icemoon/surface/outdoors/unexplored)
"P" = (
/turf/open/floor/mineral/silver,
@@ -22,7 +22,7 @@
/turf/open/floor/mineral/gold,
/area/icemoon/underground/explored)
"T" = (
/turf/closed/mineral/random/no_caves,
/turf/closed/mineral/random,
/area/icemoon/underground/explored)
(1,1,1) = {"

40
_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
View File

@@ -12,7 +12,7 @@
/turf/closed/wall/mineral/wood,
/area/ruin/unpowered/buried_library)
"ad" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/underground/explored)
"ae" = (
/turf/open/floor/wood,
@@ -36,7 +36,7 @@
/turf/open/floor/plasteel/cult,
/area/ruin/unpowered/buried_library)
"ak" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"al" = (
/turf/closed/wall/mineral/iron,
@@ -67,7 +67,7 @@
"as" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/paper/fluff/ruins/oldstation/protosing,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"at" = (
/obj/structure/fluff/paper,
@@ -75,14 +75,14 @@
/area/ruin/unpowered/buried_library)
"av" = (
/obj/structure/bookcase/random,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"aw" = (
/turf/open/floor/plating,
/area/ruin/unpowered/buried_library)
"ax" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"ay" = (
/obj/machinery/door/keycard/library,
@@ -98,7 +98,7 @@
/area/ruin/unpowered/buried_library)
"aC" = (
/obj/item/feather,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"aD" = (
/turf/open/floor/carpet/black,
@@ -111,7 +111,7 @@
"aF" = (
/obj/item/book/manual/random,
/obj/effect/decal/cleanable/dirt,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"aG" = (
/obj/structure/table/bronze,
@@ -145,7 +145,7 @@
"aM" = (
/obj/item/stack/sheet/mineral/wood,
/obj/item/book/manual/random,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"aN" = (
/obj/structure/statue/sandstone/venus,
@@ -157,7 +157,7 @@
/area/ruin/unpowered/buried_library)
"aP" = (
/obj/item/keycard/library,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"aQ" = (
/obj/effect/decal/cleanable/dirt,
@@ -207,7 +207,7 @@
/area/ruin/unpowered/buried_library)
"ba" = (
/obj/structure/barricade/wooden/snowed,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bc" = (
/obj/item/feather,
@@ -239,7 +239,7 @@
/area/ruin/unpowered/buried_library)
"bg" = (
/obj/item/paper/fluff/ruins/oldstation/protogun,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bh" = (
/obj/effect/decal/cleanable/dirt,
@@ -248,11 +248,11 @@
/area/ruin/unpowered/buried_library)
"bi" = (
/obj/structure/fluff/paper,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bj" = (
/obj/item/book/manual/random,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bk" = (
/obj/structure/fluff/paper{
@@ -262,25 +262,25 @@
/area/ruin/unpowered/buried_library)
"bl" = (
/obj/item/storage/box/fountainpens,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bm" = (
/obj/structure/fluff/paper/stack,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bn" = (
/obj/item/book/manual/random,
/obj/item/stack/sheet/mineral/wood,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bo" = (
/obj/item/stack/sheet/mineral/wood,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bp" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/fluff/paper,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bq" = (
/obj/structure/mineral_door/wood,
@@ -289,7 +289,7 @@
/area/ruin/unpowered/buried_library)
"br" = (
/obj/structure/girder,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/ruin/unpowered/buried_library)
"bt" = (
/obj/effect/decal/cleanable/dirt,
@@ -297,7 +297,7 @@
/area/template_noop)
"bu" = (
/obj/item/stack/sheet/mineral/wood,
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/underground/explored)
"bw" = (
/turf/open/floor/wood,

2
_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm
View File

@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/icemoon/underground/explored)
/area/template_noop)
"b" = (
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/explored)

2
_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm
View File

@@ -3,7 +3,7 @@
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
"b" = (
/turf/closed/mineral/random/snow/no_caves,
/turf/closed/mineral/random/snow,
/area/icemoon/underground/explored)
"e" = (
/obj/structure/spawner/nether,

2
_maps/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm
View File

@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/lavaland/surface/outdoors)
/area/template_noop)
"b" = (
/obj/structure/elite_tumor,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,

10
_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
View File

@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
/turf/template_noop,
/area/template_noop)
"b" = (
/turf/closed/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -260,7 +260,7 @@ c
a
"}
(9,1,1) = {"
b
a
c
c
d
@@ -279,8 +279,8 @@ c
a
"}
(10,1,1) = {"
b
b
a
a
c
c
c

2
_maps/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm
View File

@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/lavaland/surface/outdoors)
/area/template_noop)
"b" = (
/obj/effect/sliding_puzzle/lavaland,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,

2
_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
View File

@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/lavaland/surface/outdoors)
/area/template_noop)
"b" = (
/turf/closed/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)

507
_maps/RandomRuins/SpaceRuins/spacehermit.dmm
View File

File diff suppressed because it is too large Load Diff

20
_maps/map_files/BoxStation/BoxStation.dmm
View File

@@ -974,7 +974,7 @@
/area/command/heads_quarters/hos)
"acs" = (
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/hos";
areastring = "/area/command/heads_quarters/hos";
dir = 8;
name = "Head of Security's Office APC";
pixel_x = -25
@@ -20702,7 +20702,7 @@
/area/command/bridge)
"aWW" = (
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/bridge";
areastring = "/area/command";
name = "Bridge APC";
pixel_y = -24
},
@@ -22486,7 +22486,7 @@
/area/cargo/warehouse)
"bbu" = (
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/captain";
areastring = "/area/command/heads_quarters/captain";
dir = 1;
name = "Captain's Office APC";
pixel_y = 23
@@ -26309,7 +26309,7 @@
/area/maintenance/central)
"bkX" = (
/obj/machinery/power/apc{
areastring = "/area/bridge/meeting_room";
areastring = "/area/command/meeting_room";
dir = 4;
name = "Conference Room APC";
pixel_x = 24
@@ -33767,7 +33767,7 @@
/area/maintenance/port/aft)
"bCf" = (
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/hor";
areastring = "/area/command/heads_quarters/rd";
dir = 8;
name = "RD Office APC";
pixel_x = -25
@@ -37578,9 +37578,9 @@
/area/medical/medbay/central)
"bKS" = (
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/cmo";
areastring = "/area/command/heads_quarters/cmo";
dir = 1;
name = "CM Office APC";
name = "CMO Office APC";
pixel_y = 23
},
/obj/structure/cable{
@@ -43755,7 +43755,7 @@
"cbp" = (
/obj/structure/closet/secure_closet/engineering_chief,
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/crew_quarters/heads/chief";
areastring = "/area/command/heads_quarters/ce";
dir = 4;
name = "CE Office APC";
pixel_x = 24
@@ -45793,7 +45793,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
/area/command)
"cgQ" = (
/obj/machinery/camera{
c_tag = "Engineering East";
@@ -51521,7 +51521,7 @@
icon_state = "4-8"
},
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/hop";
areastring = "/area/command/heads_quarters/hop";
name = "Head of Personnel APC";
pixel_y = -24
},

10
_maps/map_files/CogStation/CogStation.dmm
View File

@@ -14551,7 +14551,7 @@
},
/obj/structure/cable,
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/bridge";
areastring = "/area/command";
name = "Bridge APC";
pixel_y = -24
},
@@ -25583,7 +25583,7 @@
pixel_y = 1
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hor";
areastring = "/area/command/heads_quarters/rd";
dir = 8;
name = "Research Director's Office APC";
pixel_x = -25
@@ -36028,7 +36028,7 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/cmo";
areastring = "/area/command/heads_quarters/cmo";
dir = 1;
name = "Chief Medical Officer's Office APC";
pixel_y = 23
@@ -36238,7 +36238,7 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/service/heads/captain";
areastring = "/area/command/heads_quarters/captain";
dir = 4;
name = "Captain's Quarters APC";
pixel_x = 24
@@ -59843,7 +59843,7 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/chief";
areastring = "/area/command/heads_quarters/ce";
dir = 4;
name = "Chief Engineer's Office APC";
pixel_x = 24

20
_maps/map_files/Deltastation/DeltaStation2.dmm
View File

@@ -40610,7 +40610,7 @@
"buT" = (
/obj/item/kirbyplants/random,
/obj/machinery/power/apc{
areastring = "/area/service/heads/hos";
areastring = "/area/command/heads_quarters/hos";
name = "Head of Security's Office APC";
pixel_y = -26
},
@@ -48939,7 +48939,7 @@
"bGY" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
areastring = "/area/bridge";
areastring = "/area/command";
name = "Bridge APC";
pixel_y = -26
},
@@ -51333,7 +51333,7 @@
icon_state = "0-2"
},
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/bridge/meeting_room/council";
areastring = "/area/command/meeting_room/council";
dir = 1;
name = "Council Chambers APC";
pixel_y = 23
@@ -55340,7 +55340,7 @@
/area/command/heads_quarters/captain)
"bQV" = (
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/service/heads/captain";
areastring = "/area/command/heads_quarters/captain";
name = "Captain's Office APC";
pixel_y = -24
},
@@ -60738,7 +60738,7 @@
"bYu" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
areastring = "/area/service/heads/chief";
areastring = "/area/command/heads_quarters/ce";
name = "Chief Engineer's APC";
pixel_y = -26
},
@@ -64350,7 +64350,7 @@
/area/command/heads_quarters/hop)
"cer" = (
/obj/machinery/power/apc{
areastring = "/area/service/heads/hop";
areastring = "/area/command/heads_quarters/hop";
dir = 4;
name = "HoP Office APC";
pixel_x = 24
@@ -65669,7 +65669,7 @@
dir = 8
},
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/service/heads/captain/private";
areastring = "/area/command/heads_quarters/captain/private";
name = "Captain's Quarters APC";
pixel_y = -24
},
@@ -78968,7 +78968,7 @@
icon_state = "2-4"
},
/obj/machinery/power/apc{
areastring = "/area/bridge/showroom/corporate";
areastring = "/area/command/corporate_showroom";
dir = 8;
name = "Corporate Lounge APC";
pixel_x = -25
@@ -102498,7 +102498,7 @@
/area/science/mixing)
"drX" = (
/obj/machinery/power/apc{
areastring = "/area/service/heads/hor";
areastring = "/area/command/heads_quarters/rd";
dir = 8;
name = "Research Director's Office APC";
pixel_x = -25
@@ -107128,7 +107128,7 @@
dir = 4
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/cmo";
areastring = "/area/command/heads_quarters/cmo";
dir = 4;
name = "Chief Medical Officer's Office APC";
pixel_x = 24

14
_maps/map_files/KiloStation/KiloStation.dmm
View File

@@ -6592,7 +6592,7 @@
icon_state = "2-8"
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hos";
areastring = "/area/command/heads_quarters/hos";
dir = 1;
name = "Head of Security's Office APC";
pixel_y = 23
@@ -9326,7 +9326,7 @@
"apN" = (
/obj/structure/bed/dogbed/ian,
/obj/machinery/power/apc{
areastring = "/area/service/heads/hop";
areastring = "/area/command/heads_quarters/hop";
dir = 1;
name = "Head of Personnel's Office APC";
pixel_y = 23
@@ -14158,7 +14158,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/recharger,
/obj/machinery/power/apc{
areastring = "/area/service/heads/chief";
areastring = "/area/command/heads_quarters/ce";
dir = 4;
name = "Chief Engineer's Office APC";
pixel_x = 24
@@ -22370,7 +22370,7 @@
/obj/item/hand_labeler,
/obj/item/reagent_containers/spray/cleaner,
/obj/machinery/power/apc{
areastring = "/area/service/heads/cmo";
areastring = "/area/command/heads_quarters/cmo";
dir = 1;
name = "CMO's Office APC";
pixel_y = 23
@@ -35601,7 +35601,7 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hor";
areastring = "/area/command/heads_quarters/rd";
dir = 1;
name = "RD Office APC";
pixel_y = 23
@@ -42305,7 +42305,7 @@
},
/obj/item/kirbyplants,
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/bridge";
areastring = "/area/command";
dir = 8;
name = "Bridge APC";
pixel_x = -25
@@ -46271,7 +46271,7 @@
/obj/structure/table/wood,
/obj/machinery/recharger,
/obj/machinery/power/apc{
areastring = "/area/service/heads/captain";
areastring = "/area/command/heads_quarters/captain";
dir = 4;
name = "Captain's Office APC";
pixel_x = 24

30
_maps/map_files/LambdaStation/lambda.dmm
View File

@@ -13486,7 +13486,7 @@
/obj/item/book/manual/wiki/security_space_law,
/obj/item/cartridge/detective,
/obj/machinery/power/apc{
areastring = "/area/service/heads/hos";
areastring = "/area/command/heads_quarters/hos";
dir = 1;
name = "Head of Security's Office APC";
pixel_y = 23
@@ -15490,7 +15490,7 @@
icon_state = "4-8"
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hor";
areastring = "/area/command/heads_quarters/rd";
name = "RD Office APC";
pixel_y = -27
},
@@ -15986,7 +15986,7 @@
pixel_y = -32
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hos/private";
areastring = "/area/command/heads_quarters/hos/private";
dir = 4;
name = "Head of Security's Private Quarters APC";
pixel_x = 24
@@ -23517,7 +23517,7 @@
/area/science/explab)
"aQJ" = (
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/service/heads/hor/private";
areastring = "/area/command/heads_quarters/rd/private";
name = "Research Director's Quarters APC";
pixel_y = -24
},
@@ -24839,7 +24839,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/service/heads/captain";
areastring = "/area/command/heads_quarters/captain";
dir = 8;
name = "Captain's Office APC";
pixel_x = -25
@@ -29516,7 +29516,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/bridge/meeting_room";
areastring = "/area/command/meeting_room";
dir = 8;
name = "Council Chambers APC";
pixel_x = -25
@@ -29549,7 +29549,7 @@
icon_state = "4-8"
},
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/service/heads/captain/private";
areastring = "/area/command/heads_quarters/captain/private";
name = "Captain's Quarters APC";
pixel_y = -24
},
@@ -29580,7 +29580,7 @@
/area/command/heads_quarters/captain/private)
"beO" = (
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/service/heads/hop/private";
areastring = "/area/command/heads_quarters/hop/private";
dir = 4;
name = "Head of Personnel's Quarters APC";
pixel_x = 24
@@ -32917,7 +32917,7 @@
},
/obj/structure/cable,
/obj/machinery/power/apc{
areastring = "/area/service/heads/cmo";
areastring = "/area/command/heads_quarters/cmo";
dir = 8;
name = "Chief Medical Officer's Office APC";
pixel_x = -25
@@ -36212,7 +36212,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hop";
areastring = "/area/command/heads_quarters/hop";
name = "Head of Personnel APC";
pixel_y = -24
},
@@ -36284,7 +36284,7 @@
icon_state = "0-2"
},
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/bridge";
areastring = "/area/command";
dir = 4;
name = "Bridge APC";
pixel_x = 24
@@ -40167,7 +40167,7 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/bridge/showroom/corporate";
areastring = "/area/command/corporate_showroom";
dir = 4;
name = "Nanotrasen Corporate Showroom APC";
pixel_x = 24
@@ -43460,7 +43460,7 @@
dir = 10
},
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/service/heads/cmo/private";
areastring = "/area/command/heads_quarters/cmo/private";
dir = 4;
name = "Chief Medical Officer's Quarters APC";
pixel_x = 24
@@ -44185,7 +44185,7 @@
icon_state = "1-2"
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/chief";
areastring = "/area/command/heads_quarters/ce";
dir = 4;
name = "Chief Engineer's APC";
pixel_x = 24
@@ -45711,7 +45711,7 @@
pixel_x = -32
},
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/service/heads/chief/private";
areastring = "/area/command/heads_quarters/ce/private";
name = "Chief Engineer's Quarters APC";
pixel_y = -24
},

23
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -11210,7 +11210,7 @@
"auX" = (
/obj/machinery/photocopier,
/obj/machinery/power/apc{
areastring = "/area/service/heads/hos";
areastring = "/area/command/heads_quarters/hos";
dir = 4;
name = "Head of Security's Office APC";
pixel_x = 24
@@ -25733,7 +25733,7 @@
"aYr" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
areastring = "/area/service/heads/chief";
areastring = "/area/command/heads_quarters/ce";
dir = 4;
name = "CE Office APC";
pixel_x = 24
@@ -34277,7 +34277,7 @@
/area/command/heads_quarters/hop)
"bop" = (
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/bridge";
areastring = "/area/command";
dir = 8;
name = "Bridge APC";
pixel_x = -25
@@ -35568,7 +35568,7 @@
/obj/structure/table/wood,
/obj/item/book/manual/wiki/security_space_law,
/obj/machinery/power/apc{
areastring = "/area/service/heads/captain/private";
areastring = "/area/command/heads_quarters/captain/private";
dir = 8;
name = "Captain's Quarters APC";
pixel_x = -25
@@ -37065,7 +37065,7 @@
icon_state = "0-2"
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hop";
areastring = "/area/command/heads_quarters/hop";
dir = 1;
name = "Head of Personnel APC";
pixel_y = 23
@@ -46766,7 +46766,7 @@
/area/command/corporate_showroom)
"bOF" = (
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/bridge/showroom/corporate";
areastring = "/area/command/corporate_showroom";
dir = 4;
name = "Nanotrasen Corporate Showroom APC";
pixel_x = 24
@@ -59771,7 +59771,7 @@
/area/command/heads_quarters/cmo)
"coS" = (
/obj/machinery/power/apc{
areastring = "/area/service/heads/cmo";
areastring = "/area/command/heads_quarters/cmo";
dir = 4;
name = "CMO's Office APC";
pixel_x = 24
@@ -64075,7 +64075,7 @@
/area/science/research)
"cwP" = (
/obj/machinery/power/apc{
areastring = "/area/service/heads/hor";
areastring = "/area/command/heads_quarters/rd";
name = "RD Office APC";
pixel_y = -27
},
@@ -82337,6 +82337,9 @@
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"ohu" = (
/turf/open/space/basic,
/area/command/heads_quarters/captain)
"oms" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
@@ -121905,7 +121908,7 @@ oRp
oRp
aaa
aai
aaa
ohu
aaa
aaa
aaa
@@ -130476,7 +130479,7 @@ aaf
aaf
aaa
aaa
aaa
ohu
aaa
aaa
aaa

14
_maps/map_files/OmegaStation/OmegaStation.dmm
View File

@@ -713,7 +713,7 @@
icon_state = "1-8"
},
/obj/machinery/power/apc{
areastring = "/area/bridge";
areastring = "/area/command";
name = "Bridge APC";
pixel_y = -26
},
@@ -3019,7 +3019,7 @@
icon_state = "0-2"
},
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/service/heads/hop";
areastring = "/area/command/heads_quarters/hop";
dir = 1;
name = "Head of Personnel Quarter's APC";
pixel_y = 23
@@ -3754,7 +3754,7 @@
/area/maintenance/fore)
"afS" = (
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/service/heads/hos";
areastring = "/area/command/heads_quarters/hos";
dir = 1;
name = "Head of Security's Office APC";
pixel_y = 23
@@ -4331,7 +4331,7 @@
dir = 8
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/captain/private";
areastring = "/area/command/heads_quarters/captain/private";
dir = 8;
name = "Captain's Quarters APC";
pixel_x = -25;
@@ -9049,7 +9049,7 @@
},
/obj/effect/turf_decal/tile/yellow,
/obj/machinery/power/apc{
areastring = "/area/service/heads/chief";
areastring = "/area/command/heads_quarters/ce";
dir = 4;
name = "Chief Engineer's Office APC";
pixel_x = 24
@@ -26316,7 +26316,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/cmo";
areastring = "/area/command/heads_quarters/cmo";
dir = 1;
name = "CMO's Office APC";
pixel_y = 23
@@ -34996,7 +34996,7 @@
dir = 4
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hor";
areastring = "/area/command/heads_quarters/rd";
dir = 1;
name = "RD Office APC";
pixel_y = 23

4
_maps/map_files/PubbyStation/PubbyStation.dmm
View File

@@ -11090,7 +11090,7 @@
"azo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/bridge";
areastring = "/area/command";
dir = 4;
name = "Bridge APC";
pixel_x = 24
@@ -35623,7 +35623,7 @@
/area/command/heads_quarters/cmo)
"bDx" = (
/obj/machinery/power/apc{
areastring = "/area/service/heads/cmo";
areastring = "/area/command/heads_quarters/cmo";
dir = 4;
name = "CMO's Office APC";
pixel_x = 24

18
_maps/map_files/Snaxi/Snaxi.dmm
View File

@@ -6821,7 +6821,7 @@
dir = 1
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hos";
areastring = "/area/command/heads_quarters/hos";
dir = 8;
name = "Head of Security's Office APC";
pixel_x = -25
@@ -8665,7 +8665,7 @@
dir = 1
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/captain";
areastring = "/area/command/heads_quarters/captain";
name = "Captain's Office APC";
pixel_y = -26
},
@@ -9029,7 +9029,7 @@
pixel_y = 9
},
/obj/machinery/power/apc{
areastring = "/area/service/heads/hor";
areastring = "/area/command/heads_quarters/rd";
dir = 1;
name = "RD Office APC";
pixel_y = 23
@@ -12605,7 +12605,7 @@
/obj/structure/cable,
/obj/machinery/suit_storage_unit/ce,
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/service/heads/chief";
areastring = "/area/command/heads_quarters/ce";
name = "CE Office APC";
pixel_y = -24
},
@@ -13403,7 +13403,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc{
areastring = "/area/bridge/meeting_room";
areastring = "/area/command/meeting_room";
dir = 1;
name = "Conference Room APC";
pixel_y = 23
@@ -19613,7 +19613,7 @@
dir = 1
},
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/bridge";
areastring = "/area/command";
dir = 1;
name = "Bridge APC";
pixel_y = 23
@@ -25286,9 +25286,9 @@
/area/hallway/primary/central)
"mfF" = (
/obj/machinery/power/apc{
areastring = "/area/service/heads/cmo";
areastring = "/area/command/heads_quarters/cmo";
dir = 1;
name = "CM Office APC";
name = "CMO Office APC";
pixel_x = -32;
pixel_y = 23
},
@@ -39579,7 +39579,7 @@
},
/obj/machinery/pdapainter,
/obj/machinery/power/apc{
areastring = "/area/service/heads/hop";
areastring = "/area/command/heads_quarters/hop";
dir = 1;
name = "Head of Personnel APC";
pixel_y = 23

8
code/game/turfs/space/transit.dm
View File

@@ -58,8 +58,8 @@
set waitfor = FALSE
if(!AM || istype(AM, /obj/docking_port))
return
if(AM.loc != src) // Multi-tile objects are "in" multiple locs but its loc is it's true placement.
return // Don't move multi tile objects if their origin isnt in transit
if(AM.loc != src) // Multi-tile objects are "in" multiple locs but its loc is it's true placement.
return // Don't move multi tile objects if their origin isn't in transit
var/max = world.maxx-TRANSITIONEDGE
var/min = 1+TRANSITIONEDGE
@@ -68,6 +68,10 @@
var/datum/space_level/D = A
if (D.linkage == CROSSLINKED)
possible_transtitons += D.z_value
if(!length(possible_transtitons)) //No space to throw them to - try throwing them onto mining
possible_transtitons = SSmapping.levels_by_trait(ZTRAIT_MINING)
if(!length(possible_transtitons)) //Just throw them back on station, if not just runtime.
possible_transtitons = SSmapping.levels_by_trait(ZTRAIT_STATION)
var/_z = pick(possible_transtitons)
//now select coordinates for a border turf