Commit Graph

1 Commits

Author SHA1 Message Date
Avalon c81f09747e
Impstation Port - #2575 And #2351 (#3845)
* It begins

* Fixes

* MIssed a Comp+system

* Update muzzleflashes.yml

* Some fixes, new issues

* Ouroboros to BASALISK

* More fixes

* More changes

* Update meta.json

* I FEEEXED IT!!!

* Delete muzzle_synd.png

* Update uplink_catalog.yml

* Update projectiles.yml

* Update projectiles.yml

* fixes

* Update pyrotechnic.yml

* Make our suits protect from self damage

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Adjustments

* Update SharedToolSystem.Welder.cs

* Update uplink_catalog.yml

* Update ReagentTankComponent.cs

* Update Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Fixes

* Update Content.Shared/_Impstation/Weapons/Ranged/DamageOnShootSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Update tags.yml

* Changes

* I am commitiing this and asking for help

* Fixes

* Fixes

* Doing a thing

* Thing is done

* Update Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Special/basilisk.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Update Content.Shared/_Impstation/Weapons/Ranged/DamageOnShootProtectionComponent.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Update Content.Shared/_Impstation/Tools/SolutionRefuelSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Update Content.Shared/_Impstation/Weapons/Ranged/DamageOnShootComponent.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Update Content.Shared/_Impstation/Tools/SolutionRefuelComponent.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Update Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* More fixes

* Update SharedToolSystem.Welder.cs

* Update SharedToolSystem.Welder.cs

* LETS TRY

* FUCK GO BACK

This Partially reverts commit de3bd33873.

* Update ReagentTankComponent.cs

* Update meta.json

* Indentation fixes

* Update syndicate.yml

* FIXED (I think)

* Fixes

* Update anaconda.yml

* Update leviathan.yml

* Nuke 2

* All set!

* Update Resources/Prototypes/_Impstation/Catalog/Fills/Backpacks/duffelbag.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Update Content.Shared/_Impstation/Weapons/Ranged/DamageOnShootSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Update Resources/Locale/en-US/_Impstation/tools/solution-refuel-component.ftl

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

* Update Content.Shared/_Impstation/Tools/SolutionRefuelSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Avalon <jfbentley1@gmail.com>

---------

Signed-off-by: Avalon <jfbentley1@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-06-12 20:55:35 +02:00