-
Notifications
You must be signed in to change notification settings - Fork 282
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Deep_frier
- Loading branch information
Showing
57 changed files
with
629 additions
and
82 deletions.
There are no files selected for viewing
8 changes: 8 additions & 0 deletions
8
Content.Server/Nyanotrasen/Abilities/Oni/HeldbyOniComponent.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,8 @@ | ||
namespace Content.Server.Abilities.Oni | ||
{ | ||
[RegisterComponent] | ||
public sealed partial class HeldByOniComponent : Component | ||
{ | ||
public EntityUid Holder = default!; | ||
} | ||
} |
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,14 @@ | ||
using Content.Shared.Damage; | ||
|
||
namespace Content.Server.Abilities.Oni | ||
{ | ||
[RegisterComponent] | ||
public sealed partial class OniComponent : Component | ||
{ | ||
[DataField("modifiers", required: true)] | ||
public DamageModifierSet MeleeModifiers = default!; | ||
|
||
[DataField("stamDamageBonus")] | ||
public float StamDamageMultiplier = 1.25f; | ||
} | ||
} |
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,76 @@ | ||
using Content.Server.Tools; | ||
using Content.Shared.Tools.Components; | ||
using Content.Shared.Damage.Events; | ||
using Content.Shared.Weapons.Melee.Events; | ||
using Content.Shared.Weapons.Ranged.Components; | ||
using Robust.Shared.Containers; | ||
|
||
namespace Content.Server.Abilities.Oni | ||
{ | ||
public sealed class OniSystem : EntitySystem | ||
{ | ||
[Dependency] private readonly ToolSystem _toolSystem = default!; | ||
|
||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
SubscribeLocalEvent<OniComponent, EntInsertedIntoContainerMessage>(OnEntInserted); | ||
SubscribeLocalEvent<OniComponent, EntRemovedFromContainerMessage>(OnEntRemoved); | ||
SubscribeLocalEvent<OniComponent, MeleeHitEvent>(OnOniMeleeHit); | ||
SubscribeLocalEvent<HeldByOniComponent, MeleeHitEvent>(OnHeldMeleeHit); | ||
SubscribeLocalEvent<HeldByOniComponent, StaminaMeleeHitEvent>(OnStamHit); | ||
} | ||
|
||
private void OnEntInserted(EntityUid uid, OniComponent component, EntInsertedIntoContainerMessage args) | ||
{ | ||
var heldComp = EnsureComp<HeldByOniComponent>(args.Entity); | ||
heldComp.Holder = uid; | ||
|
||
if (TryComp<ToolComponent>(args.Entity, out var tool) && _toolSystem.HasQuality(args.Entity, "Prying", tool)) | ||
tool.SpeedModifier *= 1.66f; | ||
|
||
if (TryComp<GunComponent>(args.Entity, out var gun)) | ||
{ | ||
gun.MinAngle *= 15f; | ||
gun.AngleIncrease *= 15f; | ||
gun.MaxAngle *= 15f; | ||
} | ||
} | ||
|
||
private void OnEntRemoved(EntityUid uid, OniComponent component, EntRemovedFromContainerMessage args) | ||
{ | ||
if (TryComp<ToolComponent>(args.Entity, out var tool) && _toolSystem.HasQuality(args.Entity, "Prying", tool)) | ||
tool.SpeedModifier /= 1.66f; | ||
|
||
if (TryComp<GunComponent>(args.Entity, out var gun)) | ||
{ | ||
gun.MinAngle /= 15f; | ||
gun.AngleIncrease /= 15f; | ||
gun.MaxAngle /= 15f; | ||
} | ||
|
||
RemComp<HeldByOniComponent>(args.Entity); | ||
} | ||
|
||
private void OnOniMeleeHit(EntityUid uid, OniComponent component, MeleeHitEvent args) | ||
{ | ||
args.ModifiersList.Add(component.MeleeModifiers); | ||
} | ||
|
||
private void OnHeldMeleeHit(EntityUid uid, HeldByOniComponent component, MeleeHitEvent args) | ||
{ | ||
if (!TryComp<OniComponent>(component.Holder, out var oni)) | ||
return; | ||
|
||
args.ModifiersList.Add(oni.MeleeModifiers); | ||
} | ||
|
||
private void OnStamHit(EntityUid uid, HeldByOniComponent component, StaminaMeleeHitEvent args) | ||
{ | ||
if (!TryComp<OniComponent>(component.Holder, out var oni)) | ||
return; | ||
|
||
args.Multiplier *= oni.StamDamageMultiplier; | ||
} | ||
} | ||
} |
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
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
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
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
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
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 @@ | ||
oni-gun-fire = You can't fire guns! |
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,7 @@ | ||
marking-OniHornSingleCurved = Single Curved | ||
marking-OniHornSingleLeftCurved =Single Left Curved | ||
marking-OniHornSingleRightCurved = Single Right Curved | ||
marking-OniHornDoubleCurvedOutwards = Double Curved Outwards | ||
marking-OniHornDoubleCurved = Double Curved | ||
marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved | ||
marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved |
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 @@ | ||
namepreset-lastnofirst = {$last}-no-{$first} |
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 |
---|---|---|
@@ -1 +1,2 @@ | ||
species-name-oni = Oni | ||
species-name-felinid = Felinid |
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
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
19 changes: 19 additions & 0 deletions
19
Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.yml
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,19 @@ | ||
- type: entity | ||
parent: PosterBase | ||
id: PosterLegitFuckAround | ||
name: Fuck Around... | ||
description: ...and find out. Sponsored by the Intergalactic Bartenders' Federation, Delta branch. | ||
components: | ||
- type: Sprite | ||
sprite: DeltaV/Structures/Wallmounts/Posters/TJohnson.rsi | ||
state: fuckaround | ||
|
||
- type: entity | ||
parent: PosterBase | ||
id: PosterContrabandGotWood | ||
name: "Got Wood?" | ||
description: "A grimy old advert for a seedy lumber company. \"You got a friend in me.\" is scrawled in the corner." | ||
components: | ||
- type: Sprite | ||
sprite: DeltaV/Structures/Wallmounts/Posters/misc.rsi | ||
state: woodygotwood |
9 changes: 0 additions & 9 deletions
9
Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/posters.yml
This file was deleted.
Oops, something went wrong.
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
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
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.