* 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>
* 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)
* Made EscapeInventorySystem respect Unremovable
* Oh look, there's a helper method
* Let's fix this too
(cherry picked from commit 060fbcfbc890d57ee95917655f11e4b65e1226e6)
* 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>
* Enable lighting of Cigars with IsHotEvent
Subscribed to IsHotEvent in ThrusterSystem, added AfterInteractEvent to SmokingSystem.Cigar which will set SmokableState to Lit if IsHotEvent returns true
This should mean that cigs/Cigars should light on anything hot
* Revert "Enable lighting of Cigars with IsHotEvent"
This reverts commit db896e1f80940892a87d34aa7182b9c605fa53bc.
* Add the ability to kick your way out of welded or locked closets
Added a ResistLocker component/system that hooks into OnRelayMove to begin resisting out of lockers so that players aren't stuck in lockers forever
Also added check to EntityStorageComponent to not print out welded shut message if the entity attempting to open the locker is inside of it.
* Changes based on review
minor formatting changes
make components passed into AttemptResist nullable and resolve them inside of the function
Remove incorrectly named .ftl file
* Changes based on review
Ditched async DoAfter
Used PopupSystem over User.PopupMessage
Added Cancel token to ResistLockerComponent
Subscribed to EntRemovedFromContainer event to cancel DoAfter if the player is removed from a container
* I am in formatting hell, apparently
* Changes based on review
Added TryComp for the EntityStorageComponent instead of the event passed one
* Changes based on review
* Apply suggestions from code review
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Formatting changes based on review
* Shuffle functions around in LockSystem to properly trigger visualizer
Moved all the unlocking logic to a Lock method inside of LockSystem and TryUnlock calls this method if the user passes all of the access checks
* Formatting, replacing Resolve with TryComp and making AttemptResist arguments optional
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
* Check if the player is inside THE container not A container
me no read good
* ok ok I give my code is bad
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Mnemotechnican
brainfood1183
nikthechampiongr
metalgearsloth
Tayrtahn
Adrian16199
DrSmugleaf
Kara
themias
Leon Friedrich
keronshb
Nemanja
Rane
Pieter-Jan Briers
Vera Aguilera Puerto
wrexbe
JustinTime