Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Fix of no return Normandy. #110

Merged
merged 2 commits into from
Nov 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions _maps/~RUTGMC/shuttles/normandy.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
},
/obj/machinery/computer/dropship_weapons/dropship2,
/turf/closed/shuttle/dropship2/panel{
opacity = 0;
dir = 4
},
/area/shuttle/dropship/normandy)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -400,7 +396,7 @@
"NN" = (
/turf/closed/shuttle/dropship2/interiorwindow{
dir = 8;
opacity = 0

},
/area/shuttle/dropship/normandy)
"Od" = (
Expand All @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
3 changes: 2 additions & 1 deletion code/modules/shuttle/marine_dropship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
17 changes: 17 additions & 0 deletions modular_RUtgmc/code/game/turfs/closed.dm
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions modular_RUtgmc/code/modules/shuttle/marine_dropship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions modular_RUtgmc/includes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down