From 79ddf9417d5ad302542aede382969fa9b29368c8 Mon Sep 17 00:00:00 2001 From: Velcroboy <> Date: Mon, 22 Jan 2024 14:38:59 -0600 Subject: [PATCH 1/7] Update for preferred Delta V exterior lights --- Resources/Migrations/deltaMigrations.yml | 4 ++++ .../Prototypes/Entities/Structures/Lighting/base_lighting.yml | 2 +- .../Entities/Structures/Lighting/base_lighting.yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index 3efa662b64a..8f7d7e33a84 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -83,3 +83,7 @@ WindoorSecureBrigLocked: WindoorSecureSecurityLawyerLocked # 2023-12-16 PlushieLizardMirrored: PlushieLizard + +# 2024-1-22 +#Use these lights because they are better +PoweredlightExterior: PoweredLightBlueInterior diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index a146e9ddcff..3139811f11b 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -149,7 +149,7 @@ - type: entity id: PoweredlightExterior description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Blue + suffix: Blue, Don't Map on Delta V #Delta V: Don't Map on Delta V parent: Poweredlight components: - type: PoweredLight diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml index 9a2f3b73831..85932ca6b24 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml @@ -1,7 +1,7 @@ - type: entity parent: PoweredlightExterior id: PoweredLightBlueInterior - suffix: Blue Interior + suffix: Blue Exterior, Delta V description: "A light fixture. Draws power and produces light when equipped with a light tube." components: - type: PoweredLight From f687c42fe65e958ac26630eed081620b1b80900d Mon Sep 17 00:00:00 2001 From: Velcroboy <> Date: Mon, 22 Jan 2024 14:46:26 -0600 Subject: [PATCH 2/7] Always powered too, to avoid confusion --- .../Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml index 85932ca6b24..3a6470d36b0 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml @@ -13,7 +13,7 @@ - type: entity parent: AlwaysPoweredWallLight id: AlwaysPoweredLightBlueInterior - suffix: Always Powered, Blue Interior + suffix: Always Powered, Blue Exterior, Delta V description: "A light fixture. Draws power and produces light when equipped with a light tube." components: - type: PointLight From 471cfc97c96ed6f570877243a3d88d8486e48799 Mon Sep 17 00:00:00 2001 From: Velcroboy <> Date: Mon, 22 Jan 2024 14:49:44 -0600 Subject: [PATCH 3/7] and the tubes I guess since some of those were mapped. --- Resources/Migrations/deltaMigrations.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index 8f7d7e33a84..d31781a3670 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -87,3 +87,4 @@ PlushieLizardMirrored: PlushieLizard # 2024-1-22 #Use these lights because they are better PoweredlightExterior: PoweredLightBlueInterior +ExteriorLightTube: BlueLightTube From 032bebfe9bf59e228a890d458c1056c144dba115 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:10:50 -0600 Subject: [PATCH 4/7] Update Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com> Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> --- .../Prototypes/Entities/Structures/Lighting/base_lighting.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 3139811f11b..673e1d17f10 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -149,7 +149,8 @@ - type: entity id: PoweredlightExterior description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Blue, Don't Map on Delta V #Delta V: Don't Map on Delta V + suffix: Blue + noSpawn: true # DeltaV - Don't map these parent: Poweredlight components: - type: PoweredLight From d47901fbfa4cce7f716b387e405212dedfb02b43 Mon Sep 17 00:00:00 2001 From: Velcroboy <> Date: Mon, 22 Jan 2024 15:11:31 -0600 Subject: [PATCH 5/7] Add nospawn to tubes as well --- Resources/Prototypes/Entities/Objects/Power/lights.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index e399c662626..a9dc4260ffc 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -190,7 +190,8 @@ parent: BaseLightTube name: exterior light tube description: A high power high energy bulb for the depths of space. May contain mercury. - id: ExteriorLightTube + id: ExteriorLightTubeBlue + noSpawn: true # DeltaV - Don't map these components: - type: LightBulb color: "#B4FCF0" From 93f558109621ac4eeacc002718ae9b860b6ab653 Mon Sep 17 00:00:00 2001 From: Velcroboy <> Date: Mon, 22 Jan 2024 15:17:55 -0600 Subject: [PATCH 6/7] Add nospawn to tubes as well --- Resources/Prototypes/Entities/Objects/Power/lights.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index a9dc4260ffc..4517cd68a28 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -191,7 +191,7 @@ name: exterior light tube description: A high power high energy bulb for the depths of space. May contain mercury. id: ExteriorLightTubeBlue - noSpawn: true # DeltaV - Don't map these + noSpawn: true # DeltaV: Don't map these components: - type: LightBulb color: "#B4FCF0" From 53488ba0f21007d7d6e5f1a53156a38c7b646de2 Mon Sep 17 00:00:00 2001 From: Velcroboy <> Date: Mon, 22 Jan 2024 15:20:43 -0600 Subject: [PATCH 7/7] what? --- Resources/Prototypes/Entities/Objects/Power/lights.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 4517cd68a28..da99fa6350e 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -190,8 +190,8 @@ parent: BaseLightTube name: exterior light tube description: A high power high energy bulb for the depths of space. May contain mercury. - id: ExteriorLightTubeBlue - noSpawn: true # DeltaV: Don't map these + id: ExteriorLightTube + noSpawn: true # DeltaV - Don't map these components: - type: LightBulb color: "#B4FCF0"