From 61b163409df3b99f9fc8cea9c2ae08db01f4cb86 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Thu, 9 Nov 2023 17:46:46 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=BB=D0=B6=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/shuttle/marine_dropship.dm | 3 ++- modular_RUtgmc/code/modules/shuttle/marine_dropship.dm | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttle/marine_dropship.dm b/code/modules/shuttle/marine_dropship.dm index f364a700519aa..419521e61dd11 100644 --- a/code/modules/shuttle/marine_dropship.dm +++ b/code/modules/shuttle/marine_dropship.dm @@ -755,7 +755,8 @@ . = ..() for(var/trait in SSmapping.configs[SHIP_MAP].environment_traits) if(ZTRAIT_DOUBLE_SHIPS in trait) - possible_destinations = "lz2;alamo" + //possible_destinations = "lz2;alamo" // RUTGMC CHANGE, it is now Normandy + possible_destinations = "lz2;normandy" /obj/machinery/computer/shuttle/marine_dropship/two name = "\improper 'Normandy' flight controls" diff --git a/modular_RUtgmc/code/modules/shuttle/marine_dropship.dm b/modular_RUtgmc/code/modules/shuttle/marine_dropship.dm index 26192d6688a98..3e547a4e83741 100644 --- a/modular_RUtgmc/code/modules/shuttle/marine_dropship.dm +++ b/modular_RUtgmc/code/modules/shuttle/marine_dropship.dm @@ -18,15 +18,20 @@ 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 + possible_destinations = "lz1;lz2;normandy" /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 +/obj/machinery/computer/shuttle/marine_dropship + possible_destinations = "lz1;lz2;normandy" + /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." + possible_destinations = "lz1;lz2;normandy" /obj/machinery/computer/shuttle/marine_dropship/two name = "\improper 'Alamo' flight controls" From 7a8abf35e12f102082b19b5b3da691527e53c850 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Thu, 9 Nov 2023 18:16:54 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B7=D1=80=D0=B0=D1=87?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/~RUTGMC/shuttles/normandy.dmm | 20 +++++--------------- modular_RUtgmc/code/game/turfs/closed.dm | 17 +++++++++++++++++ modular_RUtgmc/includes.dm | 1 + 3 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 modular_RUtgmc/code/game/turfs/closed.dm diff --git a/_maps/~RUTGMC/shuttles/normandy.dmm b/_maps/~RUTGMC/shuttles/normandy.dmm index a6cf2d9695eaa..a45d3d2636a4d 100644 --- a/_maps/~RUTGMC/shuttles/normandy.dmm +++ b/_maps/~RUTGMC/shuttles/normandy.dmm @@ -95,7 +95,6 @@ }, /obj/machinery/computer/dropship_weapons/dropship2, /turf/closed/shuttle/dropship2/panel{ - opacity = 0; dir = 4 }, /area/shuttle/dropship/normandy) @@ -174,7 +173,6 @@ "pm" = ( /obj/machinery/computer/shuttle/marine_dropship/one, /turf/closed/shuttle/dropship2/panel{ - opacity = 0; dir = 1 }, /area/shuttle/dropship/normandy) @@ -218,9 +216,7 @@ /turf/template_noop, /area/shuttle/dropship/normandy) "tE" = ( -/turf/closed/shuttle/dropship2/glassthree{ - opacity = 0 - }, +/turf/closed/shuttle/dropship2/glassthree, /area/shuttle/dropship/normandy) "ur" = ( /turf/closed/shuttle/dropship2/enginethree{ @@ -400,7 +396,7 @@ "NN" = ( /turf/closed/shuttle/dropship2/interiorwindow{ dir = 8; - opacity = 0 + }, /area/shuttle/dropship/normandy) "Od" = ( @@ -417,9 +413,7 @@ /area/shuttle/dropship/normandy) "PH" = ( /obj/machinery/computer/security/dropship/two, -/turf/closed/shuttle/dropship2/panel{ - opacity = 0 - }, +/turf/closed/shuttle/dropship2/panel, /area/shuttle/dropship/normandy) "PI" = ( /turf/closed/shuttle/dropship2/enginetwo{ @@ -455,9 +449,7 @@ /turf/closed/shuttle/dropship2/cornersalt2, /area/shuttle/dropship/normandy) "RG" = ( -/turf/closed/shuttle/dropship2/glassfour{ - opacity = 0 - }, +/turf/closed/shuttle/dropship2/glassfour, /area/shuttle/dropship/normandy) "RK" = ( /turf/closed/shuttle/dropship2/engineone/alt{ @@ -530,9 +522,7 @@ /turf/open/shuttle/dropship/floor, /area/shuttle/dropship/normandy) "XN" = ( -/turf/closed/shuttle/dropship2/interiorwindow{ - opacity = 0 - }, +/turf/closed/shuttle/dropship2/interiorwindow, /area/shuttle/dropship/normandy) "Yi" = ( /turf/closed/shuttle/dropship2/interiormisc{ diff --git a/modular_RUtgmc/code/game/turfs/closed.dm b/modular_RUtgmc/code/game/turfs/closed.dm new file mode 100644 index 0000000000000..db9b371473f6d --- /dev/null +++ b/modular_RUtgmc/code/game/turfs/closed.dm @@ -0,0 +1,17 @@ +/turf/closed/shuttle/dropship2/panel + opacity = FALSE + +/turf/closed/shuttle/dropship2/interiorwindow + opacity = FALSE + +/turf/closed/shuttle/dropship2/glassthree + opacity = FALSE + +/turf/closed/shuttle/dropship2/glassfour + opacity = FALSE + +/turf/closed/shuttle/dropship2/glassfive + opacity = FALSE + +/turf/closed/shuttle/dropship2/glasssix + opacity = FALSE diff --git a/modular_RUtgmc/includes.dm b/modular_RUtgmc/includes.dm index 3cf47420b4dfa..143c9085b191c 100644 --- a/modular_RUtgmc/includes.dm +++ b/modular_RUtgmc/includes.dm @@ -48,6 +48,7 @@ #include "code\game\objects\machinery\autodoc.dm" #include "code\game\objects\structures\teleporter.dm" #include "code\modules\reagents\machinery\chem_dispenser.dm" +#include "code\game\turfs\closed.dm" #include "code\game\turfs\floor_types.dm" #include "code\game\turfs\turf.dm" #include "code\game\turfs\wall_types.dm"