Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chitinid (DeltaV #2707) #2774

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
288e144
Ants
dvir001 Jan 23, 2025
4eabf91
Merge branch 'master' into 2025-01-24-AntsTheMovie-TheGame
dvir001 Jan 23, 2025
ad0c12e
Move FTL to _DV
dvir001 Jan 23, 2025
2c57687
Merge branch '2025-01-24-AntsTheMovie-TheGame' of https://github.com/…
dvir001 Jan 23, 2025
457775f
Missing comments
dvir001 Jan 23, 2025
0c2b732
Update chitinid.yml
dvir001 Jan 23, 2025
bebf670
Update chitinid.yml
dvir001 Jan 23, 2025
acc2971
Update chitinid.yml
dvir001 Jan 23, 2025
8cb3910
Update chitinid.yml
dvir001 Jan 23, 2025
f69d459
Merge branch 'master' into 2025-01-24-AntsTheMovie-TheGame
dvir001 Jan 24, 2025
8a0a157
refactor felinid/chitinid item coughing (#2790)
deltanedas Jan 23, 2025
a33a474
BALD
dvir001 Jan 24, 2025
632a3ad
Merge branch 'master' into 2025-01-24-AntsTheMovie-TheGame
dvir001 Jan 24, 2025
c3bc700
The Eye Of Magnus
dvir001 Jan 24, 2025
27a8928
Merge branch 'master' into 2025-01-24-AntsTheMovie-TheGame
dvir001 Jan 24, 2025
48cdb57
Merge branch 'master' into 2025-01-24-AntsTheMovie-TheGame
dvir001 Jan 24, 2025
17c7be6
Update species_weights.yml
dvir001 Jan 24, 2025
c8bd885
Chitinid Minor Update (Bug Fix + Resistance updates + Guidebook upda…
ElusiveCoin Jan 25, 2025
21800d3
Bug fix, get it? bug! ah ah
dvir001 Jan 25, 2025
04f1710
Merge branch 'master' into 2025-01-24-AntsTheMovie-TheGame
dvir001 Jan 25, 2025
fad12c1
Update chitinid.yml
dvir001 Jan 26, 2025
2964f53
Update chitinid.yml
dvir001 Jan 26, 2025
ad7ecfc
Merge branch 'master' into 2025-01-24-AntsTheMovie-TheGame
dvir001 Feb 2, 2025
074d7b5
Merge branch 'master' into 2025-01-24-AntsTheMovie-TheGame
dvir001 Feb 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Content.Client/_DV/Abilities/Felinid/FelinidSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
using Content.Shared._DV.Abilities.Felinid;

namespace Content.Shared._DV.Abilities.Felinid;

public sealed class FelinidSystem : SharedFelinidSystem;
10 changes: 10 additions & 0 deletions Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Content.Server.Body.Components;
using Content.Server.Body.Systems;
using Content.Shared._DV.Chemistry.Components; // DeltaV
using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Components.SolutionManager;
Expand Down Expand Up @@ -109,6 +110,12 @@ private void OnInjectorAfterInteract(Entity<InjectorComponent> entity, ref After
/// </summary>
private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
{
if (HasComp<BlockInjectionComponent>(target)) // DeltaV
{
Popup.PopupEntity(Loc.GetString("injector-component-deny-user"), target, user);
return;
}

// Create a pop-up for the user
if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
{
Expand Down Expand Up @@ -254,6 +261,9 @@ private bool TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity
private bool TryInject(Entity<InjectorComponent> injector, EntityUid targetEntity,
Entity<SolutionComponent> targetSolution, EntityUid user, bool asRefill)
{
if (HasComp<BlockInjectionComponent>(targetEntity)) // DeltaV
return false;

if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var soln,
out var solution) || solution.Volume == 0)
return false;
Expand Down

This file was deleted.

36 changes: 0 additions & 36 deletions Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs

This file was deleted.

This file was deleted.

202 changes: 0 additions & 202 deletions Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs

This file was deleted.

This file was deleted.

43 changes: 43 additions & 0 deletions Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;

namespace Content.Server._DV.Abilities.Chitinid;

/// <summary>
/// Passively heals radiation up to a limit, which then uses <c>ItemCougherComponent</c> to cough up Chitzite.
/// After that it will heal radiation damage again.
/// </summary>
[RegisterComponent, Access(typeof(ChitinidSystem))]
[AutoGenerateComponentPause]
public sealed partial class ChitinidComponent : Component
{
[DataField]
public FixedPoint2 AmountAbsorbed = 0f;

/// <summary>
/// Once this much damage is absorbed, it will stop healing and require you to cough up chitzite.
/// </summary>
[DataField]
public FixedPoint2 MaximumAbsorbed = 30f;

/// <summary>
/// What damage is healed, by adding, every <see cref="UpdateInterval"/>.
/// This must be negative.
/// </summary>
[DataField]
public DamageSpecifier Healing = new()
{
DamageDict = new()
{
{ "Radiation", -0.5 },
}
};

[DataField]
public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);

[DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
[AutoPausedField]
public TimeSpan NextUpdate;
}
Loading
Loading