From fe2e24cf989e63464452d635b80da1b63fd35dff Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Thu, 27 Jan 2022 00:01:32 +0000 Subject: [PATCH] Led light brightness nerf + power increase (#6259) --- .../Light/Components/LightBulbComponent.cs | 2 +- .../Entities/Objects/Power/lights.yml | 42 +++++++++++++++++-- .../Structures/Wallmounts/lighting.yml | 26 +++++++++++- 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/Content.Server/Light/Components/LightBulbComponent.cs b/Content.Server/Light/Components/LightBulbComponent.cs index ac21c2a4a2..29d9c5f149 100644 --- a/Content.Server/Light/Components/LightBulbComponent.cs +++ b/Content.Server/Light/Components/LightBulbComponent.cs @@ -39,7 +39,7 @@ namespace Content.Server.Light.Components public float LightSoftness = 1; [DataField("PowerUse")] - public int PowerUse = 40; + public int PowerUse = 60; [DataField("breakSound")] public SoundSpecifier BreakSound = new SoundCollectionSpecifier("GlassBreak"); diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 2089d86e44..80301b378c 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -1,4 +1,3 @@ -# TODO: Add description (1) - type: entity parent: BaseItem id: BaseLightbulb @@ -95,16 +94,53 @@ - type: entity parent: BaseLightbulb name: led light tube + description: A high power high energy bulb. id: LedLightTube components: - type: LightBulb bulb: Tube color: "#EEEEFF" - lightEnergy: 4 + lightEnergy: 2.5 lightRadius: 10 lightSoftness: 0.9 BurningTemperature: 350 - PowerUse: 9 + PowerUse: 25 + - type: Sprite + sprite: Objects/Power/light_tube.rsi + state: normal + +- type: entity + parent: BaseLightbulb + name: exterior light tube + description: A high power high energy bulb for the depths of space. May contain mercury. + id: ExteriorLightTube + components: + - type: LightBulb + bulb: Tube + color: "#B4FCF0" + lightEnergy: 4.5 + lightRadius: 12 + lightSoftness: 0.5 + BurningTemperature: 350 + PowerUse: 100 + - type: Sprite + sprite: Objects/Power/light_tube.rsi + state: normal + +- type: entity + parent: BaseLightbulb + name: sodium light tube + description: A high power high energy bulb for the depths of space. Salty. + id: SodiumLightTube + components: + - type: LightBulb + bulb: Tube + color: "#FFAF38" + lightEnergy: 4 + lightRadius: 10 + lightSoftness: 0.5 + BurningTemperature: 350 + PowerUse: 100 - type: Sprite sprite: Objects/Power/light_tube.rsi state: normal diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml index 3c4691ec98..d560133c17 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml @@ -114,6 +114,30 @@ damage: types: Heat: 20 + +- type: entity + id: PoweredlightExterior + description: "A light fixture. Draws power and produces light when equipped with a light tube." + suffix: Exterior tube, Powered + parent: Poweredlight + components: + - type: PoweredLight + hasLampOnSpawn: ExteriorLightTube + damage: + types: + Heat: 20 + +- type: entity + id: PoweredlightSodium + description: "A light fixture. Draws power and produces light when equipped with a light tube." + suffix: Sodium tube, Powered + parent: Poweredlight + components: + - type: PoweredLight + hasLampOnSpawn: SodiumLightTube + damage: + types: + Heat: 20 - type: entity name: small light @@ -200,4 +224,4 @@ hasLampOnSpawn: LightBulb damage: types: - Heat: 20 + Heat: 20 \ No newline at end of file