juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,698 Commits 57 Branches 0 Tags
e49d6b05efd4bbca1b1ff4e5cd28866bec93600a
Commit Graph

86 Commits

Author SHA1 Message Date
metalgearsloth
da1007b7f1 Chem injectors ECS (#6366) 2022-02-07 00:34:13 +11:00
Leon Friedrich
dd61fb46ea Adjust interaction ordering & interaction conditions (#6387) 2022-02-05 13:39:01 +11:00
wrexbe
17db0775c8 Auto comp (#6416) 2022-02-02 14:35:40 +11:00
wrexbe
cea1b21832 Fixing some warnings (#6250) 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
 2022-01-21 10:38:35 +01:00
metalgearsloth
64de4bbed9 Nuke gridtilelookup (#6030) 2022-01-09 23:47: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
Mariner102
4257e8e731 Custom transfer amount to hydroponic trays (#5833) 2021-12-22 13:52:59 +11:00
Leon Friedrich
7e49b22a74 Verb predict (#5638) 2021-12-16 21:42:02 +11:00
Leon Friedrich
7f81f0b8b8 Add more pretty strings to logs (#5768) 2021-12-13 12:22:58 +01:00
Vera Aguilera Puerto
8b09d55b10 Fix weird lifestage autorefactors. 2021-12-09 12:39:51 +01:00
Vera Aguilera Puerto
4dcfebfd53 Fix build 2021-12-08 17:44:39 +01:00
Vera Aguilera Puerto
ba736f70df Remove many resolves on Content.Server 2021-12-08 17:04:21 +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
Vera Aguilera Puerto
c57b07a4d0 Goes in-game now 2021-12-06 15:34:46 +01:00
DrSmugleaf
af4eb3c7cd Fix more errors, client and server now build 2021-12-06 14:00:39 +01:00
metalgearsloth
525297c5fe A bunch of AttachedEntity bullshit 2021-12-06 15:39:46 +11:00
DrSmugleaf
2a3b7d809d Fix 3000 errors 2021-12-05 18:09:01 +01:00
Leon Friedrich
49a5696fd6 Add Syringe DoAfter (#5658) 
* syringe do after

* fix spacing

* delay and log tweaks

* Apply suggestions from code review

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* clean up comments

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2021-12-04 03:33:21 -08: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
0feebbff00 Inline HasComponent entirely 2021-12-03 12:23:18 +01:00
Vera Aguilera Puerto
c2e6da1e54 Inline QueueDelete 2021-12-03 11:43:22 +01:00
Vera Aguilera Puerto
e3227546b3 Inline Delete 2021-12-03 11:43:03 +01:00
Vera Aguilera Puerto
f64df117be Inline AddComponent 2021-12-03 11:33:40 +01:00
Vera Aguilera Puerto
b2035543e2 Inline Deleted 2021-12-03 11:30:03 +01:00
Vera Aguilera Puerto
f06bfc22ce Inline Description 2021-12-03 11:18:05 +01:00
Vera Aguilera Puerto
70bbd8c502 Inline Prototype 2021-12-03 11:18:05 +01:00
Vera Aguilera Puerto
5e177ae734 Inline EntityManager 2021-12-03 11:18:05 +01: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
Spartak
30c87ca6b2 Added auto label for ChemMaster (#5596) 2021-11-28 19:25:23 -07:00
mirrorcult
bf30f82ff5 Acid effects (#5466) 
* acid

* balance

* nerf area effects
 2021-11-27 00:31:49 -07:00
Spartak
b06becaf98 Adds pills type selection and pills canister (#5539) 
* Added pill type selection

Ui textures missing for now

* bugfixes

* Pill type selection

* ui changes

* Added pills canister

* Change requests
 2021-11-26 23:44:36 -07:00
Leon Friedrich
3b29ffdfa0 Make chemistry machines and IdCardConsole use item slots (#5428) 
* chemistry item slots

* item slots id card console
 2021-11-24 18:03:07 +11:00
Paul
f675ff37b1 fix exception 2021-11-23 20:20:40 +01:00
Acruid
fa0ec5cbd9 AppearanceComponent API Changes (#5446) 2021-11-23 18:22:59 +11:00
mirrorcult
e2205e418b Epinephrine + epipen (#5444) 
* add sprite and basic entity, no reagent or testing

* actually implement epinephrine and add it to the box

* allow creating it

* add it to nanomed

* fig
 2021-11-22 23:51:51 -07:00
mirrorcult
6fc397f801 carpet (#5464) 
* carpet

* reviews

* why tf i gotta fix integration tests in the carpet pr
 2021-11-22 18:01:51 -07: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
mirrorcult
0f2dda8275 screaming and crying (#5447) 2021-11-22 19:40:14 +11: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
48f8dd2284 ActionBlocker CanInteract uses EntityUid exclusively 
ActionBlockerSystem fully uses EntityUid now!
 2021-11-09 15:05:49 +01:00
Javier Guardia Fernández
af579b15cc Update to .NET 6 and C# 10 (#5233) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2021-11-09 15:05:07 +01:00
Vera Aguilera Puerto
c051b1e056 ActionBlocker CanUse uses EntityUid exclusively 2021-11-09 13:21:59 +01:00