1fcbb599d4
Fix popup on handcuffing for person being handcuffed ( #33639 )
...
* Fix popup on handcuffing for person being handcuffed
* wrap onto newlines to appease the style gods
2025-01-01 17:11:51 +00:00
4299bcfafc
Fix for handcuffing someone more than once ( #33646 )
...
* Fix for over-cuffing someone
* comment
2024-12-07 21:54:13 +00:00
7f00d3a99d
Fix(CuffableSystem): Check if cuffs can be transferred(dropped) ( #30465 )
...
* ugh
* Revert "ugh"
This reverts commit 8b5b0e24bcaa6c5cc9229c17eb138cdb476f0c9e.
* Revert "Automatic changelog update"
This reverts commit 4f8b634f38e6ba588d45c75b35e5e1446df7949e.
* Revert "Revert "Automatic changelog update""
This reverts commit 9fc2a3307a06e5f7d19bbb8d29e45b9a1d1470c8.
* Revert "Revert "Revert "Automatic changelog update"""
This reverts commit 1ae733bf308d7285159dd1fafd7f17101d8f4ced.
* Revert "Revert "Automatic changelog update""
This reverts commit 9fc2a3307a06e5f7d19bbb8d29e45b9a1d1470c8.
* Revert ""
This reverts commit 1cc0953333cf3d4f2cad5fae2f5c562ae99563ae.
* Revert ""
This reverts commit edca368a8444fd0fd403333695668d1c1db3726a.
* Revert "Revert "ugh""
This reverts commit 3ac15dfb07c7ae43b797724f85b76193ecd7a0e1.
* Revert "Revert "Revert "ugh"""
This reverts commit b952a4556397c8abcc7c319d736fab7ae48073a2.
* Revert "Revert "Revert "Revert "ugh""""
This reverts commit ff1a151571dea653d78ac2bda75eb11209da8d96.
* Revert "ugh"
This reverts commit 8b5b0e24bcaa6c5cc9229c17eb138cdb476f0c9e.
* Update SharedCuffableSystem.cs
2024-08-09 19:17:07 +01:00
c97b2cc2dc
ai stays seated and pulled while cuffed. ( #30397 )
...
* ai stays seated while cuffed.
* Do the thing I thought was dumb.... whatever.
* less than
2024-08-09 19:02:30 +01:00
aaa9f84fb1
Replace IClickAlert with events ( #30728 )
...
* Replace IAlertClick with events
* whoop
* eek!
2024-08-09 18:58:46 +01:00
54cc68445e
Allow ai to understand if its handcuffed. ( #30402 )
...
* allow ai to understand if its handcuffed.
* rerun tests they worky on local
* Contained here in, a string of expletives about flaky tests.
* on retrospect, default true is probably smorter.
* do reviews
* I forgor xml
* more xml
2024-08-09 18:18:14 +01:00
96eac8f10e
Fix zombie uncuffing ( #30321 )
...
* Fix zombie uncuffing
* PlaceNextTo() and rename vars
2024-08-09 18:08:24 +01:00
d0a8d88e78
Partial buckling refactor ( #29031 )
...
* partial buckling refactor
* git mv test
* change test namespace
* git mv test
* Update test namespace
* Add pulling test
* Network BuckleTime
* Add two more tests
* smelly
2024-07-25 00:34:37 +02:00
0c72607391
Turn interaction related attempt events into structs ( #29168 )
...
* Turn InteractionAttemptEvent into a struct event
* readonly
* GettingInteractedWithAttemptEvent
* ConsciousAttemptEvent
2024-07-25 00:19:34 +02:00
0a06bbea46
make pulled uncuffing slower & reduce uncuff spam cooldown ( #29008 )
...
* prevent people being pulled from uncuffing themselves
* block -> modify duration
2024-07-05 20:35:42 +02:00
f0c639cdf4
Make cuff default range again ( #28576 )
...
* Make cuff default range again
* uncuff distance
* how about ONE
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-08 20:20:36 +02:00
9adf1ed402
Remove AlertType and AlertCategory ( #27933 )
2024-06-01 16:55:49 +02:00
b50633483e
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
(cherry picked from commit 4630e94c661f7af35610e24b7bd337bc30ef9fd5)
2024-03-27 18:38:49 +01:00
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
4bacc02a0e
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
(cherry picked from commit c584f6444a85cc53edb060230f7e7b2b76cc87bf)
2024-03-24 00:03:20 +01:00
c7d16b4c6b
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
(cherry picked from commit 485fb4cb652793ab4f9cbe90bb2cbf555fbf5540)
2024-03-07 00:56:26 +01:00
2b5aef7764
Fix cuffs popup prediction ( #25553 )
...
(cherry picked from commit a440ccfc7c0d9dcaa68a419cac50f71bde1e42a1)
2024-03-07 00:52:30 +01:00
9a6fa17e72
Virtual items cleanup ( #23912 )
...
* Virtual items cleanup
* Detail
* Review
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 108f001731b9394f98d9ef712b9b777e5b3f8abc)
2024-01-26 22:49:14 +01:00
3e096f4532
Fix zipties/makeshift cuffs dropping multiple broken entities on removal ( #23095 )
...
(cherry picked from commit 526b966f090f221010b08e36f375629ac7bf24de)
2024-01-22 18:58:00 +01:00
aebae6fab7
Content ecs containers ( #22484 )
...
(cherry picked from commit 7a77d6d5dd73a34be238fdebc284da5bc2917c67)
2024-01-22 18:47:55 +01:00
b1ee2d48ff
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-12-02 20:16:36 +01:00
52104a45c1
Revert Arch testmerge 2 ( #21901 )
2023-12-02 19:05:12 +01:00
39ad6db5c3
Update submodule to 182.1.0 ( #21900 )
2023-12-02 19:05:11 +01:00
9741d9916c
Revert the other arch changes ( #21871 )
2023-12-02 19:05:11 +01:00
333096b19e
Content arch ( #20107 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-12-02 19:04:08 +01:00
0f3999da63
Fix handcuffed entity deletion and a mind shutdown error. ( #21825 )
...
* Fix handcuffed deletion error
* Fix mind shutdown error
2023-12-02 19:00:03 +01:00
72a2d11fce
Fix uncuffing for zombies ( #21021 )
2023-10-20 15:29:04 +02:00
d084dd2efb
Fix component constraints ( #20241 )
2023-09-27 21:59:12 +02:00
c9648da984
Content update for NetEntities ( #18935 )
2023-09-27 21:59:12 +02:00
c71f97e3a2
Refactor actions to be entities with components ( #19900 )
2023-09-08 18:16:05 -07:00
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
0f917d22d7
Color flash effect fixes ( #18952 )
2023-08-10 10:44:52 -07:00
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
ebab4cae8c
Straitjacket Functionality. ( #18052 )
2023-07-22 18:14:25 -04:00
669d332332
Communicate self-uncuff damage to player a bit more clearly ( #17835 )
2023-07-07 03:28:33 -06:00
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
5212fc5478
No unbuckling while cuffed ( #17719 )
2023-06-28 23:19:56 -04:00
b4803b0bbf
Handcuffs don't handle interaction events if target isn't cuffable. ( #17050 )
2023-06-02 10:48:42 +10:00
04b2f41cb4
Fixes zipties spawning multiple entities on removal ( #15761 )
2023-05-02 20:14:55 +10:00
f85f45674f
Fix handcuff raising assert on applying/removing ( #15658 )
2023-04-24 16:41:46 -04:00
b947856431
Remove hands component reference ( #15197 )
2023-04-07 11:21:12 -07:00
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
72d9bd0a58
Don't delete virtual hand items on client ( #14954 )
2023-03-29 22:04:21 +11:00
2dfdf73aa6
Fix cuff layer spam ( #14869 )
2023-03-26 08:15:32 -05:00
eb6d2c5b97
Fix handcuffs in fight mode ( #14716 )
2023-03-17 13:13:04 +11:00
07491f545c
doafter hotfix ( #14678 )
2023-03-15 15:07:16 +11:00
24ef92de18
Fix `EmptyContainer` construction action ( #14406 )
2023-03-15 11:14:18 +11:00
49f7575298
Cuffable/Handcuff ECS ( #14382 )
2023-03-13 19:34:26 -04:00
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
3965c2efe6
Fix zipties ( #13600 )
2023-01-20 05:48:19 -08:00
Plykiya
Brandon Hu
IProduceWidgets
Nemanja
themias
Leon Friedrich
nikthechampiongr
metalgearsloth
SlamBamActionman
AJCM-git
TemporalOroboros
DrSmugleaf
Slava0135
brainfood1183
Errant
Clon clover
Pieter-Jan Briers
Menshin
Mr0maks