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

Felinid changes. #666

Merged
merged 28 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a149fc5
Felinid changes.
Adrian16199 Jan 12, 2024
cf7d300
Just slappin it together
Adrian16199 Jan 14, 2024
80538fb
Somethin somethin
Adrian16199 Jan 15, 2024
9866365
Merge branch 'master' into Felinid_rework
Adrian16199 Jan 15, 2024
866a14d
just makin this less messy.... I guess
Adrian16199 Jan 16, 2024
dcdc5bc
Just tell me somethin.
Adrian16199 Jan 16, 2024
257c2dd
.
Adrian16199 Jan 16, 2024
d0a923d
cleaning....
Adrian16199 Jan 16, 2024
5fcd25a
Makes it work. Yey.
Adrian16199 Jan 16, 2024
c04fa55
just a small change tbh.
Adrian16199 Jan 17, 2024
3924fd2
okay maybe just a bit.
Adrian16199 Jan 17, 2024
d6c3ec6
Hm, maybe....
Adrian16199 Jan 17, 2024
8fcbd24
This feels bit better.
Adrian16199 Jan 17, 2024
9e640f0
Merge branch 'master' into Felinid_rework
Adrian16199 Jan 18, 2024
264b261
Merge branch 'master' into Felinid_rework
Adrian16199 Jan 22, 2024
d337e41
hopefully fixes yaml linter
Adrian16199 Jan 22, 2024
b29b887
Merge branch 'master' into Felinid_rework
Adrian16199 Jan 26, 2024
4d013cb
Merge branch 'master' into Felinid_rework
Adrian16199 Jan 28, 2024
18e21d4
Merge branch 'master' into Felinid_rework
Adrian16199 Jan 28, 2024
5b3b45c
Update Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid…
Adrian16199 Feb 1, 2024
b91b2af
Doin the changes.
Adrian16199 Feb 1, 2024
5deacf0
Merge branch 'master' into Felinid_rework
Adrian16199 Feb 1, 2024
91d72d6
Merge branch 'master' into Felinid_rework
Adrian16199 Feb 1, 2024
0493981
Merge branch 'master' into Felinid_rework
Adrian16199 Feb 5, 2024
29a7fab
Renaming.
Adrian16199 Feb 5, 2024
5c26124
Renaming notes.
Adrian16199 Feb 5, 2024
cbd2c38
Merge branch 'master' into Felinid_rework
Adrian16199 Feb 12, 2024
8fc6e41
Merge branch 'master' into Felinid_rework
Adrian16199 Feb 12, 2024
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
36 changes: 36 additions & 0 deletions Content.Shared/DeltaV/StepTrigger/Systems/SoftPawsSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using Content.Shared.Examine;
using Content.Shared.Inventory;
using Content.Shared.StepTrigger.Components;
using Content.Shared.Tag;

namespace Content.Shared.StepTrigger.Systems;

public sealed class SoftPawsSystem : EntitySystem
{
[Dependency] private readonly InventorySystem _inventory = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;

/// <inheritdoc/>
public override void Initialize()
{
SubscribeLocalEvent<ShoesRequiredStepTriggerComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
SubscribeLocalEvent<ShoesRequiredStepTriggerComponent, ExaminedEvent>(OnExamined);
}

private void OnStepTriggerAttempt(EntityUid uid, ShoesRequiredStepTriggerComponent component, ref StepTriggerAttemptEvent args)
{
if (TryComp<InventoryComponent>(args.Tripper, out var inventory))
{
if (_tagSystem.HasTag(args.Tripper, "SoftPaws") && !_inventory.TryGetSlotEntity(args.Tripper, "shoes", out _, inventory))
{
args.Cancelled = true;
return;
}
}
}

private void OnExamined(EntityUid uid, ShoesRequiredStepTriggerComponent component, ExaminedEvent args)
{
args.PushMarkup(Loc.GetString("shoes-required-step-trigger-examine"));
}
}
3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@

- type: Tag
id: Wheat

- type: Tag
id: SoftPaws
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
# - type: DiseaseCarrier
# naturalImmunities:
# - OwOnavirus
- type: Thieving
stealthy: true
stripTimeReduction: 1
#- type: Thieving # FUCKIN KILL.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blessed pr

# stealthy: true
# stripTimeReduction: 1
Adrian16199 marked this conversation as resolved.
Show resolved Hide resolved
- type: Speech
speechSounds: Alto
- type: DamageOnHighSpeedImpact
Expand All @@ -55,6 +55,9 @@
Female: FemaleFelinid
Unsexed: MaleFelinid
- type: Felinid
- type: Tag
tags:
- SoftPaws

- type: entity
save: false
Expand Down
Loading