Paul
856b293d87
Merge branch 'master-upstream' into expl_int_analyzer
...
# Conflicts:
# Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs
# Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs
# Content.Server/GameObjects/Components/Chemistry/PillComponent.cs
# Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
# Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs
# Content.Server/GameObjects/Components/Items/RCD/RCDAmmoComponent.cs
# Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs
# Content.Server/GameObjects/Components/Medical/HealingComponent.cs
# Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs
# Content.Shared/Chemistry/Solution.cs
2021-02-04 17:50:28 +01:00
Paul
d5cd82de60
explicit interface go brrrr
2021-02-04 17:44:49 +01:00
collinlunn
b51b8cb182
Some Power nullable & ComponentDependency ( #3050 )
...
* Power nullability
* AME nullability
* re-adds EnsureComponents
* conflict fix
* Update Content.Server/GameObjects/Components/Power/PowerNetComponents/RadiationCollectorComponent.cs
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com >
* Update Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com >
* Update Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com >
* Update Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com >
* Update Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com >
* removes duplicate component assignment
Co-authored-by: py01 <pyronetics01@gmail.com >
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com >
2021-02-01 17:19:43 +01:00
Víctor Aguilera Puerto
d9ae942759
Make InteractUsing async, make tools use DoAfter. ( #1772 )
...
* Make IInteractUsing async, make tools use DoAfter.
* Disable warning 1998 in Content.Server
* Update Content.Server/GameObjects/Components/AnchorableComponent.cs
2020-08-18 14:39:08 +02:00
Acruid
ea94f4a182
Moved interaction interfaces from Server to Shared.
2020-07-18 22:51:56 -07:00
chairbender
b35333d366
Click Drag Functionality + Refactor Interaction Interfaces ( #1125 )
...
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com >
Co-authored-by: ComicIronic <comicironic@gmail.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
2020-07-06 23:27:03 +02:00
py01
23cc6b1d4e
Power Rework ( #863 )
...
Co-authored-by: py01 <pyronetics01@gmail.com >
2020-06-28 17:23:26 +02:00
