diff --git a/EXILED/Exiled.API/Enums/CameraType.cs b/EXILED/Exiled.API/Enums/CameraType.cs
index 3da1f461ea..6248d2a245 100644
--- a/EXILED/Exiled.API/Enums/CameraType.cs
+++ b/EXILED/Exiled.API/Enums/CameraType.cs
@@ -68,9 +68,6 @@ public enum CameraType
HczElevSysB,
HczHallway,
HczThreeWay,
- HczServersBottom,
- HczServersStairs,
- HczServersTop,
HczTeslaGate,
HczTestroomBridge,
HczTestroomMain,
diff --git a/EXILED/Exiled.API/Enums/DoorType.cs b/EXILED/Exiled.API/Enums/DoorType.cs
index 6b3498baaa..36bb9b853b 100644
--- a/EXILED/Exiled.API/Enums/DoorType.cs
+++ b/EXILED/Exiled.API/Enums/DoorType.cs
@@ -132,11 +132,6 @@ public enum DoorType
///
EscapeSecondary,
- ///
- /// Represents the SERVERS_BOTTOM door.
- ///
- ServersBottom,
-
///
/// Represents the GATE_A door.
///
diff --git a/EXILED/Exiled.API/Enums/RoomType.cs b/EXILED/Exiled.API/Enums/RoomType.cs
index 4402ae7e30..c0d59291ee 100644
--- a/EXILED/Exiled.API/Enums/RoomType.cs
+++ b/EXILED/Exiled.API/Enums/RoomType.cs
@@ -149,16 +149,6 @@ public enum RoomType
///
HczTesla,
- ///
- /// Heavy Containment Zone's Servers room.
- ///
- HczServers,
-
- ///
- /// Heavy Containment Zone's 3-way intersection.
- ///
- HczTCross,
-
///
/// Heavy Containment Zone's cruved hall.
///
@@ -255,7 +245,7 @@ public enum RoomType
Surface,
///
- /// Heavy Containment Zone's straight hall.
+ /// Heavy Containment Zone's straight hall with ceiling fan.
///
HczStraight,
@@ -265,7 +255,7 @@ public enum RoomType
EzTCross,
///
- /// Light Containment ZOne's SCP-330 room.
+ /// Light Containment Zone's SCP-330 room.
///
Lcz330,
@@ -295,42 +285,42 @@ public enum RoomType
HczElevatorB,
///
- /// Lazy TODO.
+ /// Heavy Containment Zone's cross room with waterfall.
///
HczCrossRoomWater,
///
- /// Lazy TODO.
+ /// Heavy Containment Zone's corner.
///
HczCornerDeep,
///
- /// Lazy TODO.
+ /// Heavy Containment Zone's 3-way intersection with storage crates obstructing the passage.
///
HczIntersectionJunk,
///
- /// Lazy TODO.
+ /// Heavy Containment Zone's 3-way intersection.
///
HczIntersection,
///
- /// Lazy TODO.
+ /// Heavy Containment Zone's straight hall with pipelines and sanitary door.
///
HczStraightC,
///
- /// Lazy TODO.
+ /// Heavy Containment Zone's straight hall with pipelines obstructing the passage.
///
HczStraightPipeRoom,
///
- /// Lazy TODO.
+ /// Heavy Containment Zone's straight hall.
///
HczStraightVariant,
///
- /// Lazy TODO.
+ /// Entrance Zone's straight hall with Dr.L's and conference room 9b locked room.
///
EzSmallrooms,
}
diff --git a/EXILED/Exiled.API/Enums/SpawnLocationType.cs b/EXILED/Exiled.API/Enums/SpawnLocationType.cs
index 12d32ce2a2..0cd2c6dded 100644
--- a/EXILED/Exiled.API/Enums/SpawnLocationType.cs
+++ b/EXILED/Exiled.API/Enums/SpawnLocationType.cs
@@ -142,10 +142,5 @@ public enum SpawnLocationType
/// Just inside the LCZ WC door.
///
InsideLczWc,
-
- ///
- /// Just inside the door at the bottom of the server's room.
- ///
- InsideServersBottom,
}
}
\ No newline at end of file
diff --git a/EXILED/Exiled.API/Extensions/SpawnExtensions.cs b/EXILED/Exiled.API/Extensions/SpawnExtensions.cs
index 2eed0d7ea9..5c1c31f89c 100644
--- a/EXILED/Exiled.API/Extensions/SpawnExtensions.cs
+++ b/EXILED/Exiled.API/Extensions/SpawnExtensions.cs
@@ -23,7 +23,6 @@ public static class SpawnExtensions
///
public static readonly SpawnLocationType[] ReversedLocations =
{
- SpawnLocationType.InsideServersBottom,
SpawnLocationType.InsideHczArmory,
SpawnLocationType.Inside079First,
SpawnLocationType.InsideHidRight,
@@ -103,7 +102,6 @@ public static Vector3 GetPosition(this SpawnLocationType location)
SpawnLocationType.InsideSurfaceNuke => "SURFACE_NUKE",
SpawnLocationType.Inside079Secondary => "079_SECOND",
SpawnLocationType.Inside173Connector => "173_CONNECTOR",
- SpawnLocationType.InsideServersBottom => "SERVERS_BOTTOM",
SpawnLocationType.InsideEscapePrimary => "ESCAPE_PRIMARY",
SpawnLocationType.InsideEscapeSecondary => "ESCAPE_SECONDARY",
_ => default,
diff --git a/EXILED/Exiled.API/Features/Camera.cs b/EXILED/Exiled.API/Features/Camera.cs
index 0c90edf566..6c72485739 100644
--- a/EXILED/Exiled.API/Features/Camera.cs
+++ b/EXILED/Exiled.API/Features/Camera.cs
@@ -77,9 +77,6 @@ public class Camera : IWrapper, IWorldSpace
["HCZ ELEV SYS B"] = CameraType.HczElevSysB,
["HCZ HALLWAY"] = CameraType.HczHallway,
["HCZ THREE-WAY"] = CameraType.HczThreeWay,
- ["SERVERS BOTTOM"] = CameraType.HczServersBottom,
- ["SERVERS STAIRS"] = CameraType.HczServersStairs,
- ["SERVERS TOP"] = CameraType.HczServersTop,
["TESLA GATE"] = CameraType.HczTeslaGate,
["TESTROOM BRIDGE"] = CameraType.HczTestroomBridge,
["TESTROOM MAIN"] = CameraType.HczTestroomMain,
diff --git a/EXILED/Exiled.API/Features/Doors/Door.cs b/EXILED/Exiled.API/Features/Doors/Door.cs
index c15e5c3b4a..63b4f62ced 100644
--- a/EXILED/Exiled.API/Features/Doors/Door.cs
+++ b/EXILED/Exiled.API/Features/Doors/Door.cs
@@ -646,7 +646,6 @@ private DoorType GetDoorType()
"079_FIRST" => DoorType.Scp079First,
"GATE_B" => DoorType.GateB,
"079_SECOND" => DoorType.Scp079Second,
- "SERVERS_BOTTOM" => DoorType.ServersBottom,
"173_CONNECTOR" => DoorType.Scp173Connector,
"LCZ_WC" => DoorType.LczWc,
"HID_CHAMBER" => DoorType.HIDChamber,
diff --git a/EXILED/Exiled.API/Features/Room.cs b/EXILED/Exiled.API/Features/Room.cs
index d1361ac07e..2a7a39b4a7 100644
--- a/EXILED/Exiled.API/Features/Room.cs
+++ b/EXILED/Exiled.API/Features/Room.cs
@@ -412,70 +412,69 @@ private static RoomType FindType(GameObject gameObject)
// Try to remove brackets if they exist.
return gameObject.name.RemoveBracketsOnEndOfName() switch
{
- "LCZ_Armory" => RoomType.LczArmory,
- "LCZ_Curve" => RoomType.LczCurve,
- "LCZ_Straight" => RoomType.LczStraight,
- "LCZ_330" => RoomType.Lcz330,
- "LCZ_914" => RoomType.Lcz914,
- "LCZ_Crossing" => RoomType.LczCrossing,
- "LCZ_TCross" => RoomType.LczTCross,
+ "PocketWorld" => RoomType.Pocket,
+ "Outside" => RoomType.Surface,
"LCZ_Cafe" => RoomType.LczCafe,
- "LCZ_Plants" => RoomType.LczPlants,
"LCZ_Toilets" => RoomType.LczToilets,
+ "LCZ_TCross" => RoomType.LczTCross,
"LCZ_Airlock" => RoomType.LczAirlock,
- "LCZ_173" => RoomType.Lcz173,
- "LCZ_ClassDSpawn" => RoomType.LczClassDSpawn,
+ "LCZ_ChkpA" => RoomType.LczCheckpointA,
"LCZ_ChkpB" => RoomType.LczCheckpointB,
+ "LCZ_Plants" => RoomType.LczPlants,
+ "LCZ_Straight" => RoomType.LczStraight,
+ "LCZ_Armory" => RoomType.LczArmory,
+ "LCZ_Crossing" => RoomType.LczCrossing,
+ "LCZ_Curve" => RoomType.LczCurve,
+ "LCZ_173" => RoomType.Lcz173,
+ "LCZ_330" => RoomType.Lcz330,
"LCZ_372" => RoomType.LczGlassBox,
- "LCZ_ChkpA" => RoomType.LczCheckpointA,
- "HCZ_079" => RoomType.Hcz079,
+ "LCZ_914" => RoomType.Lcz914,
+ "LCZ_ClassDSpawn" => RoomType.LczClassDSpawn,
+ "HCZ_Nuke" => RoomType.HczNuke,
"HCZ_TArmory" => RoomType.HczArmory,
- "HCZ_Testroom" => RoomType.HczTestRoom,
"HCZ_MicroHID_New" => RoomType.HczHid,
+ "HCZ_Crossroom_Water" => RoomType.HczCrossRoomWater,
+ "HCZ_Testroom" => RoomType.HczTestRoom,
"HCZ_049" => RoomType.Hcz049,
- "HCZ_Crossing" => RoomType.HczCrossing,
+ "HCZ_079" => RoomType.Hcz079,
+ "HCZ_096" => RoomType.Hcz096,
"HCZ_106_Rework" => RoomType.Hcz106,
- "HCZ_Nuke" => RoomType.HczNuke,
+ "HCZ_939" => RoomType.Hcz939,
"HCZ_Tesla_Rework" => RoomType.HczTesla,
- "HCZ_Servers" => RoomType.HczServers,
- "HCZ_Room3" => RoomType.HczTCross,
- "HCZ_Intersection_Junk" => RoomType.HczIntersectionJunk,
- "HCZ_Intersection" => RoomType.HczIntersectionJunk,
- "HCZ_096" => RoomType.Hcz096,
"HCZ_Curve" => RoomType.HczCurve,
+ "HCZ_Crossing" => RoomType.HczCrossing,
+ "HCZ_Intersection" => RoomType.HczIntersection,
+ "HCZ_Intersection_Junk" => RoomType.HczIntersectionJunk,
"HCZ_Corner_Deep" => RoomType.HczCornerDeep,
- "HCZ_Straight_C" => RoomType.HczStraightC,
"HCZ_Straight" => RoomType.HczStraight,
+ "HCZ_Straight_C" => RoomType.HczStraightC,
"HCZ_Straight_PipeRoom"=> RoomType.HczStraightPipeRoom,
"HCZ_Straight Variant" => RoomType.HczStraightVariant,
- "HCZ_Crossroom_Water" => RoomType.HczCrossRoomWater,
- "EZ_Endoof" => RoomType.EzVent,
- "EZ_Intercom" => RoomType.EzIntercom,
+ "HCZ_ChkpA" => RoomType.HczElevatorA,
+ "HCZ_ChkpB" => RoomType.HczElevatorB,
"EZ_GateA" => RoomType.EzGateA,
- "EZ_PCs_small" => RoomType.EzDownstairsPcs,
+ "EZ_GateB" => RoomType.EzGateB,
+ "EZ_ThreeWay" => RoomType.EzTCross,
+ "EZ_Crossing" => RoomType.EzCrossing,
"EZ_Curve" => RoomType.EzCurve,
"EZ_PCs" => RoomType.EzPcs,
- "EZ_Crossing" => RoomType.EzCrossing,
- "EZ_CollapsedTunnel" => RoomType.EzCollapsedTunnel,
- "EZ_Smallrooms1" => RoomType.EzConference,
+ "EZ_upstairs" => RoomType.EzUpstairsPcs,
+ "EZ_Intercom" => RoomType.EzIntercom,
"EZ_Smallrooms2" => RoomType.EzSmallrooms,
+ "EZ_PCs_small" => RoomType.EzDownstairsPcs,
"EZ_Chef" => RoomType.EzChef,
+ "EZ_Endoof" => RoomType.EzVent,
+ "EZ_CollapsedTunnel" => RoomType.EzCollapsedTunnel,
+ "EZ_Smallrooms1" => RoomType.EzConference,
"EZ_Straight" => RoomType.EzStraight,
+ "EZ_StraightColumn" => RoomType.EzStraight,
"EZ_Cafeteria" => RoomType.EzCafeteria,
- "EZ_upstairs" => RoomType.EzUpstairsPcs,
- "EZ_GateB" => RoomType.EzGateB,
"EZ_Shelter" => RoomType.EzShelter,
- "EZ_ThreeWay" => RoomType.EzTCross,
- "PocketWorld" => RoomType.Pocket,
- "Outside" => RoomType.Surface,
- "HCZ_939" => RoomType.Hcz939,
"EZ_HCZ_Checkpoint Part" => gameObject.transform.position.z switch
{
> 80 => RoomType.EzCheckpointHallwayA,
_ => RoomType.EzCheckpointHallwayB,
},
- "HCZ_ChkpA" => RoomType.HczElevatorA,
- "HCZ_ChkpB" => RoomType.HczElevatorB,
"HCZ_EZ_Checkpoint Part" => gameObject.transform.position.z switch
{
> 80 => RoomType.HczEzCheckpointA,