]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Move grenade components to shared (#22691)
authorAexxie <codyfox.077@gmail.com>
Thu, 1 Feb 2024 13:29:01 +0000 (07:29 -0600)
committerGitHub <noreply@github.com>
Thu, 1 Feb 2024 13:29:01 +0000 (00:29 +1100)
commit467e983ba972a7ae749c95448febd19c7c285514
tree5a5316567b4f72b7f0be7afe9e5fe6e826e003d8
parent4520ac8c9ba8030f7b25b39a6f04a89e6106b0b1
Move grenade components to shared (#22691)

* Moves FlashComponent.cs, FlashOnTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Moves ExplodeOnTriggerComponent.cs, OnUseTimerTriggerComponent.cs, ActiveTimerTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Delete .run/Content Server+Client.run.xml

HOW DID THIS GET IN HERE ITS NOT AHHHH

* Update Content.Client/Explosion/SmokeOnTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update ExplodeOnTriggerComponent.cs

* Revert "Delete .run/Content Server+Client.run.xml"

This reverts commit 29ee05f57de60eab5c92158d8eba5e3acba483c2.

* Fix?

* cannot figure out how to get this to go back please forgive

* Fixes a network issue

* leftovers

* Fixes

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
40 files changed:
.run/Content Server+Client.run.xml
Content.Client/Explosion/ClusterGrenadeVisualizerSystem.cs
Content.Client/Explosion/ExplosionOverlay.cs
Content.Client/Explosion/ExplosionOverlaySystem.cs
Content.Client/Explosion/SmokeOnTriggerSystem.cs [new file with mode: 0644]
Content.Client/Explosion/TriggerOnProximityComponent.cs
Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
Content.Server/Defusable/Systems/DefusableSystem.cs
Content.Server/Explosion/Components/ActiveTimerTriggerComponent.cs [deleted file]
Content.Server/Explosion/Components/TriggerOnProximityComponent.cs
Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
Content.Server/Flash/Components/FlashOnTriggerComponent.cs [deleted file]
Content.Server/Flash/FlashSystem.cs
Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
Content.Shared/Administration/SpawnExplosionEuiMsg.cs
Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs [new file with mode: 0644]
Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs [moved from Content.Shared/Explosion/ExplosionVisualsComponent.cs with 97% similarity]
Content.Shared/Explosion/Components/OnTrigger/ExplodeOnTriggerComponent.cs [moved from Content.Server/Explosion/Components/OnTrigger/ExplodeOnTriggerComponent.cs with 57% similarity]
Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs [moved from Content.Server/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs with 85% similarity]
Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs [moved from Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs with 59% similarity]
Content.Shared/Explosion/Components/SharedClusterGrenadeComponent.cs [moved from Content.Shared/Explosion/SharedClusterGrenadeComponent.cs with 77% similarity]
Content.Shared/Explosion/Components/SharedTriggerOnProximityComponent.cs [moved from Content.Shared/Explosion/SharedTriggerOnProximityComponent.cs with 74% similarity]
Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs [new file with mode: 0644]
Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs [new file with mode: 0644]
Content.Shared/Flash/Components/FlashComponent.cs [moved from Content.Server/Flash/Components/FlashComponent.cs with 83% similarity]
Content.Shared/Flash/Components/FlashOnTriggerComponent.cs [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml
Resources/Prototypes/Entities/Objects/Weapons/security.yml