Commit Graph

81 Commits

Author SHA1 Message Date
Leon Friedrich
05df798f11 Fix body bags not taking humans (#6125) 2022-01-10 21:55:27 -07:00
JustinTime
7d0b06f551 Add ability to resist out of welded lockers and locked closets (#5958)
* 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>
2022-01-05 22:18:48 -08:00
Leon Friedrich
f13f743c51 Make use-in-hand default to activation interactions. (#5951) 2022-01-05 00:23:01 +11:00
Paul Ritter
512d6a38c3 get that crap outta here (completely rewrites inventorysystem) (#5807)
* some work

* equip: done
unequip: todo

* unequipping done & refactored events

* workin

* movin

* reee namespaces

* stun

* mobstate

* fixes

* some work on events

* removes serverside itemcomp & misc fixes

* work

* smol merge fix

* ports template to prototype & finishes ui

* moves relay & adds containerenumerator

* actions & cuffs

* my god what is actioncode

* more fixes

* im loosing my grasp on reality

* more fixes

* more work

* explosions

* yes

* more work

* more fixes

* merge master & misc fixed because i forgot to commit before merging master

* more fixes

* fixes

* moar

* more work

* moar fixes

* suffixmap

* more work on client

* motivation low

* no. no containers

* mirroring client to server

* fixes

* move serverinvcomp

* serverinventorycomponent is dead

* gaming

* only strippable & ai left...

* only ai and richtext left

* fixes ai

* fixes

* fixes sprite layers

* more fixes

* resolves optional

* yes

* stable™️

* fixes

* moar fixes

* moar

* fix some tests

* lmao

* no comment

* good to merge™️

* fixes build but for real

* adresses some reviews

* adresses some more reviews

* nullables, yo

* fixes lobbyscreen

* timid refactor to differentiate actor & target

* adresses more reviews

* more

* my god what a mess

* removed the rest of duplicates

* removed duplicate slotflags and renamed shoes to feet

* removes another unused one

* yes

* fixes lobby & makes tryunequip return unequipped item

* fixes

* some funny renames

* fixes

* misc improvements to attemptevents

* fixes

* merge fixes

Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
2021-12-30 22:56:10 +01:00
metalgearsloth
e5e144d99c Rollerbeds (#5681) 2021-12-29 15:57:20 +11:00
AJCM-git
3c17c82edd Fix EntityStorages eating you from afar (#5880)
* Fix lockers eating you from afar

* Reviews
2021-12-27 13:04:18 +01:00
Leon Friedrich
afc3ae6335 Make more uids nullable (#5794) 2021-12-26 13:32:45 +11:00
Alex Evgrashin
900a8118c5 ECS secret stash and toilet (#5685)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-12-21 21:07:17 +11:00
Paul
97e47178d7 Revert "fixes a bunch of warnings"
This reverts commit d4d85b663f.
2021-12-20 15:20:27 +01:00
Paul
d4d85b663f fixes a bunch of warnings 2021-12-20 13:58:30 +01:00
Vera Aguilera Puerto
22d1e8a427 Fix crate deconstruction deleting all of its contents as well. 2021-12-17 01:24:54 +01:00
Vera Aguilera Puerto
cdc8336695 Even more resolve removals. 2021-12-08 17:41:14 +01:00
Vera Aguilera Puerto
3f79e3754f Merge branch 'master' into 2021-12-03-remove-IEntity-komm-süsser-todd
# Conflicts:
#	Content.Client/Crayon/CrayonDecalVisualizer.cs
#	Content.Client/Tabletop/TabletopSystem.cs
#	Content.IntegrationTests/Tests/InventoryHelpersTest.cs
#	Content.Server/AI/EntitySystems/AiSystem.cs
#	Content.Server/AI/Utility/AiLogic/UtilityAI.cs
#	Content.Server/AME/AMENodeGroup.cs
#	Content.Server/Administration/AdminVerbSystem.cs
#	Content.Server/Body/Systems/RespiratorSystem.cs
#	Content.Server/Chemistry/Components/InjectorComponent.cs
#	Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
#	Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
#	Content.Server/Crayon/CrayonComponent.cs
#	Content.Server/Doors/Components/ServerDoorComponent.cs
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
#	Content.Server/Fluids/Components/MopComponent.cs
#	Content.Server/Fluids/Components/SpillExtensions.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.cs
#	Content.Server/Instruments/InstrumentSystem.cs
#	Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
#	Content.Server/Nutrition/EntitySystems/FoodSystem.cs
#	Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
#	Content.Server/Storage/Components/EntityStorageComponent.cs
#	Content.Server/Storage/Components/StorageFillComponent.cs
#	Content.Server/Stunnable/StunbatonSystem.cs
#	Content.Server/Throwing/ThrowHelper.cs
#	Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs
#	Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
#	Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
#	Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
#	Content.Shared/Damage/Components/DamageableComponent.cs
#	Content.Shared/Damage/Systems/DamageableSystem.cs
#	Content.Shared/MobState/Components/MobStateComponent.cs
#	Content.Shared/Slippery/SharedSlipperySystem.cs
2021-12-07 17:48:49 +01:00
metalgearsloth
373b5988d7 Remove redundant IComponent casts 2021-12-07 21:54:00 +11:00
DrSmugleaf
ab9d0cc6d8 Fix errors 2021-12-05 21:02:04 +01:00
DrSmugleaf
2a3b7d809d Fix 3000 errors 2021-12-05 18:09:01 +01:00
Vera Aguilera Puerto
f386b57148 Inline OwnerUid 2021-12-03 16:30:34 +01:00
Vera Aguilera Puerto
2eacf98335 Literally fucking remove IEntity 2021-12-03 16:08:30 +01:00
Vera Aguilera Puerto
5cd42c9ad6 Inline UID 2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
ee4ff9cfe8 Inline Name 2021-12-03 15:25:51 +01:00
Vera Aguilera Puerto
a5b57c8e10 Inline Transform 2021-12-03 14:20:34 +01:00
Vera Aguilera Puerto
69b270017b Inline TryGetComponent completely, for real 2021-12-03 14:17:01 +01:00
Vera Aguilera Puerto
0feebbff00 Inline HasComponent entirely 2021-12-03 12:23:18 +01:00
Vera Aguilera Puerto
b835bea086 Inline GetComponent 2021-12-03 11:55:25 +01:00
Vera Aguilera Puerto
f10ed6c0c3 Inline GetAllComponents 2021-12-03 11:42:24 +01:00
metalgearsloth
07b2ce138d entitystorage fixes (#5660) 2021-12-03 21:19:53 +11:00
Vera Aguilera Puerto
5e177ae734 Inline EntityManager 2021-12-03 11:18:05 +01:00
metalgearsloth
1c089a4079 Fixtures (again) (#5636) 2021-12-01 18:32:37 +11:00
metalgearsloth
43b637826d Revert "Content update for fixture changes (#5524)"
This reverts commit 0a843b671f.
2021-12-01 13:55:24 +11:00
metalgearsloth
0a843b671f Content update for fixture changes (#5524) 2021-12-01 13:05:08 +11:00
Leon Friedrich
22ee9f5e83 Enable verbs for items in storage and prevent orphaned nested UIs (#5512) 2021-11-28 16:25:22 -07:00
Leon Friedrich
7a843fa830 fix cigar case visuals (#5570)
* fix cigar

* newline
2021-11-26 23:43:19 -07:00
Acruid
fa0ec5cbd9 AppearanceComponent API Changes (#5446) 2021-11-23 18:22:59 +11:00
20kdc
0c0a60e432 Stop Item EntityStorages being able to eat people (#5268) 2021-11-11 23:56:38 +11:00
Vera Aguilera Puerto
1f9e1c033f EntityWhitelist uses EntityUid 2021-11-09 13:08:09 +01:00
Javier Guardia Fernández
ec9e65951c Remove IHandsComponent and ISharedHandsComponent (#5218)
* Remove IHandsComponent and ISharedHandsComponent

* Copy the documentation from the interfaces

* Revert "Copy the documentation from the interfaces"

This reverts commit 7638a2d4817743d487c7b255ba3e56add77dca86.

* Perform a minute amount of cleanup
2021-11-08 15:08:24 +01:00
mirrorcult
3f51ffbd3c Pneumatic cannons (#4560)
* basics & visuals

* pneumatic cannon works perf

* loc + popups

* gas tank does stuff + queue changes

* updates

* b

* forcefeeding

* inhand

* crafting!

* pie cannon now is a pneumatic cannon

* oopy

* fix for entman + verbs

* pie

* change for tools

* actual

* combat mode + better sounds

* reviews
2021-11-03 14:33:36 -07:00
Paul
0bbc4d9afe fixes trashbag picking up things through walls
fixes #5098
2021-10-31 14:23:26 +01:00
Visne
c67160ae19 Disable warnings that would be refactored anyway (#5047) 2021-10-27 18:10:40 +02:00
metalgearsloth
f320c6dd8f Fix storage closing bounds on rotated grids (#5033) 2021-10-27 10:27:25 +02:00
Saphire Lattice
0da8a5b9d0 Fix trashbags picking up atmos entities that are anchored (#5035) 2021-10-27 18:12:36 +11:00
metalgearsloth
a4cd222bea Don't include anchored entities for entitystorage 2021-10-24 17:10:05 +11:00
E F R
c5dd6c8b02 Server/Storage: allow specifying a radius for _areaInsert (#5001)
️ Pay no attention to the changes in trashbag.yml... they are merely an
illusion... ️

t. 🧙‍♂️
2021-10-23 19:34:29 -07:00
metalgearsloth
7beb363285 Deprecate a bunch of IActionBlocker (#4852)
* Deprecate IActionBlocker ChangeDirectionAttempt

* Woops

* Throw and interact

* Deperacte speech

* ActionBlocker in fucking shambles

* CanEmote go byebye

* CanAttack is GONE

* IActionBlocker finally ded

* DRY
2021-10-21 13:03:14 +11:00
E F R
5a03c0eca8 Storage: fix Storage insert anim with _quickInsert or _areaInsert set (#4877)
Turns out the final position calculations were wrong, so I copied/pasted
from the equivalent parts of the Hands components.

Unfortunately, this means that picking up trash with a trash bag no
longer causes said trash to rapidly zoom to 0,0.
2021-10-20 15:25:22 +02:00
Vera Aguilera Puerto
0b57420d6e ToolSystem UseTool doesn't log missing components, slight cleanup for things using tools. 2021-10-07 23:08:16 +02:00
Vera Aguilera Puerto
365c7da4dc Makes tools and welders ECS, add ToolQualityPrototype. (#4741) 2021-10-07 13:01:27 +02:00
Vera Aguilera Puerto
94a29978b5 Fix being able to trap aghosts in lockers.
This ain't an ideal fix, I'll admit. But it's better than nothing.
Fixes #4767
2021-10-06 11:45:52 +02:00
Vera Aguilera Puerto
d16c299af1 PlaceableSurfaceSystem uses resolves. 2021-10-06 11:40:05 +02:00
Leon Friedrich
6cb58e608b ECS verbs and update context menu (#4594)
* Functioning ECS verbs

Currently only ID card console works.

* Changed verb types and allow ID card insertions

* Verb GUI sorting and verb networking

* More networking, and shared components

* Clientside verbs work now.

* Verb enums changed to bitmask flags

* Verb Categories redo

* Fix range check

* GasTank Verb

* Remove unnecessary bodypart verb

* Buckle Verb

* buckle & unbuckle verbs

* Updated range checks

* Item cabinet verbs

* Add range user override

* construction verb

* Chemistry machine verbs

* Climb Verb

* Generalise pulled entity verbs

* ViewVariables Verb

* rejuvenate, delete, sentient, control verbs

* Outfit verb

* inrangeunoccluded and tubedirection verbs

* attach-to verbs

* remove unused verbs and move VV

* Rename DebugVerbSystem

* Ghost role and pointing verbs

* Remove global verbs

* Allow verbs to raise events

* Changing categories and simplifying debug verbs

* Add rotate and flip verbs

* fix rejuvenate test

* redo context menu

* new Add Gas debug verb

* Add Set Temperature debug verb

* Uncuff verb

* Disposal unit verbs

* Add pickup verb

* lock/unlock verb

* Remove verb type, add specific verb events

* rename verb messages -> events

* Context menu displays verbs by interaction type

* Updated context menu HandleMove

previously, checked if entities moved 1 tile from click location.

Now checks if entities moved out of view.

Now you can actually right-click interact with yourself while walking!

* Misc Verb menu GUI changes

* Fix non-human/ghost verbs

* Update types and categories

* Allow non-ghost/human to open context menu

* configuration verb

* tagger verb

* Morgue Verbs

* Medical Scanner Verbs

* Fix solution refactor merge issues

* Fix context menu in-view check

* Remove prepare GUI

* Redo verb restrictions

* Fix context menu UI

* Disposal Verbs

* Spill verb

* Light verb

* Hand Held light verb

* power cell verbs

* storage verbs

and adding names to insert/eject

* Pulling verb

* Close context menu on verb execution

* Strip verb

* AmmoBox verb

* fix pull verb

* gun barrel verbs

revolver verb
energy weapon verbs
Bolt action verb

* Magazine gun barrel  verbs

* Add charger verbs

* PDA verbs

* Transfer amount verb

* Add reagent verb

* make alt-click use ECS verbs

* Delete old verb files

* Magboot verb

* finalising tweaks

* context menu visibility changes

* code cleanup

* Update AdminAddReagentUI.cs

* Remove HasFlag

* Consistent verb keys

* Remove Linq, add comment

* Fix in-inventory check

* Update GUI text alignment and padding

* Added close-menu option

* Changed some "interaction" verbs to "activation"

* Remove verb keys, use sorted sets

* fix master merge

* update some verb text

* Undo Changes

Remove some new verbs that can be added later

undid some .ftl bugfixes, can and should be done separately

* fix merge

* Undo file rename

* fix merge

* Misc Cleanup

* remove contraction

* Fix keybinding issue

* fix comment

* merge fix

* fix merge

* fix merge

* fix merge

* fix merge

* fix open-close verbs

* adjust uncuff verb

* fix merge

and undo the renaming of SharedPullableComponent to PullableComponent. I'm tired of all of those merge conflicts
2021-10-04 20:29:03 -07:00