Skip to content

Commit

Permalink
healing pod comp, suffix tweak
Browse files Browse the repository at this point in the history
  • Loading branch information
SkaldetSkaeg committed Nov 27, 2024
1 parent df7a2da commit f1bcef6
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Content.Server/SS220/CultYogg/Pod/CultYoggPodSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ private void GotRemoved(Entity<CultYoggPodComponent> ent, ref EntRemovedFromCont

private void GotInserted(Entity<CultYoggPodComponent> ent, ref EntInsertedIntoContainerMessage args)
{
EnsureComp<CultYoggHealComponent>(args.Entity);
var healComp = EnsureComp<CultYoggHealComponent>(args.Entity); //applying heal from MiGo
healComp.TimeBetweenIncidents = ent.Comp.HealingFreq;
_appearance.SetData(ent, CultYoggPodComponent.CultPodVisuals.Inserted, true);
}
}
3 changes: 3 additions & 0 deletions Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -373,13 +373,16 @@ public void DeMakeCultist(EntityUid uid, CultYoggRuleComponent component)
#region Anounce
private void SendCultAnounce(ref CultYoggAnouncementEvent args)
{
//ToDo refactor without spam
/*
GetCultGameRule(out var comp);
if (comp == null)
return;
var ev = new TelepathyAnnouncementSendEvent(args.Message, comp.TelepathyChannel);
RaiseLocalEvent(ref ev);
*/
}
#endregion

Expand Down
5 changes: 5 additions & 0 deletions Content.Shared/SS220/CultYogg/Pod/CultYoggPodComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ namespace Content.Shared.SS220.CultYogg.Pod;
[RegisterComponent]
public sealed partial class CultYoggPodComponent : Component
{
/// <summary>
/// Time between each healing incident
/// </summary>
[DataField]
public float HealingFreq = 0.5f;
public ContainerSlot MobContainer = default!;

[Serializable, NetSerializable]
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/SS220/CultYogg/burglarbug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
description: An insect-like device that breaks open the selected door after activation.
parent: BaseItem
id: BurglarBugCultYogg
suffix: CultYogg
components:
- type: Sprite
sprite: SS220/Objects/CultYogg/burglarbug.rsi
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/SS220/CultYogg/spikegun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name: spikegun cult yogg
parent: BaseItem
id: SpikegunCultYogg
suffix: CultYogg
components:
- type: AmmoCounter
- type: Gun
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitCultYogg
suffix: CultYogg
name: Hardsuit corrupted by a Cult
description: Corrupted pile of incomprehensible substane, somehowe prowiding great defence.
components:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
- type: entity
parent: SheetMetalBase
id: SheetTokl
suffix: CultYogg
name: tokl
suffix: Full
description: A sheet of corrupted metal interspersed with mold and mushrooms. It is slimy and pulsating.
Expand Down Expand Up @@ -37,7 +36,6 @@
- type: entity
parent: SheetTokl
id: SheetTokl10
suffix: CultYogg
name: tokl
suffix: 10
components:
Expand All @@ -50,7 +48,6 @@
- type: entity
parent: SheetTokl
id: SheetTokl1
suffix: CultYogg
name: tokl
suffix: Single
components:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- type: entity
abstract: true
id: CableBaseLive
suffix: CultYogg
placement:
mode: SnapgridCenter
components:
Expand Down Expand Up @@ -51,6 +52,7 @@
- type: entity
parent: CableBase
id: CableHVLive
suffix: CultYogg
name: live roots (HV)
description: Corrupted high-voltage cable, covered with slime and strange roots, pulsates.
components:
Expand Down Expand Up @@ -101,6 +103,7 @@
- type: entity
parent: CableBase
id: CableMVLive
suffix: CultYogg
name: live roots (MV)
description: Corrupted medium-voltage cable, covered with slime and strange roots, pulsates.
components:
Expand Down Expand Up @@ -145,6 +148,7 @@
- type: entity
parent: CableBase
id: CableApcExtensionLive
suffix: CultYogg
name: live roots (LV)
description: Corrupted low-voltage cable, covered with slime and strange roots, pulsates. #APCs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future.
components:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
acts: [ "Destruction" ]
- !type:EmptyAllContainersBehaviour
- type: CultYoggPod
healingFreq: 0.5
- type: CultYoggBuilding
eraseTime: 5
spawnOnErase:
Expand Down

0 comments on commit f1bcef6

Please sign in to comment.