From 4c620862bde1e0f640d3aa85698b441e8af05419 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Mon, 8 May 2023 12:36:25 +1200 Subject: [PATCH] Fix windoor prototypes (#16224) --- .../Tests/PrototypeSaveTest.cs | 55 +------------------ .../Structures/Doors/Shutter/shutters.yml | 3 + .../Doors/Windoors/base_structurewindoors.yml | 3 + 3 files changed, 9 insertions(+), 52 deletions(-) diff --git a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs index 15a1080967..7881b624e9 100644 --- a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs +++ b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs @@ -28,7 +28,7 @@ namespace Content.IntegrationTests.Tests; /// modified during init. I.e., when the entity is saved to the map, its data is simply the default prototype data (ignoring transform component). /// /// -/// If you are here becaus your test is failing, one easy way of figuring out how to fix the prototype is to just +/// If you are here because this test is failing on your PR, then one easy way of figuring out how to fix the prototype is to just /// spawn it into a new empty map and seeing what the map yml looks like. /// [TestFixture] @@ -38,57 +38,8 @@ public sealed class PrototypeSaveTest { "Singularity", // physics collision uses "AllMask" (-1). The flag serializer currently fails to save this because this features un-named bits. "constructionghost", - // URGH door pr but I just don't - "BlastDoorBridgeOpen", - "Windoor", - "WindoorSecure", - "WindoorSecureCargoLocked", - "WindoorTheatreLocked", - "BlastDoorBridge", - "WindoorSecureJanitorLocked", - "ShuttersWindow", - "WindoorScienceLocked", - "WindoorJanitorLocked", - "WindoorEngineeringLocked", - "BlastDoorExterior2", - "WindoorChemistryLocked", - "BlastDoorExterior3", - "WindoorMedicalLocked", - "ShuttersNormalOpen", - "WindoorBarKitchenLocked", - "BlastDoorOpen", - "ShuttersRadiationOpen", - "BlastDoorWindowsOpen", - "WindoorBarLocked", - "WindoorChapelLocked", - "WindoorArmoryLocked", - "BlastDoorExterior3Open", - "WindoorCargoLocked", - "WindoorSecurityLocked", - "WindoorExternalLocked", - "WindoorBrigLocked", - "WindoorHydroponicsLocked", - "ShuttersWindowOpen", - "WindoorKitchenHydroponicsLocked", - "WindoorSecureChapelLocked", - "BlastDoorExterior1Open", - "WindoorKitchenLocked", - "BlastDoor", - "BlastDoorWindows", - "BlastDoorExterior1", - "BlastDoorExterior2Open", - "WindoorSecureKitchenLocked", - "WindoorHeadOfPersonnelLocked", - "ShuttersRadiation", - "ShuttersNormal", - "WindoorSecureSalvageLocked", - "WindoorServiceLocked", - "WindoorCommandLocked", - "AirlockMaintMedLocked", - "AirlockArmoryGlassLocked", - "AirlockExternalGlassLocked", - "AirlockFreezerKitchenHydroLocked", - "AirlockGlassShuttle", + // Don't add to this list unless you have a good reason + // Or it is just temporary because tests stopped working and now master has too many broken entities. }; [Test] diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index 5cdbfe848a..94ca4d9291 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -86,6 +86,9 @@ - Open - Close - Toggle + - type: DeviceLinkSource + ports: + - DoorStatus - type: InteractionPopup interactSuccessString: comp-window-knock messagePerceivedByOthers: comp-window-knock diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 192f6202a1..2f6bed7e35 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -57,6 +57,9 @@ - Close - Toggle - AutoClose + - type: DeviceLinkSource + ports: + - DoorStatus - type: Damageable damageContainer: Inorganic damageModifierSet: Glass -- 2.51.2