Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions Content.Shared/Movement/Systems/SharedMoverController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Numerics;
using Content.Shared._DEN.Movement.Components;
using Content.Shared.ActionBlocker;
using Content.Shared.CCVar;
using Content.Shared.Friction;
Expand Down Expand Up @@ -48,6 +49,7 @@ public abstract partial class SharedMoverController : VirtualController
[Dependency] private SharedTransformSystem _transform = default!;
[Dependency] private TagSystem _tags = default!;

[Dependency] protected EntityQuery<BarestepModifierComponent> BarestepModifierQuery = default!; // DEN - Barestep sounds
[Dependency] protected EntityQuery<CanMoveInAirComponent> CanMoveInAirQuery = default!;
[Dependency] protected EntityQuery<FootstepModifierComponent> FootstepModifierQuery = default!;
[Dependency] protected EntityQuery<FTLComponent> FTLQuery = default!;
Expand Down Expand Up @@ -552,6 +554,14 @@ private bool TryGetSound(
return sound != null;
}

// DEN start: Barestep modifiers for shoeless walking
if (shoes == null && BarestepModifierQuery.TryComp(uid, out var barestepModifier))
{
sound = barestepModifier.FootstepSoundCollection;
return sound != null;
}
// DEN end

return TryGetFootstepSound(uid, xform, shoes != null, out sound, tileDef: tileDef);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Robust.Shared.Audio;
using Robust.Shared.GameStates;

namespace Content.Shared._DEN.Movement.Components;

/// <summary>
/// Changes footstep sounds ONLY when this entity is not wearing shoes.
/// </summary>
/// <remarks>
/// This is similar to FootstepModifierComponent.
/// </remarks>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
public sealed partial class BarestepModifierComponent : Component
{
[DataField, AutoNetworkedField]
public SoundSpecifier? FootstepSoundCollection;
}
9 changes: 8 additions & 1 deletion Resources/Locale/en-US/_DEN/chat/managers/chat-manager.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,11 @@ chat-manager-entity-subtle-wrap-message = [italic]{ PROPER($entity) ->
[true] {CAPITALIZE($entityName)} {$message}[/italic]
}

chat-manager-entity-subtle-ooc-wrap-message = [italic](OOC) {$entityName} {$message}[/italic]
chat-manager-entity-subtle-ooc-wrap-message = [italic](OOC) {$entityName} {$message}[/italic]

# speech verbs

chat-speech-verb-name-tajaran = Tajaran
chat-speech-verb-tajaran-1 = meows
chat-speech-verb-tajaran-2 = mews
chat-speech-verb-tajaran-3 = purrs
77 changes: 77 additions & 0 deletions Resources/Locale/en-US/_DEN/markings/tajaran.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Ears

marking-TajaranEarsRetro = Tajaran Ears
marking-TajaranEarsRetro-ears = Ear

marking-TajaranEarsRetroNear = Tajaran Ears, Near
marking-TajaranEarsRetro-ears_near = Ear

marking-TajaranEarsSeparate = Tajaran Ears, Separated
marking-TajaranEarsSeparate-outears = Outer ear
marking-TajaranEarsSeparate-inears = Inner ear

marking-TajaranEarsSeparateNear = Tajaran Ears, Separated, Near
marking-TajaranEarsSeparateNear-outears_near = Outer ear
marking-TajaranEarsSeparateNear-inears_near = Inner ear

# Tails

marking-TajaranTailRetro = Tajaran Tail
marking-TajaranTailRetro-tail = Tail

marking-TajaranTailRetroRings = Tajaran Tail, Rings
marking-TajaranTailRetroRings-tail = Tail
marking-TajaranTailRetroRings-tail_rings = Rings

marking-TajaranTailLeopard = Leopard Tail
marking-TajaranTailLeopard-leopard_primary = Tail
marking-TajaranTailLeopard-leopard_secondary = Spots

## Animated

marking-TajaranTailRetroAnimated = Tajaran Tail (Animated)
marking-TajaranTailRetroAnimated-tail = tail_anim

marking-TajaranTailRetroRingsAnimated = Tajaran Tail, Rings (Animated)
marking-TajaranTailRetroRingsAnimated-tail_anim = Tail
marking-TajaranTailRetroRingsAnimated-tail_anim_rings = Rings

marking-TajaranTailLeopardAnimated = Leopard Tail (Animated)
marking-TajaranTailLeopardAnimated-leotailanim_primary = Tail
marking-TajaranTailLeopardAnimated-leotailanim_secondary = Spots

# Head

marking-TajaranHeadNose = Tajaran Nose
marking-TajaranHeadNose-nose = Nose

marking-TajaranHeadMuzzle = Tajaran Muzzle
marking-TajaranHeadMuzzle-muzzle = Muzzle

marking-TajaranHeadMuzzleLarge = Tajaran Muzzle, Large
marking-TajaranHeadMuzzleLarge-muzzle_large = Muzzle

marking-TajaranHeadPoints = Tajaran Points Pattern
marking-TajaranHeadPoints-points = Points

marking-TajaranHeadTiger = Tajaran Tiger Pattern
marking-TajaranHeadTiger-tiger_face = Stripes

marking-TajaranHeadTigerAlt = Tajaran Tiger Pattern, Alt
marking-TajaranHeadTigerAlt-tiger_head = Stripes

marking-TajaranHeadPatches = Tajaran Patches
marking-TajaranHeadPatches-patch = Patches

# Torso

marking-TajaranTorsoBelly = Tajaran Belly
marking-TajaranTorsoBelly-belly = Belly

marking-TajaranTorsoCrest = Tajaran Chest Crest
marking-TajaranTorsoCrest-crest = Crest

marking-TajaranTorsoFullBelly = Tajaran Belly, Full
marking-TajaranTorsoFullBelly-crest = fullbelly

# Limbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ physiology-description-species-base-vox = vox
physiology-description-species-base-vulpkanin = vulpkanin

## den species
# TODO
physiology-description-species-base-tajaran = tajaran

# SPECIES PREFIXES
# TODO
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_DEN/species/species.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
species-name-tajaran = Tajaran
8 changes: 8 additions & 0 deletions Resources/Migrations/_DEN/markings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This dictionary maps "old" marking IDs to "new" marking IDs.
# When a player imports a character profile, all old markings will be translated to use these IDs.

TajaranLeoTailNoAnim: TajaranTailLeopard

TajaranTailAnim: TajaranTailRetroAnimated
TajaranTailAnimRings: TajaranTailRetroRingsAnimated
TajaranLeoTailAnim: TajaranTailLeopardAnimated
3 changes: 2 additions & 1 deletion Resources/Prototypes/Guidebook/species.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: guideEntry
id: Species
name: guide-entry-species
text: "/ServerInfo/_MACRO/Guidebook/Mobs/Species.xml" #macro - redirected to our directory
text: "/ServerInfo/_DEN/Guidebook/Mobs/Species.xml" # DEN - use den directory
children:
# - Ant # macro - uncomment to enable
# - Allulalo # macro - uncomment to enable
Expand All @@ -16,6 +16,7 @@
- Moth
- Reptilian
- SlimePerson
- Tajaran # den
- Vox
- Vulpkanin

Expand Down
Loading
Loading