Fulton tweaks (#19786)
This commit is contained in:
@@ -57,7 +57,10 @@ public sealed class FultonSystem : SharedFultonSystem
|
|||||||
var xform = Transform(uid);
|
var xform = Transform(uid);
|
||||||
var oldCoords = xform.Coordinates;
|
var oldCoords = xform.Coordinates;
|
||||||
var offset = _random.NextVector2(1.5f);
|
var offset = _random.NextVector2(1.5f);
|
||||||
TransformSystem.SetCoordinates(uid, new EntityCoordinates(beaconXform.ParentUid, offset));
|
var localPos = TransformSystem.GetInvWorldMatrix(beaconXform.ParentUid)
|
||||||
|
.Transform(TransformSystem.GetWorldPosition(beaconXform)) + offset;
|
||||||
|
|
||||||
|
TransformSystem.SetCoordinates(uid, new EntityCoordinates(beaconXform.ParentUid, localPos));
|
||||||
|
|
||||||
RaiseNetworkEvent(new FultonAnimationMessage()
|
RaiseNetworkEvent(new FultonAnimationMessage()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ public abstract partial class SharedFultonSystem : EntitySystem
|
|||||||
|
|
||||||
private void OnFultonInteract(EntityUid uid, FultonComponent component, AfterInteractEvent args)
|
private void OnFultonInteract(EntityUid uid, FultonComponent component, AfterInteractEvent args)
|
||||||
{
|
{
|
||||||
if (args.Target == null || args.Handled)
|
if (args.Target == null || args.Handled || !args.CanReach)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (TryComp<FultonBeaconComponent>(args.Target, out var beacon))
|
if (TryComp<FultonBeaconComponent>(args.Target, out var beacon))
|
||||||
|
|||||||
@@ -12,3 +12,5 @@
|
|||||||
WeaponCrusher: 2
|
WeaponCrusher: 2
|
||||||
WeaponCrusherDagger: 2
|
WeaponCrusherDagger: 2
|
||||||
WeaponProtoKineticAccelerator: 2
|
WeaponProtoKineticAccelerator: 2
|
||||||
|
FultonBeacon: 1
|
||||||
|
Fulton: 2
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
- type: Item
|
- type: Item
|
||||||
size: 30
|
size: 30
|
||||||
- type: Foldable
|
- type: Foldable
|
||||||
|
folded: true
|
||||||
- type: Clickable
|
- type: Clickable
|
||||||
- type: InteractionOutline
|
- type: InteractionOutline
|
||||||
- type: FultonBeacon
|
- type: FultonBeacon
|
||||||
|
|||||||
@@ -3,7 +3,9 @@
|
|||||||
result: Fulton1
|
result: Fulton1
|
||||||
completetime: 5
|
completetime: 5
|
||||||
materials:
|
materials:
|
||||||
Cloth: 200
|
Steel: 200
|
||||||
|
# TODO: Need better sources of cloth as otherwise these will never get made.
|
||||||
|
# Cloth: 200
|
||||||
|
|
||||||
- type: latheRecipe
|
- type: latheRecipe
|
||||||
id: FultonBeacon
|
id: FultonBeacon
|
||||||
|
|||||||
Reference in New Issue
Block a user