juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,941 Commits 57 Branches 0 Tags
81df9f0601ae61ba9292ae157b0333f81fcde310
Commit Graph

77 Commits

Author SHA1 Message Date
JustinTime
0fd0035581 Light Cigars when interacting with hot stuff (#5879) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2021-12-24 22:59:14 +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
Paul Ritter
cc57d1380c Revert Rich text (#5848) 2021-12-20 12:42:42 +01:00
Leon Friedrich
7f81f0b8b8 Add more pretty strings to logs (#5768) 2021-12-13 12:22:58 +01:00
E F R
b2da936848 Everything: Rich text redux (#5625) 
* lord save me

* UI/ChatBox: Use the new `defStyle` param for `RenderMarkup`

The previous iteration didn't work because `AddMessage` can't inherit
its color from the PushColor (since we're not doing actual tag stacks
anymore).

* rebase touchup
 2021-12-12 18:25:42 -08:00
Vera Aguilera Puerto
f6371c6e62 Make all current admin logs use ToPrettyString 2021-12-11 16:00:10 +01:00
Vera Aguilera Puerto
cdc8336695 Even more resolve removals. 2021-12-08 17:41:14 +01:00
Vera Aguilera Puerto
c8b65be747 Replace IEntityManager resolves in systems for cached EntityManager 2021-12-08 13:00:43 +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
8af335097f More (IComponent) shenanigans and also some contaminated IoCManager.Resolve<IEntityManager>() very long yes calls 2021-12-07 22:22:34 +11:00
metalgearsloth
373b5988d7 Remove redundant IComponent casts 2021-12-07 21:54:00 +11:00
Leon Friedrich
bd8acc5b6b Fix food & do-after bugs (#5716) 2021-12-06 23:19:26 -07:00
DrSmugleaf
af4eb3c7cd Fix more errors, client and server now build 2021-12-06 14:00:39 +01: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
Ygg01
d1ab9592aa Minor spill refactors (#5569) 2021-12-05 14:18:30 +11:00
Leon Friedrich
bfff21ea73 Add IngestionBlocker component (#5692) 2021-12-04 11:56:27 -07:00
Vera Aguilera Puerto
f386b57148 Inline OwnerUid 2021-12-03 16:30:34 +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
e3227546b3 Inline Delete 2021-12-03 11:43:03 +01:00
Vera Aguilera Puerto
5e177ae734 Inline EntityManager 2021-12-03 11:18:05 +01:00
Leon Friedrich
a9c3153a55 Make masks & some helmets block eating/drinkling (#5656) 2021-12-02 15:51:05 +01:00
mirrorcult
ccf01d7431 Remove LungBehavior and replace with LungComponent/System (#5630) 2021-11-30 18:25:02 -07:00
mirrorcult
e3af2b5727 ECS BloodstreamComponent (#5629) 2021-11-30 16:47:21 -07:00
Paul Ritter
fbcb53dcc0 pvs content (#5484) 
Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
 2021-11-30 15:20:38 +01:00
FoLoKe
6f455346b2 Fixes mouse self-eating (#5622) 2021-11-30 21:45:33 +11:00
FoLoKe
9db2fbefe1 Moves Sliceable to ECS (#5552) 2021-11-30 21:20:13 +11:00
Leon Friedrich
d0c5d72d47 Forcefeed DoAfters, again. (#5582) 2021-11-29 14:27:15 +11:00
Pieter-Jan Briers
64861ff034 Add Content.Shared.Database (#5588) 2021-11-28 14:56:53 +01:00
Leon Friedrich
0de4b7bc9f Modify damage logging. (#5579) 2021-11-28 14:34:44 +01:00
FoLoKe
e94bd5698d Fixes EatVerb interaction range (#5505) 2021-11-25 13:16:56 +11:00
Acruid
fa0ec5cbd9 AppearanceComponent API Changes (#5446) 2021-11-23 18:22:59 +11:00
mirrorcult
e40c9bc427 Reactive 3.0 (#5443) 
* probably scrapping this

* reimpl old behavior

* misc fixes and initial yaml

* works basically first try
 2021-11-22 10:17:35 +01:00
FoLoKe
24aca21eb6 Moved Food and Utensil to ECS (#5380) 
* Food and Utensil to ECS, Made utensil less restrictive, no more soup eating with a knife...

* AltVerb "can eat" check

* removed HasFlag calls

* AltActionVerb -> InteractionVerb

* "required utensil" filed
 2021-11-21 00:35:09 -07:00
mirrorcult
457e8c64ee Convert StomachBehavior to a component/system + rejig body namespaces (#5249) 
* Convert StomachBehavior to a component/system + rejig body namespaces

* test

* slightly more namespace changes

* remove

* Hello?????

* fuck you github test runner

* reviews

* oobsy!
 2021-11-11 16:10:57 -07:00
Vera Aguilera Puerto
1a177f7479 DrinkSystem uses EntityUid instead of IEntity 2021-11-09 11:28:27 +01:00
Javier Guardia Fernández
f5b11d6af8 Remove IMobStateComponent (#5220) 2021-11-08 15:11:58 +01:00
mirrorcult
2d3077f560 Remove IMoveSpeedModifier in favor of events (#5212) 
* Remove IMoveSpeedModifier

* fucking magboots

* yope

* rabiews
 2021-11-08 16:17:35 +11:00
Ephememory
418e3eaef8 fix drink examine text (#5170) 2021-11-04 21:16:28 -07:00
mirrorcult
3ab4a30a0f Generalize ReagentUnit into FixedPoint2 and use it for damage calculations (#5151) 
* Damage units

* sum ext method
 2021-11-03 16:48:03 -07: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
Ygg01
fc5fa67a56 Refactor Resolve and IEntity in SolutionContainerSystem (#5083) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2021-11-02 12:03:23 +11:00
Fortune117
76bc00b218 Changed drinks to use ECS (#4948) 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2021-11-02 11:40:55 +11:00
Ygg01
b2aca94586 Refactor Solution from Shared -> Server (#5078) 
* Move entity solution entity systems to shared

* Move SolutionComponents to Server

* Fix namespaces

* Remove Networked Component.

* Fixes

* Add components to ignore list
 2021-10-29 23:40:15 +11:00
Visne
c67160ae19 Disable warnings that would be refactored anyway (#5047) 2021-10-27 18:10:40 +02:00
Vera Aguilera Puerto
0deaa9e18c Fix pill swallowing popup loc. 2021-10-23 10:59:53 +02:00