diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 85914f5822..0561fe2683 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -3,6 +3,17 @@ #Empty - on map init, light spawns without bulb #Blue/Sodium/etc. - the color of the light +- type: entity # WD + id: LightAmbientSound + abstract: true + components: + - type: AmbientOnPowered + - type: AmbientSound + volume: -11 + range: 3 + sound: + path: /Audio/Ambience/Objects/light_hum.ogg + #Basic lights - type: entity id: AlwaysPoweredWallLight @@ -124,7 +135,7 @@ id: Poweredlight description: "A light fixture. Draws power and produces light when equipped with a light tube." suffix: "" - parent: PoweredlightEmpty + parent: [PoweredlightEmpty, LightAmbientSound] # WD components: - type: Sprite state: base @@ -135,12 +146,6 @@ damage: types: Heat: 2 - - type: AmbientOnPowered - - type: AmbientSound - volume: -15 - range: 2 - sound: - path: /Audio/Ambience/Objects/light_hum.ogg #LED lights - type: entity @@ -230,13 +235,8 @@ description: "An always powered light." id: SmallLight suffix: Always Powered - parent: AlwaysPoweredWallLight + parent: [AlwaysPoweredWallLight, LightAmbientSound] # WD components: - - type: AmbientSound - volume: -15 - range: 2 - sound: - path: /Audio/Ambience/Objects/light_hum.ogg - type: Sprite sprite: Structures/Wallmounts/Lighting/light_small.rsi state: base diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index efc3486753..216295f08f 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -111,7 +111,7 @@ name: post light description: "A light fixture. Draws power and produces light when equipped with a light tube." suffix: "" - parent: PoweredLightPostSmallEmpty + parent: [PoweredLightPostSmallEmpty, LightAmbientSound] # WD components: - type: Sprite state: base @@ -124,19 +124,13 @@ Heat: 2 - type: StaticPrice price: 25 - - type: AmbientOnPowered - - type: AmbientSound - volume: -15 - range: 3 - sound: - path: /Audio/Ambience/Objects/light_hum.ogg - type: entity id: PoweredLEDLightPostSmall name: post light description: "A light fixture. Draws power and produces light when equipped with a light tube." suffix: LED - parent: PoweredLightPostSmallEmpty + parent: [PoweredLightPostSmallEmpty, LightAmbientSound] # WD components: - type: Sprite state: base @@ -153,9 +147,3 @@ Heat: 1 - type: StaticPrice price: 25 - - type: AmbientOnPowered - - type: AmbientSound - volume: -15 - range: 3 - sound: - path: /Audio/Ambience/Objects/light_hum.ogg diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml index 72f5439646..c3e474abc2 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml @@ -1,14 +1,10 @@ - type: entity id: AlwaysPoweredStrobeLight + parent: LightAmbientSound # WD name: strobe description: "UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO!" suffix: Always powered components: - - type: AmbientSound - volume: -15 - range: 2 - sound: - path: /Audio/Ambience/Objects/light_hum.ogg - type: MeleeSound soundGroups: Brute: