From 245ce7aba87e43e10956a1ccf94a149f7e494daa Mon Sep 17 00:00:00 2001
From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com>
Date: Fri, 1 Sep 2023 07:03:50 -0500
Subject: [PATCH] Fixes the Hilbert's research tram (#78035)

## About The Pull Request

Corrects the specific_tram_id helper for the Hilbert's Research to use
the hilbert tram ID. I've also dropped the `.../hilbert/research`
(tram-specific) paths in favor of simply `.../hilbert`

## Why It's Good For The Game

Fixes the Hilbert Hotel Research ruin's tram, and also stops the
malfunctioning tram event from being able to use that tram to start. (No
more trams going haywire on maps without trams!)

Closes #78018

## Changelog
:cl:
fix: Hilbert's Hotel Research ruin now has a functioning tram. As a side
effect, the malfunctioning tram event should now only fire on maps with
a tram!
/:cl:
---
 _maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm    | 2 +-
 code/modules/industrial_lift/tram/tram_landmark.dm          | 2 +-
 code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
index f94d2051a42..3d03f4acd18 100644
--- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -330,7 +330,7 @@
 	},
 /obj/structure/industrial_lift/tram/purple,
 /obj/effect/landmark/tram/platform/hilbert/middle,
-/obj/effect/landmark/tram/nav/hilbert/research,
+/obj/effect/landmark/tram/nav/hilbert,
 /turf/open/floor/engine,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "iY" = (
diff --git a/code/modules/industrial_lift/tram/tram_landmark.dm b/code/modules/industrial_lift/tram/tram_landmark.dm
index 72dd32698dc..76341a7d064 100644
--- a/code/modules/industrial_lift/tram/tram_landmark.dm
+++ b/code/modules/industrial_lift/tram/tram_landmark.dm
@@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(tram_landmarks)
 	name = "DESTINATION/NOT/FOUND"
 	specific_lift_id = IMMOVABLE_ROD_DESTINATIONS
 
-/obj/effect/landmark/tram/nav/hilbert/research
+/obj/effect/landmark/tram/nav/hilbert
 	name = HILBERT_TRAM
 	specific_lift_id = TRAM_NAV_BEACONS
 	dir = WEST
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
index 9cb2c8bf42f..5b7c8816b1d 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
@@ -504,10 +504,10 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
 			to_chat(user, "No vacated rooms.")
 		return .
 
-/obj/effect/landmark/lift_id/hilbert/research
+/obj/effect/landmark/lift_id/hilbert
 	specific_lift_id = HILBERT_TRAM
 
-/obj/effect/landmark/tram/nav/hilbert/research
+/obj/effect/landmark/tram/nav/hilbert
 	name = HILBERT_TRAM
 	specific_lift_id = TRAM_NAV_BEACONS