Commit Graph

20 Commits

Author SHA1 Message Date
Mnemotechnican
58be850485 Port All Carrying/PseudoItem/EscapeInventory Tweaks From DeltaV (#484)
# Description
This cherry-picks the following two PRs of mine from delta-v:
- https://github.com/DeltaV-Station/Delta-v/pull/1118 (this one is a
port of two other frontier PRs, see the original description for
details)
- https://github.com/DeltaV-Station/Delta-v/pull/1232

Encompassing a total of 8 distinct changes:
1. Fixes dropping the carried person when walking to a different grid
(from station to shuttle or vice versa. Walking into space however will
still make you drop them) and also makes sure that pressing shift while
being carried does not make you escape.
2. Ensures that the carried person is always centered relative to the
parent (under certain conditions, such as walking near a gravitational
anomaly, their position can change, and that leads to really weird
effects)
3. Fixes the mass contest in CarryingSystem that caused stronger
entities to take longer to escape than weaker ones.
4. Adds popups for when you're getting picked up or being stuffed into a
bag as a pseudo-item (e.g. a felinid)
5. Adds an action to stop escaping an inventory. This action gets added
to your action bar when you attempt escaping and gets removed when you
stop or escape. It applies both to carrying and items (hampsters,
felinids, whatever else).
6. Adds a sleep action for pseudo-items stuffed inside a suitable bag.
The bag must have a special component, which is added to the base
backpack item and thus inherited by all soft bags (duffels, satchels,
etc). Contrary to a popular belief, sleeping IS PURELY COSMETICAL and
does not provide healing. (Beds provide healing when you buckle into
them and that healing does not depend on whether or not you're sleeping)
7. Makes it so that when you try to take a pseudo-item out of the bag
(e.g. a felinid), you automatically try to carry them (if you don't have
enough free hands, they will be dropped on the floor like usually), and
enables you to insert the carried person into a bag, but only if they're
a pseudo-item (e.g. felinid).
8. Allows pseudoitems to be inserted into bags even when there are other
items (as long as there's enough space)

---

## For technical details and video showcases, see the original PRs

This PR is split into separate commits so different parts can be
reverted if deemed unneccessary.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it

<details><summary><h1>Media</h1></summary>
<p>

![Example Media Embed](https://example.com/thisimageisntreal.png)

</p>
</details>

---
-->

# Changelog
🆑
- fix: Carrying is less likely to behave erratically or suddenly
interrupt now.
- add: You can now see when someone is trying to pick you up, and also
you can interrupt your attempt at escaping from their hands or
inventory.
- add: You can now properly take Felinids out of bags and place them
inside.
- add: Scientists have discovered that Felinids can sleep in bags.
2024-07-05 13:28:44 -04: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