-
Notifications
You must be signed in to change notification settings - Fork 156
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
No vocal emotes when muzzled #1101
Changes from 4 commits
2a46a26
64d5d31
7c3875b
c9ea0e6
42bde22
04db4c7
f8a2b58
22eb010
5165373
d082d32
618d233
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
DexlerXD marked this conversation as resolved.
Show resolved
Hide resolved
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt | ||
using Content.Shared.SS220.Muzzle; | ||
|
||
namespace Content.Server.SS220.Muzzle; | ||
public sealed class MuzzleSystem : SharedMuzzleSystem | ||
{ | ||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,14 @@ | ||||||
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt | ||||||
using Robust.Shared.GameStates; | ||||||
using Robust.Shared.Prototypes; | ||||||
|
||||||
namespace Content.Shared.SS220.Muzzle; | ||||||
|
||||||
[RegisterComponent, NetworkedComponent()] | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
[Access(typeof(SharedMuzzleSystem))] | ||||||
/// <summary> | ||||||
/// Added to entities when they have to block entityes vocal emotions | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
/// </summary> | ||||||
public sealed partial class MuzzleComponent : Component | ||||||
{ | ||||||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,13 @@ | ||||||
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt | ||||||
using Robust.Shared.GameStates; | ||||||
using Robust.Shared.Prototypes; | ||||||
|
||||||
namespace Content.Shared.SS220.Muzzle; | ||||||
|
||||||
[RegisterComponent, NetworkedComponent()] | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
/// <summary> | ||||||
/// Added to entities when if entity should have blocked vocal emotions | ||||||
/// </summary> | ||||||
public sealed partial class MuzzledComponent : Component | ||||||
{ | ||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt | ||
using Content.Shared.Clothing; | ||
|
||
namespace Content.Shared.SS220.Muzzle; | ||
|
||
public abstract class SharedMuzzleSystem : EntitySystem | ||
{ | ||
[Dependency] private readonly IEntityManager _entityManager = default!; | ||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
|
||
SubscribeLocalEvent<MuzzleComponent, ClothingGotEquippedEvent>(OnGotEquipped); | ||
SubscribeLocalEvent<MuzzleComponent, ClothingGotUnequippedEvent>(OnGotUnequipped); | ||
} | ||
|
||
private void OnGotUnequipped(EntityUid uid, MuzzleComponent component, ref ClothingGotUnequippedEvent args) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. по новой форме обработки ивентов оформь
|
||
{ | ||
_entityManager.RemoveComponent<MuzzledComponent>(args.Wearer); | ||
} | ||
|
||
private void OnGotEquipped(EntityUid uid, MuzzleComponent component, ref ClothingGotEquippedEvent args) | ||
{ | ||
_entityManager.AddComponent<MuzzledComponent>(args.Wearer); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
#Нужно для генерации эмоций во сне | ||
- type: dataset | ||
id: SleepingEmotesSS220 | ||
values: | ||
- ворчит | ||
- бормочет | ||
- ворочается | ||
- подергивается | ||
- строит физиономии | ||
- активно жестикулирует | ||
- морщится |
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.
на это пометки можно не ставить