From: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Date: Fri, 12 Apr 2024 08:02:06 +0000 (+0300) Subject: Strobes added (#26083) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=279e01c3d26ce8332114103b2045abb61886c614;p=space-station-14.git Strobes added (#26083) * Done * Adds new * empty * attributions * empty * strobe admin deleted --- diff --git a/Resources/Audio/Effects/Lightning/attributions.yml b/Resources/Audio/Effects/Lightning/attributions.yml index fa6cc9d165..0bd92af1bb 100644 --- a/Resources/Audio/Effects/Lightning/attributions.yml +++ b/Resources/Audio/Effects/Lightning/attributions.yml @@ -2,3 +2,13 @@ license: CC-BY-NC-SA-3.0 copyright: Citadel Station 13 source: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/35a1723e98a60f375df590ca572cc90f1bb80bd5 + +- files: ["strobeepsilon.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Made by dj-34 (https://github.com/dj-34). Modified by Ko4erga" + source: "https://github.com/ss220-space/Paradise/blob/05043bcfb35c2e7bcf1efbdbfbf976e1a2504bc2/sound/effects/epsilon.ogg" + +- files: ["strobe.ogg"] + source: "https://freesound.org/people/blukotek/sounds/431651/" + license: "CC0-1.0" + copyright: "Piotr Zaczek (blukotek) on freesound.org. Modified by Ko4erga" diff --git a/Resources/Audio/Effects/Lightning/strobe.ogg b/Resources/Audio/Effects/Lightning/strobe.ogg new file mode 100644 index 0000000000..0d8228c886 Binary files /dev/null and b/Resources/Audio/Effects/Lightning/strobe.ogg differ diff --git a/Resources/Audio/Effects/Lightning/strobeepsilon.ogg b/Resources/Audio/Effects/Lightning/strobeepsilon.ogg new file mode 100644 index 0000000000..9f77e93b2d Binary files /dev/null and b/Resources/Audio/Effects/Lightning/strobeepsilon.ogg differ diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml new file mode 100644 index 0000000000..8eceb76b63 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml @@ -0,0 +1,148 @@ +- type: entity + id: AlwaysPoweredStrobeLight + 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: + collection: GlassSmash + - type: Transform + anchored: true + - type: Clickable + - type: InteractionOutline + - type: Construction + graph: LightFixture + node: bulbLight + - type: Sprite + sprite: Structures/Wallmounts/Lighting/strobe_light.rsi + drawdepth: WallMountedItems + layers: + - map: ["enum.PoweredLightLayers.Base"] + state: base + - map: ["enum.PoweredLightLayers.Glow"] + state: glow + shader: unshaded + state: base + - type: PointLight + mask: /Textures/Effects/LightMasks/double_cone.png + color: "#FFE4CE" + energy: 5 + radius: 10 + softness: 1 + offset: "0, 0.35" + - type: RotatingLight + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage, don't spawn entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:EmptyAllContainersBehaviour + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: ["Destruction"] + placement: + mode: SnapgridCenter + snap: + - Wallmount + +- type: entity + name: strobe + description: "UH?! Sorry, all I can hear is WEE-OOO-WEE-OOO!" + id: PoweredStrobeLightEmpty + suffix: Empty + parent: AlwaysPoweredStrobeLight + components: + - type: Sprite + sprite: Structures/Wallmounts/Lighting/strobe_light.rsi + state: empty + - type: AmbientSound + enabled: false + - type: PointLight + enabled: false + offset: "0, 0.35" + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + - type: PoweredLight + bulb: Bulb + on: false + damage: + types: + Heat: 5 + - type: ApcPowerReceiver + - type: ExtensionCableReceiver + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: SmartLight + - type: WirelessNetworkConnection + range: 200 + - type: Appearance + - type: PoweredLightVisuals + spriteStateMap: + empty: empty + broken: broken + burned: broken + off: base + on: base + - type: DeviceLinkSink + ports: + - On + - Off + - Toggle + - type: Construction + graph: LightFixture + node: strobeLight + +- type: entity + id: PoweredStrobeLightPolice + suffix: "Empty, police" + parent: PoweredStrobeLightEmpty + components: + - type: AmbientSound + volume: 0 + range: 10 + sound: + path: "/Audio/Effects/Lightning/strobe.ogg" + +- type: entity + id: PoweredStrobeLightSiren + suffix: "Empty, siren" + parent: PoweredStrobeLightEmpty + components: + - type: AmbientSound + volume: 0 + range: 10 + sound: + path: "/Audio/Misc/siren.ogg" + +- type: entity + id: PoweredStrobeLightEpsilon + suffix: "Empty, epsilon" + parent: PoweredStrobeLightEmpty + components: + - type: AmbientSound + volume: 0 + range: 10 + sound: + path: "/Audio/Effects/Lightning/strobeepsilon.ogg" \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml index 111d8ebcd7..f70a44efe3 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml @@ -19,6 +19,11 @@ - material: Steel amount: 5 doAfter: 2.0 + - to: strobeLight + steps: + - material: Steel + amount: 1 + doAfter: 2.0 - node: tubeLight entity: PoweredlightEmpty edges: @@ -63,4 +68,19 @@ - !type:SpawnPrototype prototype: SheetSteel1 amount: 5 + - !type:DeleteEntity {} + - node: strobeLight + entity: PoweredStrobeLightEmpty + edges: + - to: start + conditions: + - !type:ContainerEmpty + container: "light_bulb" + steps: + - tool: Screwing + doAfter: 2.0 + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 1 - !type:DeleteEntity {} \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index a1f370cc1b..46f61807f3 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -1472,6 +1472,24 @@ conditions: - !type:TileNotBlocked +- type: construction + name: strobe light + id: LightStrobeFixture + graph: LightFixture + startNode: start + targetNode: strobeLight + category: construction-category-structures + description: A wall light fixture. Use light bulbs. + icon: + sprite: Structures/Wallmounts/Lighting/strobe_light.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canRotate: true + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + #conveyor - type: construction name: conveyor belt diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/base.png new file mode 100644 index 0000000000..a68dfc9d87 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/base.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/broken.png new file mode 100644 index 0000000000..e2a4ab462c Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/empty.png new file mode 100644 index 0000000000..b48cc5ab9e Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/glow.png new file mode 100644 index 0000000000..0e8645bd9a Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/glow.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/meta.json new file mode 100644 index 0000000000..865473f545 --- /dev/null +++ b/Resources/Textures/Structures/Wallmounts/Lighting/strobe_light.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base", + "directions": 4 + }, + { + "name": "empty", + "directions": 4 + }, + { + "name": "glow", + "directions": 4 + }, + { + "name": "broken", + "directions": 4 + } + ] +}