Commit Graph

24 Commits

Author SHA1 Message Date
deltanedas ee4fca43f4
cleanup and carrying refactor (#2466)
* remove evil file

* clean up fugi emag lines

* clean up barrel/keg yml and meta

* surface-level refactor of deep fryer component

* move carrying to shared and fully refactor

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-12-18 11:22:19 +00: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
Mnemotechnican 1abf205f76
Port carrying & pseudo-item tweaks & features from frontier
* Fix dropping carried entity when walking to a different grid and accidental escape from carrying

* Fix offset carrying

Better fix #1

* Add cancel escape action

* Add a popup shown when you're getting picked up

* Ported bag-carrying stuff (taking someone out of a bag makes you carry them, also allows to insert the carried person into a bag)

* Add sleeping inside bags

* Fix carrying mass contest

* Add the missing file

---------

Co-authored-by: Azzy <azzydev@icloud.com>
2024-05-06 13:21:07 -05:00
brainfood1183 a7fb1b4bbc
Toilet Upgrade (needs review) (#22133)
* Toilet Draft

* fixes

* toilets now have secret stash to place items in cistern.

* fixes

* plungers now unblock toilets.

* fix sprite

* new sprites and fix

* fixes

* improve seat sprites.

* fix

* removed visualisersystem changed to genericvisualizers

* flush sound for toilets and copyright for toilet sprites.

* fix atrributions

* fixes

* fix datafield flushtime

* sprite improvements

* fixes

* multiple changes

* fix

* fix

* fixes remove vv

* moved stash related functions to secret stash system from toilet.

* fix

* fix

* changes for recent review.

* fix

* fix

(cherry picked from commit 5f063d2d6d2a41702b60d11f779e23c34fa74410)
2024-04-07 14:18:32 +02: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 345cb0f96d
Remove contests (#25425)
- Not mentioned anywhere ingame.
- Stupid.

(cherry picked from commit 012e6e6c86e2637b6fa8788a59af4eb974e990b8)
2024-03-05 09:39:03 +01:00
Tayrtahn b659a3c61a
Fix pressing shift while held triggering escape (#24878)
* We meet again, my old friend.

* Helper property

(cherry picked from commit 31207006f50d342d2d29c366977ebf4f783a68ea)
2024-02-08 12:31:28 +01:00
Tayrtahn deb0362420
Make EscapeInventorySystem respect Unremovable (fix glued hamster deletion) (#24488)
* Made EscapeInventorySystem respect Unremovable

* Oh look, there's a helper method

* Let's fix this too

(cherry picked from commit 060fbcfbc890d57ee95917655f11e4b65e1226e6)
2024-01-28 00:27:36 +01:00
Adrian16199 7a98044f21
Carrying system. (#217)
* Carrying system.

Carrying someone in your arms, maybe your beloved or a high criminal, is nice for both.

TO DO-Pretty much make it work

* Many more additions to actualy make it work...

Halfly

* ITS WORKING!!!

Not done yet, need to improve it

* THE CARRIABLE UPDATE!!!!!

YEEEEEEEEEEEEEEEEEEEEEEEEEEE
(Thanks death for helping with that one issue that I wasnt able to figure out x3)

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
2023-10-23 17:10:55 +00:00
DrSmugleaf 9cc8a7fc81 Remove 700 usages of Component.Owner (#21100) 2023-10-20 15:31:13 +02:00
Kara c812f6eab0 Kill `ContainerHelpers` (#20908) 2023-10-14 22:02:35 +02:00
metalgearsloth f38f0ab614 Predict StorageComponent (#19682) 2023-09-27 21:59:12 +02:00
metalgearsloth c9648da984 Content update for NetEntities (#18935) 2023-09-27 21:59:12 +02:00
themias f1d3f059fe
Fix mice getting trapped in potted plants (#16745) 2023-05-24 10:30:08 -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
keronshb e9dbcc4278
Another round of DoAfter fixes (#14295) 2023-03-01 11:51:42 +11:00
keronshb 9ebb452a3c
DoAfter Refactor (#13225)
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-02-25 01:01:25 +01:00
Leon Friedrich 881a2b2ece
PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Rane a47f847659
fix inventory escape bug (#12695) 2022-11-21 14:34:53 +11:00
Rane e81510bf3e
Escape inventory refactor (#10203) 2022-08-10 18:37:20 +10:00
metalgearsloth b9e876ca92
The real movement refactor (#9645)
* The real movement refactor

* ref events

* Jetpack cleanup

* a

* Vehicles partially working

* Balance tweaks

* Restore some shitcode

* AAAAAAAA

* Even more prediction

* ECS compstate trying to fix this

* yml

* vehicles kill me

* Don't lock keys

* a

* Fix problem

* Fix sounds

* shuttle inputs

* Shuttle controls

* space brakes

* Keybinds

* Fix merge

* Handle shutdown

* Fix keys

* Bump friction

* fix buckle offset

* Fix relay and friction

* Fix jetpack turning

* contexts amirite
2022-07-16 13:51:52 +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 1f47d65c91
Two small bugfixes (#8285) 2022-05-20 01:29:02 +10:00
keronshb e2ac92c3b5
Allows pickuppable animals to resist out of inventory (#7545)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-05-12 17:58:27 +10:00