-
Notifications
You must be signed in to change notification settings - Fork 360
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
Felinid changes. #666
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
a149fc5
Felinid changes.
Adrian16199 cf7d300
Just slappin it together
Adrian16199 80538fb
Somethin somethin
Adrian16199 9866365
Merge branch 'master' into Felinid_rework
Adrian16199 866a14d
just makin this less messy.... I guess
Adrian16199 dcdc5bc
Just tell me somethin.
Adrian16199 257c2dd
.
Adrian16199 d0a923d
cleaning....
Adrian16199 5fcd25a
Makes it work. Yey.
Adrian16199 c04fa55
just a small change tbh.
Adrian16199 3924fd2
okay maybe just a bit.
Adrian16199 d6c3ec6
Hm, maybe....
Adrian16199 8fcbd24
This feels bit better.
Adrian16199 9e640f0
Merge branch 'master' into Felinid_rework
Adrian16199 264b261
Merge branch 'master' into Felinid_rework
Adrian16199 d337e41
hopefully fixes yaml linter
Adrian16199 b29b887
Merge branch 'master' into Felinid_rework
Adrian16199 4d013cb
Merge branch 'master' into Felinid_rework
Adrian16199 18e21d4
Merge branch 'master' into Felinid_rework
Adrian16199 5b3b45c
Update Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid…
Adrian16199 b91b2af
Doin the changes.
Adrian16199 5deacf0
Merge branch 'master' into Felinid_rework
Adrian16199 91d72d6
Merge branch 'master' into Felinid_rework
Adrian16199 0493981
Merge branch 'master' into Felinid_rework
Adrian16199 29a7fab
Renaming.
Adrian16199 5c26124
Renaming notes.
Adrian16199 cbd2c38
Merge branch 'master' into Felinid_rework
Adrian16199 8fc6e41
Merge branch 'master' into Felinid_rework
Adrian16199 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
Content.Shared/DeltaV/StepTrigger/Systems/SoftPawsSystem.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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")); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,3 +35,6 @@ | |
|
||
- type: Tag | ||
id: Wheat | ||
|
||
- type: Tag | ||
id: SoftPaws |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
blessed pr