Commit Graph

7 Commits

Author SHA1 Message Date
Krunklehorn 3469feabd5 Add checks for various complex interactions (#37246)
* Prevent toggling radiation collectors

* Prevent resisting locks

* Prevent unbuckling others, early exit before doafter

* Prevent camera and camera router setup

* Prevent rotating and flipping

* Also prevent adding the unbuckle verb.

* Revert ResistLocker changes

* Prevent emitter tampering

* Also prevent lock verb

* Prevent toggling welders

* Prevent gun open/close bolt, rack and switch mode

* Prevent toggling stun batons
2025-08-06 23:32:53 +02:00
kosticia 4582e31e19 remove ignition functional from welder component (#37586)
* a

* webedit
2025-08-04 14:51:21 +02:00
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
nikthechampiongr a5ebe6a25d Fix RA0032 (#32514) 2024-10-02 12:08:12 +01:00
Verm 22c7f4e610
Welding tweaks (#27959) 2024-06-06 21:59:35 +02:00
Pieter-Jan Briers 176e9b0a81
THE RETURN OF ITEM STATUS (#22986)
* THE RETURN OF ITEM STATUS

Item status is now inline with the hands again. You can now see item status for both hands at once.

If you have more than 2 hands, the last active hand of that side is displayed in the respective item status.

The item status for the active hand is also highlighted.

Item status has been given a new look so it looks unique and matches every UI theme.

* Shrink item status to 125px

This is going to require fixing the existing controls. Do that later.

* New bullet item status rendering

sex

* Make gun item status look just a little bit nicer.

Avoid only one or two bullets ending up on a single row of an item status.

* Delete Eris theme files

* More improvements

Fixed the fact that left/right were flipped around when assigning status panel locations. Involved renaming all the UI textures.

Redid how content margins are set from the theme. Less complex and cleaner now.

Made the item name always left-aligned, just looks better since other UI elements don't adapt anyways.

* Compact down item status text

Now it fits 3 lines of text on one line. Yay.

This is achieved by compacting RichTextLabels by reducing their line height and giving them a negative bottom margin.

* Add item status sprites for Ashen theme.

* Add status control to show beaker/bucket/jug solution/transfer volumes

Also PollingItemStatusControl I'll be using that more.

* Fix welder item status, clean up welder code

The item status control implementation was ancient and bad. That's why it was buggy.

Removed all the complex dated networking stuff for welders, we just sync the solution contents now anyways so none of that is needed anymore. This moves a buncha stuff to shared and just removes code.

Cleanup. The code was doing some really dumb stuff.

* Spray bottles show contents in item status.

* cowtools

* Fix plasmafire and clockwork themes.

Actual git gaslighting wtf.

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit 58f025ba8043bcf5c32204b08eec8ae9e5d2bd41)
2024-04-21 23:41:08 +02:00
Nemanja 0d88c372e9
add fuel costs back to finishing welding (#27030)
* add fuel costs back to welding

* ack

* meh

* eek!

(cherry picked from commit a47c5561a9632b6577abdc252f712d7f2da823e6)
2024-04-21 23:20:07 +02:00