Skip to content

Commit

Permalink
Locale & fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Kai518 committed May 19, 2024
1 parent 84f4cc6 commit 683b136
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
1 change: 1 addition & 0 deletions Content.Server/Aliens/Systems/AlienInfectedSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public override void Update(float frameTime)
var larva = Spawn(infected.Prototype, Transform(uid).Coordinates);
_container.Insert(larva, infected.Stomach);
infected.SpawnedLarva = larva;
infected.GrowthStage++;
}

if (_random.Prob(infected.GrowProb))
Expand Down
4 changes: 2 additions & 2 deletions Content.Shared/Aliens/Systems/SharedFacehuggerSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ public override void Update(float frameTime)

if (invalidEntities.ContainsKey(entity.Key))
continue;
_inventory.TryUnequip(entity.Value, "mask");
_inventory.TryEquip(entity.Value, entity.Key, "mask");
_inventory.TryUnequip(entity.Value, "mask", true);
_inventory.TryEquip(entity.Value, entity.Key, "mask", true);


}
Expand Down
9 changes: 7 additions & 2 deletions Content.Shared/Aliens/Systems/SharedPlasmaTransferSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ private void OnCompInit(EntityUid uid, PlasmaTransferComponent comp, ComponentSt

public void OnPlasmaTransfer(EntityUid uid, PlasmaTransferComponent component, TransferPlasmaActionEvent args)
{
if (args.Handled)
{
return;
}

args.Handled = true;
if (!HasComp<PlasmaVesselComponent>(args.Target))
{
_popup.PopupEntity(Loc.GetString("alien-transfer-fail"), uid);
Expand All @@ -50,11 +56,10 @@ public void OnPlasmaTransfer(EntityUid uid, PlasmaTransferComponent component, T
{
_popup.PopupEntity(Loc.GetString("alien-transfer-fail"), uid);
}

}

/// <summary>
/// Takeths away the action to preform making acid from the entity.
/// Takeths away the action to preform plasma transfer from the entity.
/// </summary>
private void OnCompRemove(EntityUid uid, PlasmaTransferComponent comp, ComponentShutdown args)
{
Expand Down
7 changes: 6 additions & 1 deletion Resources/Locale/en-US/abilities/alien.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ action-tail-lash-desc = Stun nearby enemies with your tail.
action-transfer-plasma-alien = Transfer plasma
action-transfer-plasma-alien-desc = Transfer 50 plasma to nearby sister.
alien-left-plasma = You have {$value} left for use.
alien-plasma-left = You have {$value} left for use.
alien-create-structure-failed = You can't create structure here.
alien-action-fail-plasma = You don't have enough plasma to make this.
Expand All @@ -67,3 +67,8 @@ action-alien-jump-desc = Leap onto your enemies stunning them.
alien-evolution-fail = There is a royal xenomorph alreagy.
alerts-promotion-fail = This daughter is already a royal xenomorph.
alien-transfer-fail = You can't transfer plasma here now.
action-create-alien-nest-name = Create nest
action-create-alien-nest-desc = Create nest that holds your preys for a long time.

0 comments on commit 683b136

Please sign in to comment.