From eb9d793ad5e0fed93569d78f46baf12b0eda63af Mon Sep 17 00:00:00 2001 From: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Date: Sun, 26 Jun 2022 20:00:42 -0400 Subject: [PATCH] [MDB Ignore] Makes mining and labor shuttle home docks their own type, rather than varedits (#68006) I'll have to do the others at some point I don't want to, but it'll happen --- .../map_files/Deltastation/DeltaStation2.dmm | 29 ++++-------------- _maps/map_files/KiloStation/KiloStation.dmm | 29 ++++-------------- _maps/map_files/MetaStation/MetaStation.dmm | 30 ++++--------------- _maps/map_files/debug/runtimestation.dmm | 20 +++---------- _maps/map_files/tramstation/tramstation.dmm | 29 ++++-------------- code/modules/mining/laborcamp/laborshuttle.dm | 11 +++++++ code/modules/mining/mine_items.dm | 20 +++++++++++++ 7 files changed, 56 insertions(+), 112 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 940219141fb..0eb4c958e51 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -4294,14 +4294,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "bgU" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 5; - id = "mining_home"; - name = "mining shuttle bay"; - roundstart_template = /datum/map_template/shuttle/mining/delta; - width = 7 +/obj/docking_port/stationary/mining_home{ + dir = 4 }, /turf/open/space/basic, /area/space) @@ -5802,14 +5796,8 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "bAc" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp_home"; - name = "fore bay 1"; - roundstart_template = /datum/map_template/shuttle/labour/delta; - width = 9 +/obj/docking_port/stationary/laborcamp_home{ + dir = 8 }, /turf/open/space/basic, /area/space) @@ -61244,14 +61232,7 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/rd) "qzS" = ( -/obj/docking_port/stationary{ - dwidth = 3; - height = 5; - id = "commonmining_home"; - name = "SS13: Common Mining Dock"; - roundstart_template = /datum/map_template/shuttle/mining_common/meta; - width = 7 - }, +/obj/docking_port/stationary/mining_home/common, /turf/open/space/basic, /area/space) "qzX" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ce51395d822..eb2d9d95757 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -5788,14 +5788,8 @@ /turf/open/misc/asteroid, /area/space/nearstation) "bKA" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 10; - id = "mining_home"; - name = "mining shuttle bay"; - roundstart_template = /datum/map_template/shuttle/mining/kilo; - width = 7 +/obj/docking_port/stationary/mining_home/kilo{ + dir = 4 }, /turf/open/space/basic, /area/space) @@ -6402,14 +6396,8 @@ /turf/open/floor/plating/airless, /area/space) "bUU" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 5; - id = "laborcamp_home"; - name = "fore bay 1"; - roundstart_template = /datum/map_template/shuttle/labour/kilo; - width = 9 +/obj/docking_port/stationary/laborcamp_home/kilo{ + dir = 2 }, /turf/open/space, /area/space) @@ -80299,14 +80287,7 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "wHM" = ( -/obj/docking_port/stationary{ - dwidth = 3; - height = 5; - id = "commonmining_home"; - name = "SS13: Common Mining Dock"; - roundstart_template = /datum/map_template/shuttle/mining_common/kilo; - width = 7 - }, +/obj/docking_port/stationary/mining_home/common/kilo, /turf/open/floor/plating, /area/station/maintenance/port/greater) "wHQ" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8bf9ea13c12..c2ff7a54cff 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1379,14 +1379,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "aAA" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 5; - id = "mining_home"; - name = "mining shuttle bay"; - roundstart_template = /datum/map_template/shuttle/mining/box; - width = 7 +/obj/docking_port/stationary/mining_home{ + dir = 8 }, /turf/open/space/basic, /area/space) @@ -27579,14 +27573,8 @@ /turf/open/floor/grass, /area/station/science/genetics) "jOb" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 3; - height = 5; - id = "commonmining_home"; - name = "SS13: Common Mining Dock"; - roundstart_template = /datum/map_template/shuttle/mining_common/meta; - width = 7 +/obj/docking_port/stationary/mining_home/common{ + dir = 2 }, /turf/open/floor/plating, /area/station/hallway/primary/port) @@ -67717,14 +67705,8 @@ /turf/open/floor/engine, /area/station/science/explab) "xOF" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp_home"; - name = "fore bay 1"; - roundstart_template = /datum/map_template/shuttle/labour/generic; - width = 9 +/obj/docking_port/stationary/laborcamp_home{ + dir = 8 }, /turf/open/space/basic, /area/space) diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 589732c2452..454054eaa87 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -1126,14 +1126,8 @@ /turf/open/floor/iron, /area/station/commons/storage/primary) "eb" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp_home"; - name = "fore bay 1"; - roundstart_template = /datum/map_template/shuttle/labour/generic; - width = 9 +/obj/docking_port/stationary/laborcamp_home{ + dir = 8 }, /turf/open/space/basic, /area/space) @@ -2384,14 +2378,8 @@ /turf/open/floor/iron, /area/station/medical/chemistry) "Kd" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 5; - id = "mining_home"; - name = "mining shuttle bay"; - roundstart_template = /datum/map_template/shuttle/mining/box; - width = 7 +/obj/docking_port/stationary/mining_home{ + dir = 8 }, /turf/open/floor/engine, /area/station/cargo/miningoffice) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index c9a27e1a7bd..44929a10cce 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -23192,14 +23192,8 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/mid) "hWV" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 5; - id = "mining_home"; - name = "mining shuttle bay"; - roundstart_template = /datum/map_template/shuttle/mining/box; - width = 7 +/obj/docking_port/stationary/mining_home{ + dir = 4 }, /turf/open/misc/asteroid/airless, /area/mine/explored) @@ -23936,14 +23930,7 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "iia" = ( -/obj/docking_port/stationary{ - dwidth = 2; - height = 5; - id = "laborcamp_home"; - name = "fore bay 1"; - roundstart_template = /datum/map_template/shuttle/labour/generic; - width = 9 - }, +/obj/docking_port/stationary/laborcamp_home, /turf/open/misc/asteroid/airless, /area/mine/explored) "iib" = ( @@ -54794,14 +54781,8 @@ /turf/open/floor/iron, /area/station/security/brig) "suI" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 5; - id = "commonmining_home"; - name = "SS13: Common Mining Dock"; - roundstart_template = /datum/map_template/shuttle/mining_common/meta; - width = 7 +/obj/docking_port/stationary/mining_home/common{ + dir = 4 }, /turf/open/misc/asteroid/airless, /area/mine/explored) diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index 000be6251d1..8bcb1230bd5 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -26,3 +26,14 @@ to_chat(user, span_warning("Shuttle is already at the outpost!")) return FALSE return TRUE + +/obj/docking_port/stationary/laborcamp_home + name = "SS13: Labor Shuttle Dock" + id = "laborcamp_home" + roundstart_template = /datum/map_template/shuttle/labour/delta + width = 9 + dwidth = 2 + height = 5 + +/obj/docking_port/stationary/laborcamp_home/kilo + roundstart_template = /datum/map_template/shuttle/labour/kilo diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index fbaa883b461..67921c94e0b 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -122,6 +122,26 @@ shuttleId = "mining_common" possible_destinations = "commonmining_home;lavaland_common_away;landing_zone_dock;mining_public" +/obj/docking_port/stationary/mining_home + name = "SS13: Mining Dock" + id = "mining_home" + roundstart_template = /datum/map_template/shuttle/mining/delta + width = 7 + dwidth = 3 + height = 5 + +/obj/docking_port/stationary/mining_home/kilo + roundstart_template = /datum/map_template/shuttle/mining/kilo + height = 10 + +/obj/docking_port/stationary/mining_home/common + name = "SS13: Common Mining Dock" + id = "commonmining_home" + roundstart_template = /datum/map_template/shuttle/mining_common/meta + +/obj/docking_port/stationary/mining_home/common/kilo + roundstart_template = /datum/map_template/shuttle/mining_common/kilo + /**********************Mining car (Crate like thing, not the rail car)**************************/ /obj/structure/closet/crate/miningcar