]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Tesla (#21124)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Thu, 28 Dec 2023 13:11:50 +0000 (16:11 +0300)
committerGitHub <noreply@github.com>
Thu, 28 Dec 2023 13:11:50 +0000 (13:11 +0000)
commit88d7cfb4c035a5a5c2c3e7fc643b9a0d4ad18f5f
tree7345e488249eb634ead912f0ff3f0a18f9ba8e68
parent06719a3232950cf6d5e69d0390c4d70e99c0a08d
Tesla (#21124)

* upload all textures
finished easiest part - TeslaGenerator

* Added Tesla energy logic

* add lightning pulse priority

* work

* optimise lightning arc system

* now tesla moving to LightningTarget entity and consume it

* some audio work
add airlock and computers to the LightningTarget

* add nice visual and explosions
add crashing to game

* rsi meta fix

* disabling explosions (crashing server)
I'll get back to that problem later.

* adding important admin logging

* a little bit of cleaning and documentation

* Persistent attempts to fix the server crashing on explosions. Accidental cleaning of everything I see.

* now the tesla incinerates everything it touches except the containment field.

* colliders work

* fix falling tesla on ground after being exploded

* add consume sound, add spawn and collapses sound

* added TeslaGenerator to cargo trading console

* add all tesla part to cargo trading console

* Tesla coils: Turn on and off, get energy from lightning, give energy to the grid.

* tesla coil is ready

* tesla grounding rod is ready

* clean up

* clean up 2

* grounding rods now working without power

* add LightningResistance parameter for LightningTarget Component

* add chaotic teleport

* eletrocution remove?

* deltanedas fix pack

* more fixes

* FIXES

* FIIIXEEES

* The "Grounding Rod" component is removed, and replaced with "LightiningSparking", which is responsible for changing the visuals when hit by lightning. Duplicate code from the coil is removed.

* ops

* fix

* nah, is escaped anyway

* increase tesla collider size

* keron bb

* try fix test?

* fix

* bruh

* check turn off sus comp

* prototype cleaning

* FIIX

* return and fix sus component

* fix tesla eating lightnings, now mini tesla is electrocuted

* commented some issues

* remove linq sorting
fix jumping system
minor fixes

* fix second Linq

* fix tesla colliders! Yeah, it works

* fix componentregistration

* Just retests

* not fix

* FIX TESLA

* fixes

* store targets

* back

* make dictionary of hashsets

* some sloth fixes

* stump

* playtest balance energy generation, return to unpotimized (but working) lightning shoot

* parity

* work on

* some new fix, some new bug (chasingComponent not chasing)

* comment

* fix ChasingWalkSystem

* fix collider tesla problem

* revert old unoptimized shoot lightning

* new fix pack

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
51 files changed:
Content.Server/Lightning/Components/LightningComponent.cs
Content.Server/Lightning/Components/LightningTargetComponent.cs [new file with mode: 0644]
Content.Server/Lightning/LightningSystem.cs
Content.Server/Lightning/LightningTargetSystem.cs [new file with mode: 0644]
Content.Server/Physics/Components/ChaoticJumpComponent.cs [new file with mode: 0644]
Content.Server/Physics/Components/ChasingWalkComponent.cs [new file with mode: 0644]
Content.Server/Physics/Controllers/ChaoticJumpSystem.cs [new file with mode: 0644]
Content.Server/Physics/Controllers/ChasingWalkSystem.cs [new file with mode: 0644]
Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
Content.Server/Tesla/Components/LightningArcShooterComponent.cs [new file with mode: 0644]
Content.Server/Tesla/Components/LightningSparkingComponent.cs [new file with mode: 0644]
Content.Server/Tesla/Components/TeslaCoilComponent.cs [new file with mode: 0644]
Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs [new file with mode: 0644]
Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs [new file with mode: 0644]
Content.Server/Tesla/EntitySystem/LightningSparkingSystem.cs [new file with mode: 0644]
Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs [new file with mode: 0644]
Content.Server/Tesla/EntitySystem/TeslaEnergyBallSystem.cs [new file with mode: 0644]
Content.Shared/Lightning/Components/SharedLightningComponent.cs
Content.Shared/Power/TeslaCoilVisuals.cs [new file with mode: 0644]
Content.Shared/Singularity/Components/EventHorizonComponent.cs
Resources/Audio/Effects/attributions.yml
Resources/Audio/Effects/tesla.ogg [new file with mode: 0644]
Resources/Audio/Effects/tesla_collapse.ogg [new file with mode: 0644]
Resources/Audio/Effects/tesla_consume.ogg [new file with mode: 0644]
Resources/Locale/en-US/prototypes/catalog/cargo/cargo-engines.ftl
Resources/Locale/en-US/prototypes/catalog/fills/crates/engines-crates.ftl
Resources/Locale/en-US/tesla/tesla-components.ftl [new file with mode: 0644]
Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
Resources/Prototypes/Catalog/Fills/Crates/engines.yml
Resources/Prototypes/Entities/Effects/sparks.yml
Resources/Prototypes/Entities/Mobs/base.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Power/apc.yml
Resources/Textures/Structures/Power/Generation/Tesla/coil.rsi/coil.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/coil.rsi/coilhit.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/coil.rsi/grounding_rod.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/coil.rsi/grounding_rodhit.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/coil.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/energy_ball.rsi/energy_ball.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/energy_ball.rsi/energy_ball_fast.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/energy_ball.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/energy_miniball.rsi/tesla_projectile.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/generator.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Tesla/generator.rsi/meta.json [new file with mode: 0644]