Merge branch 'master' into revert-2692-revert-2527-Delta-V_weapons

new-frontiers-14 · Jan 12, 2025 · b9abc9f · b9abc9f
2 parents 2a87eec + 8b707fd
commit b9abc9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml
@@ -8,4 +8,4 @@
     - state: base
       map: [ "enum.PoweredLightLayers.Base" ]
   - type: PoweredLight
-    hasLampOnSpawn: PoweredlightRed
+    hasLampOnSpawn: LightTubeCrystalRed
diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml
@@ -189,8 +189,8 @@ CrateMaterials: CrateMaterialsBasicFilled
 ColoredLightTubeRed: LightTubeCrystalRed
 ColoredBlueLightTube: LightTubeCrystalBlue
 ColoredLightTubeCyan: LightTubeCrystalCyan
-ColoredLightTubeBlackLight: PoweredlightBlack
+ColoredLightTubeBlackLight: LightTubeCrystalBlack
 PoweredlightColoredRed: PoweredlightRed
 PoweredlightBlueInterior: PoweredlightBlue
 PoweredlightColoredFrostyBlue: PoweredlightCyan
-PoweredlightColoredBlack: LightTubeCrystalBlack
+PoweredlightColoredBlack: PoweredlightBlack