Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various Wielding Fixes #1078

Merged
merged 9 commits into from
Oct 20, 2024

Conversation

VMSolidus
Copy link
Member

Unhand me, fiend

Description

Literally all of Wizden's "Wielding Quality Of Life" improvements.

Fixes #1074
Fixes #1073

Cherry-picks the following PRs:
space-wizards/space-station-14#26970
space-wizards/space-station-14#27973
space-wizards/space-station-14#27975
space-wizards/space-station-14#28438
space-wizards/space-station-14#27975
space-wizards/space-station-14#28002
space-wizards/space-station-14#28161

Changelog

🆑

  • fix: Ported literally all of Wizden's Wielding Quality Of Life improvements.

SpaceRox1244 and others added 6 commits October 17, 2024 11:51
* Adds wielding assets

* Modifies meta.json files and adds artist credit

* Adds wieldable component to a bunch of weapons

* Moves shotgun inhands and wield inhands to their own folders (because its the only way the sprites would work)

* Removes the wieldable component from some guns

* Adds wielding sprites for wieldable guns that didnt have them

* Adds gun wielding bonuses and base innaccuracy to wieldable guns.

* Corrects wielded accuracy to be default accuracy instead of perfect

* Makes the drozd smg and bulldog shotgun wieldable

* Makes nukie c20r wieldable and adds sprites

* Adds BaseGunWieldable

* Makes all the newly wieldable gun use the base inheritable

* Adds accuracy to smgs to resolve inheritance conflict

* Makes all wieldable shotguns require wielding to fire because of a bug involving spread innacuracy

* Adds wield bonus message on examine
…shot (#27973)

Make failing to fire a wield-only gun not delay the next shot
* Make wielding automatically drop the item on your other hand

* Fix docs

* Remove redundant parameter

* Fix not deleting virtuals on fail

* Make count freeable hands method

* Add popup when dropping item
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Oct 17, 2024
@VMSolidus VMSolidus changed the title Various-Wielding-Fixes Various Wielding Fixes Oct 17, 2024
@FoxxoTrystan FoxxoTrystan requested review from a team, FoxxoTrystan, DEATHB4DEFEAT, Peptide90, Pspritechologist and OldDanceJacket and removed request for a team October 18, 2024 02:43
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Oct 18, 2024
@FoxxoTrystan FoxxoTrystan added Priority: 2-High Needs to be resolved as soon as possible Size: 4-Small For small issues/PRs Type: Port Brings something to here from another codebase Type: Respace Moving something from an old namespace labels Oct 18, 2024
VMSolidus and others added 2 commits October 19, 2024 21:30
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
@VMSolidus VMSolidus merged commit 0383090 into Simple-Station:master Oct 20, 2024
11 checks passed
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this pull request Oct 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 2-High Needs to be resolved as soon as possible Size: 4-Small For small issues/PRs Status: Needs Review Someone please review this Type: Port Brings something to here from another codebase Type: Respace Moving something from an old namespace
Projects
None yet
Development

Successfully merging this pull request may close these issues.

two hand weapons disappear when wielded Combat QOL, changing hands should unwield wielded weapons
8 participants