forked from space-syndicate/space-station-14
[April Fools] Vox box (#35355)
* April Fools: Vox Box * hey, you, reader: you're awesome and I hope you know it * Webedit my beloved
This commit is contained in:
committed by
GitHub
parent
df73c5969b
commit
2cb1f613e8
10
Content.Shared/Damage/Components/BoxingComponent.cs
Normal file
10
Content.Shared/Damage/Components/BoxingComponent.cs
Normal file
@@ -0,0 +1,10 @@
|
||||
using Robust.Shared.Audio;
|
||||
|
||||
namespace Content.Shared.Damage.Components;
|
||||
|
||||
[RegisterComponent]
|
||||
public sealed partial class BoxingComponent : Component
|
||||
{
|
||||
[DataField]
|
||||
public SoundSpecifier? Sound;
|
||||
}
|
||||
@@ -11,6 +11,7 @@ using Content.Shared.Popups;
|
||||
using Content.Shared.Projectiles;
|
||||
using Content.Shared.Rejuvenate;
|
||||
using Content.Shared.Rounding;
|
||||
using Content.Shared.Standing;
|
||||
using Content.Shared.Stunnable;
|
||||
using Content.Shared.Throwing;
|
||||
using Content.Shared.Weapons.Melee.Events;
|
||||
@@ -58,6 +59,7 @@ public sealed partial class StaminaSystem : EntitySystem
|
||||
SubscribeLocalEvent<StaminaDamageOnCollideComponent, ThrowDoHitEvent>(OnThrowHit);
|
||||
|
||||
SubscribeLocalEvent<StaminaDamageOnHitComponent, MeleeHitEvent>(OnMeleeHit);
|
||||
SubscribeLocalEvent<BoxingComponent, DownedEvent>(OnFallOver);
|
||||
}
|
||||
|
||||
private void OnStamHandleState(EntityUid uid, StaminaComponent component, ref AfterAutoHandleStateEvent args)
|
||||
@@ -172,6 +174,13 @@ public sealed partial class StaminaSystem : EntitySystem
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void OnFallOver(EntityUid uid, BoxingComponent component, DownedEvent args)
|
||||
{
|
||||
if (_net.IsServer)
|
||||
_audio.PlayPvs(component.Sound, uid);
|
||||
}
|
||||
|
||||
private void OnProjectileHit(EntityUid uid, StaminaDamageOnCollideComponent component, ref ProjectileHitEvent args)
|
||||
{
|
||||
OnCollide(uid, component, args.Target);
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
sprite: Clothing/Hands/Gloves/Boxing/boxingred.rsi
|
||||
- type: StaminaDamageOnHit
|
||||
damage: 8 #Stam damage values seem a bit higher than regular damage because of the decay, etc
|
||||
# This needs to be moved to boxinggloves
|
||||
#knockdownSound: /Audio/Weapons/boxingbell.ogg
|
||||
- type: MeleeWeapon
|
||||
attackRate: 1.5
|
||||
damage:
|
||||
@@ -46,6 +44,30 @@
|
||||
fiberColor: fibers-blue
|
||||
- type: FingerprintMask
|
||||
|
||||
# April Fools: Vox boxing gloves, given to all Vox. A bit dangerous.
|
||||
- type: entity
|
||||
parent: ClothingHandsGlovesBoxingRed
|
||||
id: ClothingHandsGlovesBoxingVox
|
||||
name: vox boxing gloves
|
||||
description: These pack a punch! They'll never make you eat lunch in the maints again! SCRAWWWW!!
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Clothing/Hands/Gloves/Boxing/boxingblue.rsi
|
||||
state: icon
|
||||
- type: Clothing
|
||||
sprite: Clothing/Hands/Gloves/Boxing/boxingblue.rsi
|
||||
- type: Fiber
|
||||
fiberMaterial: fibers-leather
|
||||
fiberColor: fibers-blue
|
||||
- type: FingerprintMask
|
||||
- type: MeleeWeapon
|
||||
attackRate: 2
|
||||
animation: WeaponArcBox
|
||||
damage:
|
||||
types:
|
||||
Blunt: 6 # Double Vox unarmed attack
|
||||
mustBeEquippedToUse: true
|
||||
|
||||
- type: entity
|
||||
parent: ClothingHandsGlovesBoxingRed
|
||||
id: ClothingHandsGlovesBoxingGreen
|
||||
|
||||
@@ -92,6 +92,15 @@
|
||||
- type: Sprite
|
||||
state: fist
|
||||
|
||||
# April Fools: a boxing effect for when Vox hit things unarmed.
|
||||
- type: entity
|
||||
id: WeaponArcBox
|
||||
parent: WeaponArcStatic
|
||||
categories: [ HideSpawnMenu ]
|
||||
components:
|
||||
- type: Sprite
|
||||
state: box
|
||||
|
||||
- type: entity
|
||||
id: WeaponArcPunch
|
||||
parent: WeaponArcStatic
|
||||
|
||||
@@ -1232,8 +1232,9 @@
|
||||
needsHands: false
|
||||
- type: StaminaDamageOnHit
|
||||
damage: 8 #Stam damage values seem a bit higher than regular damage because of the decay, etc
|
||||
# This needs to be moved to boxinggloves
|
||||
#knockdownSound: /Audio/Weapons/boxingbell.ogg
|
||||
# April Fools - re-add boxing bell sfx
|
||||
- type: Boxing
|
||||
sound: /Audio/Weapons/boxingbell.ogg
|
||||
- type: MeleeWeapon
|
||||
attackRate: 1.5
|
||||
damage:
|
||||
|
||||
@@ -55,14 +55,19 @@
|
||||
sprite: Mobs/Effects/burn_damage.rsi
|
||||
- type: Bloodstream
|
||||
bloodReagent: AmmoniaBlood
|
||||
# April Fools: Vox box, even bare-handed.
|
||||
- type: MeleeWeapon
|
||||
attackRate: 2
|
||||
soundHit:
|
||||
collection: AlienClaw
|
||||
collection: BoxingHit
|
||||
angle: 30
|
||||
animation: WeaponArcClaw
|
||||
animation: WeaponArcBox
|
||||
damage:
|
||||
types:
|
||||
Slash: 5 # Reduce?
|
||||
Blunt: 3 # This is technically 20% more than other species but it's not a huge deal.
|
||||
# April Fools: Vox make a boxing bell sound effect when falling over
|
||||
- type: Boxing
|
||||
sound: /Audio/Weapons/boxingbell.ogg
|
||||
- type: Sprite # Need to redefine the whole order to draw the tail over their gas tank
|
||||
layers:
|
||||
- map: [ "enum.HumanoidVisualLayers.Chest" ]
|
||||
|
||||
@@ -170,6 +170,10 @@
|
||||
proto: EffectSpeciesVox
|
||||
equipment:
|
||||
suitstorage: NitrogenTankFilled
|
||||
# April Fools: Vox all get special boxing gloves.
|
||||
storage:
|
||||
back:
|
||||
- ClothingHandsGlovesBoxingVox
|
||||
|
||||
# Full EVA Tank, Any Species
|
||||
- type: loadout
|
||||
|
||||
BIN
Resources/Textures/Effects/arcs.rsi/box.png
Normal file
BIN
Resources/Textures/Effects/arcs.rsi/box.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 723 B |
@@ -5,7 +5,7 @@
|
||||
"y": 32
|
||||
},
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from https://github.com/tgstation/tgstation/raw/c545428822f1ee0d402b812221518632dbe198cb/icons/effects/effects.dmi with offsets modified",
|
||||
"copyright": "Taken from https://github.com/tgstation/tgstation/raw/c545428822f1ee0d402b812221518632dbe198cb/icons/effects/effects.dmi with offsets modified, 'box' sprite hacked with <3 by FairlySadPanda, sourced from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
|
||||
"states": [
|
||||
{
|
||||
"name": "bite",
|
||||
@@ -79,6 +79,9 @@
|
||||
},
|
||||
{
|
||||
"name": "fist"
|
||||
},
|
||||
{
|
||||
"name": "box"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user