From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Date: Mon, 3 Jun 2024 20:55:43 +0000 (-0500)
Subject: Remove duplicate entities (#28561)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=98ab251f9212699a816aaaf31792ffcda768e8c9;p=space-station-14.git

Remove duplicate entities (#28561)
---

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index d798d0c3be..e92da80c4b 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -73,15 +73,6 @@
     containers:
       board: [ DoorElectronicsHydroponics ]
 
-- type: entity
-  parent: AirlockCommandLocked
-  id: AirlockServiceCaptainLocked
-  suffix: Captain, Locked
-  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsCaptain ]
-
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalLocked
diff --git a/Resources/migration.yml b/Resources/migration.yml
index cf1a0f7a60..65e914aed6 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -345,3 +345,6 @@ CrateJanitorExplosive: ClosetJanitorBombFilled
 
 # 2024-05-27
 DoorRemoteFirefight: null
+
+# 2024-06-03
+AirlockServiceCaptainLocked: AirlockCaptainLocked