Cherrypicks 2 (#371)
* Handheld teleporter portals now must start on the same grid. (#28423) Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com> * hand teleport portals now may start in the same grid. (#28556) * Implement vital chef's hat functionality (#25950) * Implement crucial chef's hat functionality * Unified stopping code and added events. * Added documentation to events * Rerun tests * Made review changes, and fixed potential desync bug. * Update whitelist * Make Hamlet a valid chef's hat pilot (#29191) * Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709) * Update DevourSystem.cs * Update DevourSystem.cs * Update Content.Server/Devour/DevourSystem.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Treatment of blood loss in the Rat King (#26887) Bloodloss-RatKing * - fix: Fix error. --------- Co-authored-by: Moony <moony@hellomouse.net> Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: IlyaElDunaev <154531074+IlyaElDunaev@users.noreply.github.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using Content.Shared.DoAfter;
|
||||
using Content.Shared.DoAfter;
|
||||
using Robust.Shared.Audio;
|
||||
using Robust.Shared.GameStates;
|
||||
using Robust.Shared.Prototypes;
|
||||
@@ -20,6 +20,12 @@ public sealed partial class HandTeleporterComponent : Component
|
||||
[ViewVariables, DataField("secondPortal")]
|
||||
public EntityUid? SecondPortal = null;
|
||||
|
||||
/// <summary>
|
||||
/// Portals can't be placed on different grids?
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public bool AllowPortalsOnDifferentGrids;
|
||||
|
||||
[DataField("firstPortalPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
|
||||
public string FirstPortalPrototype = "PortalRed";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user