From 8ee48fd4b3e1007184de197a73547a5abb489379 Mon Sep 17 00:00:00 2001 From: Helg2 <93882977+Helg2@users.noreply.github.com> Date: Wed, 8 Nov 2023 20:13:55 +0200 Subject: [PATCH] Maybe Normandy runtimes fix (#103) * experiment * hmm --- .../~RUTGMC}/shuttles/alamo.dmm | 4 +-- .../~RUTGMC}/shuttles/normandy.dmm | 4 +-- modular_RUtgmc/code/datums/shuttles.dm | 4 +-- .../code/modules/shuttle/marine_dropship.dm | 30 +++++-------------- 4 files changed, 12 insertions(+), 30 deletions(-) rename {modular_RUtgmc/_maps => _maps/~RUTGMC}/shuttles/alamo.dmm (98%) rename {modular_RUtgmc/_maps => _maps/~RUTGMC}/shuttles/normandy.dmm (99%) diff --git a/modular_RUtgmc/_maps/shuttles/alamo.dmm b/_maps/~RUTGMC/shuttles/alamo.dmm similarity index 98% rename from modular_RUtgmc/_maps/shuttles/alamo.dmm rename to _maps/~RUTGMC/shuttles/alamo.dmm index bbbb5d603249d..613f7e07f0c5e 100644 --- a/modular_RUtgmc/_maps/shuttles/alamo.dmm +++ b/_maps/~RUTGMC/shuttles/alamo.dmm @@ -220,9 +220,7 @@ /turf/open/shuttle/dropship/floor/alt, /area/shuttle/dropship/alamo) "Hj" = ( -/obj/machinery/computer/shuttle/marine_dropship/one{ - icon_state = "console2" - }, +/obj/machinery/computer/shuttle/marine_dropship/two, /turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "HK" = ( diff --git a/modular_RUtgmc/_maps/shuttles/normandy.dmm b/_maps/~RUTGMC/shuttles/normandy.dmm similarity index 99% rename from modular_RUtgmc/_maps/shuttles/normandy.dmm rename to _maps/~RUTGMC/shuttles/normandy.dmm index a3cfdfba9ae5f..a6cf2d9695eaa 100644 --- a/modular_RUtgmc/_maps/shuttles/normandy.dmm +++ b/_maps/~RUTGMC/shuttles/normandy.dmm @@ -172,9 +172,7 @@ }, /area/shuttle/dropship/normandy) "pm" = ( -/obj/machinery/computer/shuttle/marine_dropship/two{ - icon_state = "console" - }, +/obj/machinery/computer/shuttle/marine_dropship/one, /turf/closed/shuttle/dropship2/panel{ opacity = 0; dir = 1 diff --git a/modular_RUtgmc/code/datums/shuttles.dm b/modular_RUtgmc/code/datums/shuttles.dm index 5aa545e24ee9f..f09122b96a321 100644 --- a/modular_RUtgmc/code/datums/shuttles.dm +++ b/modular_RUtgmc/code/datums/shuttles.dm @@ -1,9 +1,9 @@ /datum/map_template/shuttle/dropship_one - prefix = "modular_RUtgmc/_maps/shuttles/" + prefix = "_maps/~RUTGMC/shuttles/" shuttle_id = SHUTTLE_NORMANDY name = "Normandy" /datum/map_template/shuttle/dropship_two - prefix = "modular_RUtgmc/_maps/shuttles/" + prefix = "_maps/~RUTGMC/shuttles/" shuttle_id = SHUTTLE_ALAMO name = "Alamo" diff --git a/modular_RUtgmc/code/modules/shuttle/marine_dropship.dm b/modular_RUtgmc/code/modules/shuttle/marine_dropship.dm index b3ea103ff8e7e..26192d6688a98 100644 --- a/modular_RUtgmc/code/modules/shuttle/marine_dropship.dm +++ b/modular_RUtgmc/code/modules/shuttle/marine_dropship.dm @@ -1,47 +1,33 @@ /obj/docking_port/stationary/marine_dropship/hangar/one name = "Shipside 'Normandy' Hangar Pad" id = SHUTTLE_NORMANDY - roundstart_template = /datum/map_template/shuttle/dropship_one /obj/docking_port/stationary/marine_dropship/hangar/two name = "Shipside 'Alamo' Hangar Pad" id = SHUTTLE_ALAMO - roundstart_template = /datum/map_template/shuttle/dropship_two - dheight = 6 - dwidth = 4 - height = 13 - width = 9 /obj/docking_port/mobile/marine_dropship/one name = "Normandy" id = SHUTTLE_NORMANDY - control_flags = SHUTTLE_MARINE_PRIMARY_DROPSHIP /obj/docking_port/mobile/marine_dropship/two name = "Alamo" id = SHUTTLE_ALAMO - control_flags = SHUTTLE_MARINE_PRIMARY_DROPSHIP - callTime = 28 SECONDS //smaller shuttle go whoosh - rechargeTime = 1.5 MINUTES - dheight = 6 - dwidth = 4 - height = 13 - width = 9 /obj/machinery/computer/shuttle/shuttle_control/dropship name = "\improper 'Normandy' dropship console" desc = "The remote controls for the 'Normandy' Dropship. Named after a department in France, noteworthy for the famous naval invasion of Normandy on the 6th of June 1944, a bloody but decisive victory in World War II and the campaign for the Liberation of France." shuttleId = SHUTTLE_NORMANDY - icon = 'icons/obj/machines/computer.dmi' - icon_state = "shuttle" - resistance_flags = RESIST_ALL - req_one_access = list(ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LEADER) // TLs can only operate the remote console - possible_destinations = "lz1;lz2;alamo" - compatible_control_flags = SHUTTLE_MARINE_PRIMARY_DROPSHIP - /obj/machinery/computer/shuttle/shuttle_control/dropship/two name = "\improper 'Alamo' dropship console" desc = "The remote controls for the 'Alamo' Dropship. Named after the Alamo Mission, stage of the Battle of the Alamo in the United States' state of Texas in the Spring of 1836. The defenders held to the last, encouraging other Texans to rally to the flag." shuttleId = SHUTTLE_ALAMO - possible_destinations = "lz1;lz2;normandy;alamo" + +/obj/machinery/computer/shuttle/marine_dropship/one + name = "\improper 'Normandy' flight controls" + desc = "The flight controls for the 'Normandy' Dropship. Named after a department in France, noteworthy for the famous naval invasion of Normandy on the 6th of June 1944, a bloody but decisive victory in World War II and the campaign for the Liberation of France." + +/obj/machinery/computer/shuttle/marine_dropship/two + name = "\improper 'Alamo' flight controls" + desc = "The flight controls for the 'Alamo' Dropship. Named after the Alamo Mission, stage of the Battle of the Alamo in the United States' state of Texas in the Spring of 1836. The defenders held to the last, encouraging other Texians to rally to the flag."