fix: Atmos dP Window Inheritance (#40192)

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index 7d559a7f98530de8f1afd90957ca2cb38b389dd0..b242a0bebe0b824ba1784efa327aff8bed489b88 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -107,7 +107,7 @@
 
 - type: entity
   id: ShuttersNormal
-  parent: [BaseShutter, BaseDeltaPressureGlass]
+  parent: [BaseDeltaPressureGlass, BaseShutter]
   components:
   - type: Occluder
   - type: Construction
@@ -134,7 +134,7 @@
 
 - type: entity
   id: ShuttersRadiation
-  parent: [BaseShutter, BaseDeltaPressureGlass]
+  parent: [BaseDeltaPressureGlass, BaseShutter]
   name: radiation shutters
   description: Why did they make these shutters radioactive?
   components:
@@ -172,7 +172,7 @@
 
 - type: entity
   id: ShuttersWindow
-  parent: [BaseShutter, BaseDeltaPressureGlass]
+  parent: [BaseDeltaPressureGlass, BaseShutter]
   name: window shutters
   description: The Best (TM) place to see your friends explode!
   components:

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index 9e25bb830eee21cb010c39718cfd32467beefa40..ce331499ab48cf1919eaa365b1154be0062a98b0 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -1,7 +1,7 @@
 #Normal windoors
 - type: entity
   id: BaseWindoor
-  parent: [BaseStructure, BaseDeltaPressureGlassQuarter]
+  parent: [BaseDeltaPressureGlassQuarter, BaseStructure]
   abstract: true
   placement:
     mode: SnapgridCenter
@@ -174,7 +174,7 @@
 
 - type: entity
   id: BaseSecureWindoor
-  parent: [BaseWindoor, BaseDeltaPressureReinforcedGlassQuarter]
+  parent: [BaseDeltaPressureReinforcedGlassQuarter, BaseWindoor]
   abstract: true
   components:
   - type: Sprite
@@ -246,7 +246,7 @@
 #Plasma Windoors
 - type: entity
   id: BasePlasmaWindoor
-  parent: [BaseWindoor, BaseDeltaPressurePlasmaQuarter]
+  parent: [BaseDeltaPressurePlasmaQuarter, BaseWindoor]
   abstract: true
   components:
   - type: Sprite
@@ -311,7 +311,7 @@
 
 - type: entity
   id: BaseSecurePlasmaWindoor
-  parent: [BaseSecureWindoor, BaseDeltaPressureReinforcedPlasmaQuarter]
+  parent: [BaseDeltaPressureReinforcedPlasmaQuarter, BaseSecureWindoor]
   abstract: true
   components:
   - type: Sprite
@@ -383,7 +383,7 @@
 #Uranium Windoors
 - type: entity
   id: BaseUraniumWindoor
-  parent: [BaseWindoor, BaseDeltaPressurePlasmaQuarter]
+  parent: [BaseDeltaPressurePlasmaQuarter, BaseWindoor]
   abstract: true
   components:
   - type: Sprite
@@ -448,7 +448,7 @@
 
 - type: entity
   id: BaseSecureUraniumWindoor
-  parent: [BaseSecureWindoor, BaseDeltaPressureReinforcedPlasmaQuarter]
+  parent: [BaseDeltaPressureReinforcedPlasmaQuarter, BaseSecureWindoor]
   abstract: true
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
index 9ec7c323acfa8184e329c24b89724aaee6ccf40c..b48de80ce0d2c78437d191a1d6d6aaccc3c0354b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: PlasmaWindow
   name: plasma window
-  parent: [WindowRCDResistant, BaseDeltaPressurePlasma]
+  parent: [BaseDeltaPressurePlasma, WindowRCDResistant]
   components:
   - type: Sprite
     drawdepth: WallTops
@@ -55,7 +55,7 @@
 
 - type: entity
   id: PlasmaWindowDirectional
-  parent: [WindowDirectionalRCDResistant, BaseDeltaPressurePlasmaQuarter]
+  parent: [BaseDeltaPressurePlasmaQuarter, WindowDirectionalRCDResistant]
   name: directional plasma window
   description: Don't smudge up the glass down there.
   placement:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index 3b490dc4ce619b31b4f2f04c1eaef52a3ab08cd9..c4284a1377fad5b8e396f542de6015ed06a233d0 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ReinforcedWindow
   name: reinforced window
-  parent: [Window, BaseDeltaPressureReinforcedGlass]
+  parent: [BaseDeltaPressureReinforcedGlass, Window]
   components:
   - type: Sprite
     drawdepth: WallTops
@@ -58,7 +58,7 @@
 
 - type: entity
   id: WindowReinforcedDirectional
-  parent: [WindowDirectional, BaseDeltaPressureReinforcedGlassQuarter]
+  parent: [BaseDeltaPressureReinforcedGlassQuarter, WindowDirectional]
   name: directional reinforced window
   description: Don't smudge up the glass down there.
   placement:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
index 7aee043ac7fb662ec144015addf99f6f42d4103c..5a4a6ceacc03bc840363ed8d11f1a31fefa49f98 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ReinforcedPlasmaWindow
   name: reinforced plasma window
-  parent: [WindowRCDResistant, BaseDeltaPressureReinforcedPlasma]
+  parent: [BaseDeltaPressureReinforcedPlasma, WindowRCDResistant]
   components:
   - type: Sprite
     drawdepth: WallTops
@@ -58,7 +58,7 @@
 
 - type: entity
   id: PlasmaReinforcedWindowDirectional
-  parent: [WindowDirectionalRCDResistant, BaseDeltaPressureReinforcedPlasmaQuarter]
+  parent: [BaseDeltaPressureReinforcedPlasmaQuarter, WindowDirectionalRCDResistant]
   name: directional reinforced plasma window
   description: Don't smudge up the glass down there.
   placement:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
index 445ad20a3ba53f943ac0ee7e890dac2b980d7659..57e9a03c83d4b70cd07c915d6e61bda1e0e59060 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ReinforcedUraniumWindow
   name: reinforced uranium window
-  parent: [WindowRCDResistant, BaseDeltaPressureReinforcedPlasma]
+  parent: [BaseDeltaPressureReinforcedPlasma, WindowRCDResistant]
   components:
   - type: Sprite
     drawdepth: WallTops
@@ -55,7 +55,7 @@
 
 - type: entity
   id: UraniumReinforcedWindowDirectional
-  parent: [WindowDirectionalRCDResistant, BaseDeltaPressureReinforcedPlasmaQuarter]
+  parent: [BaseDeltaPressureReinforcedPlasmaQuarter, WindowDirectionalRCDResistant]
   name: directional reinforced uranium window
   description: Don't smudge up the glass down there.
   placement:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
index f3cae2a247cd2d96d5c20d1dd80eb3ff518a03bc..581983a8f273113c9d1016dfc7cfcaf4ba4e2f20 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ShuttleWindow
   name: shuttle window
-  parent: [WindowRCDResistant, BaseDeltaPressureReinforcedGlass]
+  parent: [BaseDeltaPressureReinforcedGlass, WindowRCDResistant]
   components:
   - type: Sprite
     drawdepth: WallTops

diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
index 292410054d374a74335d2bdf0681885508521969..06c450092bce8375d401718f89b7570553c6355f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: UraniumWindow
   name: uranium window
-  parent: [WindowRCDResistant, BaseDeltaPressurePlasma]
+  parent: [BaseDeltaPressurePlasma, WindowRCDResistant]
   components:
   - type: Sprite
     drawdepth: WallTops
@@ -53,7 +53,7 @@
 
 - type: entity
   id: UraniumWindowDirectional
-  parent: [WindowDirectionalRCDResistant, BaseDeltaPressurePlasmaQuarter]
+  parent: [BaseDeltaPressurePlasmaQuarter, WindowDirectionalRCDResistant]
   name: directional uranium window
   description: Don't smudge up the glass down there.
   placement:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index b20299daab2df30fe70e458b8f0aebe778eb25d2..02e0513aa186ca45d4dd8d99872dbf26affa1572 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: Window
-  parent: [BaseStructure, BaseDeltaPressureGlass]
+  parent: [BaseDeltaPressureGlass, BaseStructure]
   name: window
   description: Don't smudge up the glass down there.
   placement:
@@ -126,7 +126,7 @@
 
 - type: entity
   id: WindowDirectional
-  parent: [BaseStructure, BaseDeltaPressureGlassQuarter]
+  parent: [BaseDeltaPressureGlassQuarter, BaseStructure]
   name: directional window
   description: Don't smudge up the glass down there.
   placement: