Commit Graph

197 Commits

Author SHA1 Message Date
slarticodefast a2cdf5a113 UseInHandEvent cleanup (#35231) 2025-03-01 13:36:43 +00:00
sleepyyapril 3cf059fdc1 Fix Double Muzzle Flash (#33981)
* Pass user to effects to properly fix double muzzle flash.

* Use gun when user is null.

* Update MuzzleFlashEvent.cs

* Update MuzzleFlashEvent.cs

* Update GunSystem.cs

* Update SharedGunSystem.cs

* Update MuzzleFlashEvent.cs

* Update SharedGunSystem.cs

* Update SharedGunSystem.cs

* Update Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

---------

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
2025-02-14 16:09:49 +00:00
Lyndomen 61af74c40e
Turrets and grenades can hit prone people [port] (#2910)
* ranged ai targets crawling people properly

(cherry picked from commit 8f64627c9e35b3c873a7825f25b52319ff8c8e25)

* ranged ai targets crawling people properly

(cherry picked from commit 8f64627c9e35b3c873a7825f25b52319ff8c8e25)

* projectile grenades hit crawling/downed people

(cherry picked from commit 24c3737ae83ab399add28162a65d528d44f73ea9)

* change

* impstation to imp

* remove extra method ops

---------

Co-authored-by: Darkmajia <darkwindleaf@hotmail.co.uk>
2025-02-06 19:57:11 +00:00
BarryNorfolk 23ae0b3758
Oni/refactor (#2805)
* Add ability for GunComponent to track their holders

* Add new component to allow Players to modify gun attributes

* Allow users of melee weapons to also modify their weapons damage

* Allow user stamina damage modifiers

* Allow users of tools to also modify tool attributes

* Delete old Oni component and systems

* Replace oni components

* Set default max spread angle to 180 degrees

* Change modifier to multiplier to better reflect the math

* Add documentation.

* Add NetworkedComponent to new components
2025-02-01 11:04:12 +00:00
SlamBamActionman 63d05a5e53 Add conditional camera offset based on cursor - Hristov Rework, Part 1 (#31626) 2025-01-28 05:02:03 +00:00
deltanedas 83a8002922
Merge pull request #2542 from deltanedas/shitmed-ops
shitmed real
2025-01-07 17:15:23 +00:00
deltanedas 84c0b3e895
snipe qol prs from upstream (#2614)
* Remove discard functionality from the ChemMaster

This duplicates other methods of discarding chemicals, including
the drain conventionally given to chemistry labs.

Any problems it solves are miniscule compared to the severe UI error
that is having a destructive action without confirmation attached
to a mode, the most common source of user error.

* Improve animal cube interactions (#31668)

* Working on dehydrate recipes to renew animal cubes

* Added remaining cube dehydration recipes

* Add OnExamine to RehydratableSystem.cs, need to add functionality to check total volume vs current volume to determine if 'soaked' text needs to be displayed

* Added logic to append text to the description when the wrong reagent has been added to a compressed animal cube

* Re-adding deleted summary

* Update default SolutionName to be correct

* Remove cube recipes to prevent infinite nutrient generation

* Add OnMicrowaved event to RehydratableSystem.cs in order to clear solution of cube when microwaved. CURRENT ERROR REQUIRES REFACTOR OF MICROWAVECOMPONENT

* Subscribe to microwave event

* Refactor of MicrowaveComponent.cs to be in shared folder, accessible to RehydratableSystem.cs. Updated imports

* Modify cube to only dehydrate in microwave when cooked for at least 5 seconds

* now using event to check access to fingerprint

* Tweak - Reflective vest and Energy Katana should reflect only in correct slots (#31902)

* ReflectComponentLogicFix
Added bool InRightPlace and updated relevant system

* Using SlotFlags

* prevent friendly fire for dragon/carp (#32231)

* add NoFriendlyFire

* make zombies use NoFriendlyFire

* no friendly fire for dragon

* let dragon kill naughty fish and validhunting syndies

* add button to print logprobe logs (#32255)

* add EntityName at the bottom of LogProbe

* add button to print logprobe logs

* Add camera mod to diagnostic hud (#32254)

* ai-glass

* weh to protect against bad grammar

* transmutation into diagnostic hud

* Apply forensics when loading with an ammo box

* inaprovaline metabolizes slower

* :trollface:

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
Co-authored-by: Preston Smith <Blackfoot03@outlook.com>
Co-authored-by: YourUsername <you@example.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ArZarLordOfMango <arzarchannel@gmail.com>
Co-authored-by: themias <themias5@gmail.com>
Co-authored-by: Alzore <blackern5000@gmail.com>
2025-01-05 03:55:34 +00:00
gluesniffler 6104945b29 Yet another shitmed update (#1104) 2024-12-27 17:20:37 +00:00
metalgearsloth 57628b8742 Implement some field-level deltas (#28242)
* Update GasTileOverlayState

* Update DecalGridState

* Update NavMapState

* poke

* poke2

* poke3

* Implement field deltas for guns

* Content done

* Update

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2024-12-21 10:25:48 +00:00
BramvanZijp e0636a829c Rework the HoS's Energy Shotgun (Varying energy consumption depending on fire-mode + re-adds a toned down self recharge.) (#32104)
* Rebalance HoS's Energy Shotgun

* SLIGHTLY Up the max charge so the gun properly recharges all of its charges, which matters a lot more with the self charge cooldown system.

* Prevent recharge cooldown if 0 power is used.

* Makes the clientside HUD actually update to reflect the changes in firecost and thus max/current charges.

* Properly fix that recharging to just under full issue instead of applying a budget fix to only the eshotgun.

* Clean up the client ammo UI fix.

* Update the self recharger component to comply with maintainer request.

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Remove code that was made redundant by a hotfix from another PR.

* Make the recharge pause on EMP, document things where needed, clean up code as per maintainer request, add a note to make the code better when power is moved to shared.

* Fix another internal issue

* Code cleanup + fix the rapid recharge verb to remove pause.

* cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-12-21 09:55:48 +00:00
metalgearsloth 7ac3f58402 Fix battery self-recharge mispredicts (#33384) 2024-12-21 09:55:28 +00:00
Stop-Signs 5da943a9c6
New weapon - I.C.E.E. (#2170)
* Update hitscan.yml

* All the things

* Fixing the cold

* Fixed sprite and some formatting

* im dumb

* Revert "Fixed sprite and some formatting"

This reverts commit 2550f41240.

* Reapply "Fixed sprite and some formatting"

This reverts commit 3f4d5eaade.

* Revert "im dumb"

This reverts commit 9056ca3507.

* names

* Reviewed Changes

* Reviewed Changes

* Fixed for Milon

* delta changes

---------

Signed-off-by: Stop-Signs <stopsign221@gmail.com>
2024-12-19 03:34:10 +00:00
beck-thompson 8abdafc353 Clumsy system refactor (#31147)
* First commit

* Fixes

* Added the noise

* Renames

* Timespan

* Fixed space

* entity -> ent

* This shouldn't work

* opps....

* Datafield name change

* Better comments

* small comment

* Personal skill issue

* Event renames and stuff

* Couple fixes

* Defib ref fixes (Silly me)

* Added clumsy back!

* no hard code clumsy!

* Identity fix

* Event name change

* Comment change

* Function name change

* opp

* Update names

* Damage stuff!

* Fixes!

* Fixes

* opps

* This was hidden away!!

* negative diff feeds me
2024-12-07 15:42:29 +00:00
deltanedas 069a73317e
Merge branch 'master' into upstream-ops
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-11-18 21:42:45 +00:00
Lyndomen b1941efa97
Ports Salv Cannon requiring power from Frontier (#2227)
* meow

* meow
2024-11-18 16:53:07 +00:00
MilenVolf 1a210cf074 Allow editing angle of the fired projectile (#33254)
Add Angle datafield to `ProjectileComponent`. It allows to change the angle of the fired projectile
2024-11-15 17:42:52 +00:00
SlamBamActionman 9304ee44d3 Changes to "Burst" firemode; Drozd, WT550 and C20-r (#31292)
* Initial commit

* Change burst fire variable to be a set value rather than a multiplier
2024-11-15 17:31:26 +00:00
BramvanZijp 8f095eedaf Rework the Flare Gun & add a Security Shell Gun. (#32829)
* Rework flaregun and add security shell gun

* Make flare gun twice as likely to appear in emergency lockers

* Security shell gun can now fire lethal shells like the flare gun used to be able to.

* Rebalance the sec shell gun material cost to primarily be steel instead of plastic

* Define the ShellShotgunLight tag in tags.yml

* Leave the no lethal shells for normal flareguns to a different PR.

* Move a comment to re-run checks.

* Bye bye lethal shells from plastic guns.

* Fix weird whitespace issue.

* Make the sec shell gun inherit the normal flare gun.

* Remove the rack verb and update the sec shell gun description

* Remove the ability to fire lethals from flare guns, pending blowing up the gun

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2024-11-15 17:30:45 +00:00
Nemanja 8381ec1cf9 Hivelord mob (#31322)
* Hivelord

* make it longah
2024-09-14 14:23:33 +01:00
metalgearsloth fd4f4f0786 Add access to gun components (#30688)
* Add access to gun components

Found from an rmc14 PR.

* Admin verbs proving why access needs to exist

* Someone is probably going to post this pr to le reddit and complain about self-merges.
2024-08-09 19:17:26 +01:00
Plykiya fcff7ab1c2 Add BreakOnDropItem, update do afters, remove unnecessary declarations (#30361)
* Add BreakOnDropItem, update do afters, remove unnecessary declarations

* bola

* Changed my mind about the nuke

* gennies too

* Make the comments more clear.

* Sorry for the trailing commas

* Revert "Sorry for the trailing commas"

This reverts commit e60fd9a30977393df3344948e6d5c0ce035723cd.

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-09 19:03:54 +01:00
slarticodefast 54fbf9c0e5 replace all uses of TryGetContainingContainer with non-obsolete overload (#30583)
* replace all uses of TryGetContainerContainer with non-obsolete overload

* rerun
2024-08-09 18:24:46 +01:00
RiceMar1244 677eb7cf34 Shotgun spread refactor (#27773)
* Moves spread data to new component

* Refactors shotgun spread code

* Makes shotgun cartridges and projectiles use new component

* Attempts to fix nullable build error

* Fixes hitscan weapons that I broke :(

* Saviour commit?

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2024-08-09 18:22:27 +01:00
Kaga-404 aaf09aadfc Revolver fixes for caseless ammo and wielding (#30117)
* handled check

* splits Handled and TryResetDelay checks
2024-08-09 18:18:02 +01:00
Roudenn 650d588fdd Grappling gun's ReelRate can be changed (#30493)
* Grappling gun ReelRate can be changed

Moves ReelRate constant from SharedGrapplingGunSystem to GrapplingGunComponent, so it's Reel speed can be changed.

* Add coment + remove redudant
2024-08-09 18:14:53 +01:00
Brandon Hu c7f626df69 tweak(GunRequiresWield): State the requirement for gun wielding in the description. (#30301)
* https://en.wikipedia.org/wiki/List_of_LASD_deputy_gangs

* https://knock-la.com/tradition-of-violence-lasd-gang-history/

* https://coc.lacounty.gov/deputy-gangs/
2024-08-09 17:59:55 +01:00
Errant a2ef0b6351 Wrong magazine popup (#29046)
* wrong magazine

* a single typo

* removed GunSystem solution

* magazine misfit warnings
2024-08-09 17:55:41 +01:00
metalgearsloth ebdf080e08 Fix muzzle flash tracking (#30163)
* Fix muzzle flash tracking

User was never set on the networked event but we don't really need it anyway.

* Also this one
2024-08-09 17:52:22 +01:00
Plykiya 4dd3fa17e9 Replace DetachParentToNull() with DetachEntity() (#29992)
DETACH PARENT TO ENTITY

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-09 17:45:45 +01:00
Cojoke 01b4922dc0 Fix Shotgun Spam Loading (#29827) 2024-08-09 17:38:02 +01:00
geraeumig 003f55a74c
Fix magazine sprites after Auto Eject (#28859)
Co-authored-by: geraeumig <alfenos@proton.me>
2024-07-05 20:27:39 +02:00
Plykiya 6583105f10
Replace obsolete EntityWhitelist IsValid usages part 2 (#28506) 2024-06-08 20:03:26 +02:00
Plykiya b2931f9a33
Replace obsolete EntityWhitelist IsValid usages (#28465)
* Replace obsolete whitelist is valid with whitelist system

* Consistency

* Fix logic

* Bork

* I figured out how to get whitelists on the client lol

* test fail

* woops

* HELP ME FUNCTIONS

* Fix errors

* simplify

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-06 21:44:41 +02:00
DrSmugleaf 185a61175f
Fix the client thinking it cannot shoot after mispredicting when it actually can (#28464) 2024-06-01 18:02:04 +02:00
Nemanja bacd52c991
Decouple interactions from hands, cleanup old events, add new fears (#28393)
* ok basic shit

* second part

* pretend it isn't real it can't hurt you.

* 👁️ 👁️

* shadowcommander review
2024-06-01 18:00:07 +02:00
Leon Friedrich d8d385adeb
Fix gun cooldown timespan overflow exception (#28136) 2024-06-01 16:51:22 +02:00
DrSmugleaf e2d0f0a6a0
Make failing to fire a gun that requires wielding not delay the next shot (#27973)
Make failing to fire a wield-only gun not delay the next shot
2024-05-18 13:59:32 +02:00
Kara c56db3b1a8
Resolve `'TransformComponent.MapPosition' is obsolete` in content (#27939)
* Resolve `'TransformComponent.MapPosition' is obsolete: 'Use TransformSystem.GetMapCoordinates'` in content

* build?
2024-05-18 13:58:34 +02:00
DrSmugleaf af6a694481
Make projectiles not hit crit mobs unless clicked on (#27905) 2024-05-18 13:53:49 +02:00
RiceMar1244 10b10f0533
Adds wielding for all large guns (#26970)
* 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
2024-05-18 13:50:12 +02:00
deltanedas cdb9723f26
make dragons breathe fire (#26746)
* add ActionGun system

* add RepeatingTrigger

* dragons breath projectile, repeatedly explodes

* give dragon fire breathing action, fireproof it

* oop

* oop 2

* prevent troll

* proper repeating thing

* pro

* webedit ops

* realops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-18 13:31:40 +02:00
metalgearsloth 580ca2f67f
Fix effects (#27533)
* Fix effects

- Fix muzzle flash rotations.
- Fix effects so they update every frame.
- Fix effects tanking client performance.

* Fix merge artifact
2024-05-07 04:16:15 +02:00
Froffy025 0e5eaa1008
Wield recoil components (#26915)
* WieldRecoilComponents

* WieldRecoilComponents

* Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs

Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>

* Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs

---------

Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit a7fad5d43953ea679418d7c39272bf3224f7767f)
2024-04-21 21:58:24 +02:00
DrSmugleaf 99ab8cea68
Fix rockets and lasers looking like they have nothing loaded (#26933)
(cherry picked from commit 13cef85a6e7d0f5873d1f66358ef742356541582)
2024-04-21 21:56:42 +02:00
Jake Huxell 7be31aab33
Reduced Warning Count By 130 For Full Rebuilds (#26518)
* remove deprecated entity coordinate extension functions. Reduces warning count by approximately 50

* final toCoords Removed

* Remove all unused variables and dead code paths

* remove always true variable, should be a cvar or something instead

* remove superfluous variables from tests

(cherry picked from commit 59e46aab93ca38f8d57fcad4e3a2c893737d9ad4)
2024-04-07 14:11:06 +02:00
Tayrtahn aa766da2c5
Code cleanup: Purge obsoleted SharedPhysicsSystem methods (#26287)
Updated calls to SharedPhysicsSystem methods

(cherry picked from commit 964c6d54caae45b205a326143f56d6458a1bbc8a)
2024-03-27 18:35:38 +01:00
IProduceWidgets 242d6dd30e
Fix admin verb to set unspawned ballisic ammo count (#26411)
Don't crash if an invalid value is given.

(cherry picked from commit 451890b85b49e17a0019d107db4a31a48cdd3518)
2024-03-27 18:35:09 +01:00
Tayrtahn 11eff87687
Code cleanup: Dirty(Comp) (#26238)
* Replaced uses of Dirty(Component) with Dirty(Uid, Component)
Modified some systems (notably pulling-related) to use uids.

* Missed a few

* Revert changes to pulling

* No

(cherry picked from commit 4a83c365858830e3b2ff2b94fff501256422c20e)
2024-03-24 00:04:13 +01:00
nikthechampiongr ad5628777b
Simplify DoAfterArgs behavior for movement and distance checks (#25226)
* Merge BreakOnWeightlessMove and BreakOnMove. Provide different theshold for weightless movement.

* Adjust WeightlessMovementThresholds. Put a thing I forgot to put in the doafterargs.

* Make DoAfterArgs only use OnMove to determine whether to check for
movement and MoveThreshold to determine the threshold regardless of
weightlessness. Gave DistanceThreshold a default value which will always
be checked now.

* Fix issue introduced by merge.

* Use interaction system for determining whether a distance is within range

* Fix incorrect doafter args introduced by previous merge.
Forgor to commit these.

* Exorcise ghost.

The execution system should have been deleted when I merged previously.
For a reason I cannot comprehend it came back, but only the execution
system.

* Exorcise ghost Pt. 2

* Allow for movement check to be overriden in zero g and adjust doafter args where needed.

You can now override checking for movement in zero g with the BreakOnWeightlessMove bool. By default it will check.
The following doafters were made to ignore the movement check in zero g:
- Healing yourself with healing items,
- Removing embedded projectiles,
- Using tools like welders and crowbars

* Adjust distance for cuffing/uncuffing to work. Make injections not break on weightless movement.

* Fix evil incorrect and uneeded comments

(cherry picked from commit 362d56981fd7654f6ebec36f16cc8fabdd04b6a7)
2024-03-24 00:03:28 +01:00
metalgearsloth 444801f137
Fix gun cycling ammo count update (#25635)
Doesn't update correctly when cycling.

(cherry picked from commit fc0ff8fb313d8dfddf803c19a19bf2629ce89e90)
2024-03-07 01:04:01 +01:00