Commit Graph

65 Commits

Author SHA1 Message Date
nikthechampiongr 4630e94c66
Minor cleanup of cuffablesystem (#26434)
* Fix cuffs breaking after they stop being pulled

* Do proper interaction check for UncuffAttempt

* Minor cleanup

Take as much out as possible from _net.IsServer() if blocks.
Misc cleanup
2024-03-26 15:15:08 -04:00
nikthechampiongr 362d56981f
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
2024-03-19 21:09:00 +11:00
metalgearsloth c584f6444a
Pulling rework v2 (#24936)
* Pulling rework

Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame.

* More pulling cleanup

* stats

* More cleanup

* First draft

* More pulling

* weh

* Fix puller

* Pulling working

* Fix merge

* Dunked

* Self-merge time

* Fix hotkey

* Fix container changes

* oop

* Fix multi-pulling

* Move alerts cleanup.

* pulling fixes
2024-03-19 14:30:56 +11:00
Whisper 74232f9831
handcuff replacements are faster to escape from (#25601)
makeshift handcuffs are easier to escape from
2024-02-26 16:05:16 -07:00
SlamBamActionman 485fb4cb65
Remove self-uncuff spam suicide, damage changes (#25161)
* Initial commit

* Remove damage from cuffs entirely

* Changed from Action uncuffing cooldown to UseDelay cooldown

* Minor merge conflict fix

* Edit the actual correct line

* Submodule fix
2024-02-26 13:41:20 +11:00
metalgearsloth a440ccfc7c
Fix cuffs popup prediction (#25553) 2024-02-26 00:10:02 +11:00
Jezithyr c15b0691ec
Emergency revert for pulling (#24923)
Revert "Pulling rework (#20906)"

This reverts commit 0d8254b2a2.
2024-02-03 10:32:30 -08:00
metalgearsloth 0d8254b2a2
Pulling rework (#20906)
* Pulling rework

Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame.

* More pulling cleanup

* stats

* More cleanup

* First draft

* More pulling

* weh

* Fix puller

* Pulling working

* Fix merge

* Dunked

* Self-merge time
2024-02-03 14:36:09 +11:00
AJCM-git 108f001731
Virtual items cleanup (#23912)
* Virtual items cleanup

* Detail

* Review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-01-14 21:18:47 +11:00
Nemanja 526b966f09
Fix zipties/makeshift cuffs dropping multiple broken entities on removal (#23095) 2023-12-28 16:50:08 -07:00
TemporalOroboros 7a77d6d5dd
Content ecs containers (#22484) 2023-12-28 01:30:03 -04:00
metalgearsloth 269c93245d
Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
metalgearsloth 64343c289d
Revert Arch testmerge 2 (#21901) 2023-11-26 14:20:07 +11:00
metalgearsloth 855ab4d129
Update submodule to 182.1.0 (#21900) 2023-11-26 13:53:54 +11:00
metalgearsloth d4bed09cdc
Revert the other arch changes (#21871) 2023-11-24 11:19:46 +11:00
metalgearsloth 93bd9972f1
Content arch (#20107)
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-11-23 14:34:37 +11:00
Leon Friedrich aa59956134
Fix handcuffed entity deletion and a mind shutdown error. (#21825)
* Fix handcuffed deletion error

* Fix mind shutdown error
2023-11-21 19:53:30 -05:00
metalgearsloth 5b8f3c48c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth 9b1b3e03ed
Content audio (#20862) 2023-10-29 14:58:23 +11:00
Nemanja b5a7af1d58
Fix uncuffing for zombies (#21021) 2023-10-15 23:31:03 -06:00
DrSmugleaf a44fa86b68
Update trivial components to use auto comp states (#20539) 2023-09-28 16:20:29 -07:00
metalgearsloth 9f9577acd0
Fix component constraints (#20241) 2023-09-20 10:12:48 +10:00
metalgearsloth 5a0fc68be2
Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
DrSmugleaf c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
DrSmugleaf a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
metalgearsloth 0f917d22d7
Color flash effect fixes (#18952) 2023-08-10 10:44:52 -07:00
Slava0135 d4c8065e8a
Move and rename damage effect to color flash effect (#18263)
* move damage effect to different package

* rename to ColorFlashEffect

* renaming some other things
2023-08-01 19:02:54 +03:00
brainfood1183 ebab4cae8c
Straitjacket Functionality. (#18052) 2023-07-22 18:14:25 -04:00
Errant 669d332332
Communicate self-uncuff damage to player a bit more clearly (#17835) 2023-07-07 03:28:33 -06:00
Clon clover 045eba06c3
Damage on forced uncuff (#17801)
* cuffs do 1 damage

* Update SharedCuffableSystem.cs

* Update SharedCuffableSystem.cs

* remove unused code

* Update CuffableComponent.cs

* alphabetical

* damage

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
2023-07-03 15:30:09 -06:00
Nemanja 5212fc5478
No unbuckling while cuffed (#17719) 2023-06-28 23:19:56 -04:00
Pieter-Jan Briers b4803b0bbf
Handcuffs don't handle interaction events if target isn't cuffable. (#17050) 2023-06-02 10:48:42 +10:00
Menshin 04b2f41cb4
Fixes zipties spawning multiple entities on removal (#15761) 2023-05-02 20:14:55 +10:00
Menshin f85f45674f
Fix handcuff raising assert on applying/removing (#15658) 2023-04-24 16:41:46 -04:00
DrSmugleaf b947856431
Remove hands component reference (#15197) 2023-04-07 11:21:12 -07:00
Leon Friedrich 19277a2276
More DoAfter Changes (#14609)
* DoAfters

* Compact Clone()

* Fix mice and cuffables

* Try generalize attempt events

* moves climbabledoafter event to shared, fixes issue with climbable target

* Fix merge (cuffing)

* Make all events netserializable

* handful of doafter events moved

* moves the rest of the events to their respective shared folders

* Changes all mentions of server doafter to shared

* stop stripping cancellation

* fix merge errors

* draw paused doafters

* handle unpausing

* missing netserializable ref

* removes break on stun reference

* removes cuffing state reference

* Fix tools

* Fix door prying.

* Fix construction

* Fix dumping

* Fix wielding assert

* fix rev

* Fix test

* more test fixes

---------

Co-authored-by: keronshb <keronshb@live.com>
2023-04-02 21:13:48 -04:00
metalgearsloth 72d9bd0a58
Don't delete virtual hand items on client (#14954) 2023-03-29 22:04:21 +11:00
metalgearsloth 2dfdf73aa6
Fix cuff layer spam (#14869) 2023-03-26 08:15:32 -05:00
Mr0maks eb6d2c5b97
Fix handcuffs in fight mode (#14716) 2023-03-17 13:13:04 +11:00
Leon Friedrich 07491f545c
doafter hotfix (#14678) 2023-03-15 15:07:16 +11:00
Leon Friedrich 24ef92de18
Fix `EmptyContainer` construction action (#14406) 2023-03-15 11:14:18 +11:00
Nemanja 49f7575298
Cuffable/Handcuff ECS (#14382) 2023-03-13 19:34:26 -04:00
metalgearsloth c8f89eca60
ECS dragdrop (#12973)
* ECS dragdrop

No more excuses.

* AAAAAAAAAAAAAA

* kry

* events

* aaaaaaaaaa

* HUH

* Fix stripping

* aaaaaa

* spoike

* asease

* fix table vaulting

* ded

* rebiew

* aaaaaaaaaaaaa

* drag

* aeaeae

* weh
2023-02-13 13:29:34 +00:00
Leon Friedrich 3965c2efe6
Fix zipties (#13600) 2023-01-20 05:48:19 -08:00
Leon Friedrich efac113469
Improve stripping UI (#9768) 2022-10-16 04:00:04 +11:00
metalgearsloth 5c1cc5b9b3
Fix melee cuffs (#11602) 2022-09-29 23:38:24 +10:00
metalgearsloth 2b6c352aff
Jetpacks (#9023)
* Movement acceleration

* tweaks

* Weightless refactor coz fuck it

* CCVars

* weightless movement tweaks

* Some cleanup while I'm here

* dorkpacks

* thanks fork

* fixes

* zoomies

* toggles

* hmm

* yamls

* b

* so true

* Effects refactor

* namespace

* review
2022-06-24 17:44:30 +10:00
Rane e5bad81ac4
Can't break other people's drags on cuffed people (#8868)
* works on my machine

* speedrun
2022-06-16 11:10:03 +10:00
wrexbe bc68ac96dd
Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Leon Friedrich 823941764a
Fix handcuffed players being able to escape pulls (#7534) 2022-04-13 17:11:55 +10:00