Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jabak
2024-07-17 23:20:24 +03:00
parent be806b527b 34b7026390
commit 7302c67293
20 changed files with 17362 additions and 9744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Client/Movement/Systems/WaddleAnimationSystem.cs
View File

@@ -1,5 +1,6 @@
using System.Numerics;
using Content.Client.Gravity;
using Content.Shared.Rotation;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Events;
using Robust.Client.Animations;
@@ -14,6 +15,7 @@ public sealed class WaddleAnimationSystem : EntitySystem
[Dependency] private readonly AnimationPlayerSystem _animation = default!;
[Dependency] private readonly GravitySystem _gravity = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly AppearanceSystem _appearance = default!; // WD EDIT
public override void Initialize()
{
@@ -32,7 +34,13 @@ public sealed class WaddleAnimationSystem : EntitySystem
return;
}
if (!args.HasDirectionalMovement && component.IsCurrentlyWaddling)
// WD EDIT
_appearance.TryGetData<RotationState>(entity, RotationVisuals.RotationState, out var state);
if (state is RotationState.Horizontal)
return;
// WD EDIT
if (!args.HasDirectionalMovement && component.IsCurrentlyWaddling)
{
component.IsCurrentlyWaddling = false;
@@ -71,6 +79,12 @@ public sealed class WaddleAnimationSystem : EntitySystem
return;
}
// WD EDIT
_appearance.TryGetData<RotationState>(uid, RotationVisuals.RotationState, out var state);
if (TryComp<SpriteComponent>(uid, out var sprite) && TryComp<RotationVisualsComponent>(uid, out var rotat) && state is RotationState.Horizontal)
return;
// WD EDIT
var tumbleIntensity = component.LastStep ? 360 - component.TumbleIntensity : component.TumbleIntensity;
var len = mover.Sprinting ? component.AnimationLength * component.RunAnimationLengthMultiplier : component.AnimationLength;
@@ -128,8 +142,13 @@ public sealed class WaddleAnimationSystem : EntitySystem
private void OnAnimationCompleted(EntityUid uid, WaddleAnimationComponent component, AnimationCompletedEvent args)
{
var started = new StartedWaddlingEvent(uid);
if (args.Key is not "Waddle") // WD EDIT
{
component.IsCurrentlyWaddling = false;
return;
}
var started = new StartedWaddlingEvent(uid);
RaiseLocalEvent(uid, ref started);
}
}

4
Content.Client/Rotation/RotationVisualizerSystem.cs
View File

@@ -55,6 +55,10 @@ public sealed class RotationVisualizerSystem : SharedRotationVisualsSystem
_animation.Stop(animationComp, animationKey);
}
// WD EDIT
if (_animation.HasRunningAnimation(animationComp, "Waddle"))
_animation.Stop(animationComp, "Waddle");
var animation = new Animation
{
Length = TimeSpan.FromSeconds(animationTime),

31
Content.Client/_White/Wizard/Mirror/WizardMirrorWindow.cs
View File

@@ -291,6 +291,15 @@ public sealed partial class WizardMirrorWindow : DefaultWindow
};
#endregion Eyes
#region Markings
CMarkings.OnMarkingAdded += OnMarkingChange;
CMarkings.OnMarkingRemoved += OnMarkingChange;
CMarkings.OnMarkingColorChange += OnMarkingChange;
CMarkings.OnMarkingRankChange += OnMarkingChange;
#endregion Markings
}
#region Set
@@ -354,6 +363,15 @@ public sealed partial class WizardMirrorWindow : DefaultWindow
IsDirty = true;
}
private void OnMarkingChange(MarkingSet markings)
{
if (Profile is null)
return;
Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithMarkings(markings.GetForwardEnumerator().ToList()));
IsDirty = true;
}
#endregion
#region Update
@@ -602,6 +620,18 @@ public sealed partial class WizardMirrorWindow : DefaultWindow
EyesPicker.SetData(Profile.Appearance.EyeColor);
}
private void UpdateMarkings()
{
if (Profile == null)
{
return;
}
CMarkings.SetData(Profile.Appearance.Markings, Profile.Species,
Profile.Sex, Profile.BodyType, Profile.Appearance.SkinColor, Profile.Appearance.EyeColor
);
}
#endregion
private void OnSkinColorOnValueChanged()
@@ -688,5 +718,6 @@ public sealed partial class WizardMirrorWindow : DefaultWindow
UpdateCMarkingsFacialHair();
UpdateTtsVoicesControls();
UpdateBodyTypes();
UpdateMarkings();
}
}

6
Content.Client/_White/Wizard/Mirror/WizardMirrorWindow.xaml
View File

@@ -80,6 +80,12 @@
<humanoid:SingleMarkingPicker Name="CFacialHairPicker" Category="FacialHair" />
</BoxContainer>
</prefUi:HighlightedContainer>
<!-- Markings -->
<prefUi:HighlightedContainer>
<BoxContainer Name="CMarkingsTab" Orientation="Vertical" Margin="10">
<humanoid:MarkingPicker Name="CMarkings" IgnoreCategories="Hair,FacialHair" />
</BoxContainer>
</prefUi:HighlightedContainer>
</BoxContainer>
</ScrollContainer>
</DefaultWindow>

8
Content.Server/_White/Wizard/Mirror/WizardMirrorSystem.cs
View File

@@ -1,4 +1,6 @@
using Content.Server.Humanoid;
using System.Collections.Generic;
using System.Linq;
using Content.Server.Humanoid;
using Content.Server.IdentityManagement;
using Content.Shared._White.Wizard.Mirror;
using Content.Shared.Humanoid;
@@ -7,7 +9,9 @@ using Content.Shared.Interaction;
using Content.Shared.Physics;
using Content.Shared.Preferences;
using Content.Shared.UserInterface;
using FastAccessors;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Player;
namespace Content.Server._White.Wizard.Mirror;
@@ -129,6 +133,8 @@ public sealed class WizardMirrorSystem : EntitySystem
.Appearance.WithFacialHairColor(facialHair.MarkingColors[0]));
}
profile = profile.WithCharacterAppearance(profile.Appearance.WithMarkings(humanoid.MarkingSet.GetForwardEnumerator().ToList()));
var state = new WizardMirrorUiState(profile);
component.Target = targetUid;

65
Resources/Changelog/ChangelogWhite.yml
View File

@@ -5921,3 +5921,68 @@
id: 384
time: '2024-07-17T11:14:59.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/452
- author: PointPNG
changes:
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u041C\u0443\
\u0441\u0430."
type: Add
id: 385
time: '2024-07-17T11:56:53.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/453
- author: ThereDrD
changes:
- message: "\u041A\u0430\u043F\u0438\u0442\u0430\u043D \u0442\u0435\u043F\u0435\u0440\
\u044C \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0431\u0440\u0430\u0442\u044C\
\ \u043A\u0430\u043F\u0438\u0442\u0430\u043D\u0441\u043A\u0438\u0435 \u043F\u0435\
\u0440\u0447\u0430\u0442\u043A\u0438 \u0432 \u043B\u043E\u0430\u0434\u0430\u0443\
\u0442\u0430\u0445"
type: Add
- message: "\u0425\u043E\u043F \u0442\u0435\u043F\u0435\u0440\u044C \u0441\u043F\
\u0430\u0432\u043D\u0438\u0442\u0441\u044F \u0441\u043E \u0441\u0432\u043E\u0438\
\u043C \u041F\u0414\u0410"
type: Fix
id: 386
time: '2024-07-17T12:13:18.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/455
- author: ThereDrD
changes:
- message: "\u0421\u0411 \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u043E \u043F\
\u0435\u0440\u0447\u0430\u0442\u043A\u0438"
type: Add
id: 387
time: '2024-07-17T12:20:27.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/456
- author: Spatison
changes:
- message: "\u0412 \u0432\u043E\u043B\u0448\u0435\u0431\u043D\u043E\u043C \u0437\
\u0435\u0440\u043A\u0430\u043B\u0435 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\
\u043E\u0436\u043D\u043E \u043C\u0435\u043D\u044F\u0442\u044C \u0447\u0435\u0440\
\u0442\u044B \u0432\u043D\u0435\u0448\u043D\u043E\u0441\u0442\u0438"
type: Tweak
id: 388
time: '2024-07-17T13:42:53.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/457
- author: ThereDrD
changes:
- message: "\u0422\u0440\u043E\u0441\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\
\u0442\u0435\u043A\u0430\u0440\u044F \u0442\u0435\u043F\u0435\u0440\u044C \u043D\
\u0435 \u043B\u043E\u043C\u0430\u0435\u0442 \u043B\u043E\u0430\u0434\u0430\u0443\
\u0442\u044B \u0438 \u043E\u0434\u0435\u0432\u0430\u0435\u0442\u0441\u044F"
type: Fix
- message: "\u041A\u043E\u0436\u0430\u043D\u0430\u044F \u0441\u0443\u043C\u043A\u0430\
\ \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u0430 \u0441\u0442\u0430\u0440\u0442\
\u043E\u0432\u044B\u0439 \u044D\u043A\u0441\u0442\u0440\u0435\u043D\u043D\u044B\
\u0439 \u043D\u0430\u0431\u043E\u0440"
type: Fix
id: 389
time: '2024-07-17T13:42:21.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/458
- author: Spatison
changes:
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0430\u043D\
\u0438\u043C\u0430\u0446\u0438\u044F \u0431\u043E\u0442\u0438\u043D\u043E\u043A\
\ \u043A\u043B\u043E\u0443\u043D\u0430"
type: Fix
id: 390
time: '2024-07-17T18:06:22.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/459

26815
Resources/Maps/White/WhiteMoose.yml
View File

File diff suppressed because it is too large Load Diff

9
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
View File

@@ -7,6 +7,15 @@
contents:
- id: BoxSurvival
- type: entity
noSpawn: true
parent: ClothingBackpackSatchelLeather
id: ClothingBackpackSatchelLeatherFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- type: entity
noSpawn: true
parent: ClothingBackpackSatchel

10
Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
View File

@@ -19,7 +19,7 @@
# Ears
- type: itemLoadout
- type: itemLoadout # WD
id: QuartermasterHeadset
equipment: QuartermasterHeadset
- type: startingGear
@@ -27,6 +27,14 @@
equipment:
ears: ClothingHeadsetQM
- type: itemLoadout # WD
id: QuartermasterHeadsetAlt
equipment: QuartermasterHeadsetAlt
- type: startingGear
id: QuartermasterHeadsetAlt
equipment:
ears: ClothingHeadsetAltCargo
# Jumpsuit
- type: itemLoadout
id: QuartermasterJumpsuit

10
Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
View File

@@ -1,3 +1,13 @@
# Ears
- type: itemLoadout # WD
id: SalvageSpecialistHeadset
equipment: SalvageSpecialistHeadset
- type: startingGear
id: SalvageSpecialistHeadset
equipment:
ears: ClothingHeadsetMining
# Mask
- type: itemLoadout # WD

11
Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
View File

@@ -97,6 +97,17 @@
equipment:
outerClothing: ClothingOuterWinterJani
- type: itemLoadout # WD
id: JanitorWetFloorSign
equipment: JanitorWetFloorSign
effects:
- !type:GroupLoadoutEffect
proto: TimerJanitorFunnyHeads
- type: startingGear
id: JanitorWetFloorSign
equipment:
outerClothing: WetFloorSign
# PDA
- type: itemLoadout # WD

9
Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
View File

@@ -120,6 +120,15 @@
equipment:
outerClothing: ClothingOuterWinterCap
# Gloves
- type: itemLoadout
id: CaptainGloves
equipment: CaptainGloves
- type: startingGear
id: CaptainGloves
equipment:
gloves: ClothingHandsGlovesCaptain
# PDA
- type: itemLoadout # WD

2
Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
View File

@@ -122,7 +122,7 @@
- type: startingGear
id: HoPPDA
equipment:
gloves: HoPPDA
id: HoPPDA
# Ears
- type: itemLoadout # WD

10
Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
View File

@@ -1,3 +1,13 @@
# Glasses
- type: itemLoadout
id: ChemistGlasses
equipment: ChemistGlasses
- type: startingGear
id: ChemistGlasses
equipment:
eyes: ClothingEyesGlassesChemical
# Jumpsuit
- type: itemLoadout
id: ChemistJumpsuit

8
Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
View File

@@ -103,6 +103,14 @@
equipment:
ears: ClothingHeadsetCMO
- type: itemLoadout # WD
id: CMOHeadsetAlt
equipment: CMOHeadsetAlt
- type: startingGear
id: CMOHeadsetAlt
equipment:
ears: ClothingHeadsetAltMedical
# PDA
- type: itemLoadout # WD

2
Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
View File

@@ -25,4 +25,4 @@
- type: startingGear
id: MedicalInternPDA
equipment:
jumpsuit: MedicalInternPDA
id: MedicalInternPDA

2
Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
View File

@@ -23,4 +23,4 @@
- type: startingGear
id: ReporterPDA
equipment:
jumpsuit: ReporterPDA
id: ReporterPDA

33
Resources/Prototypes/Loadouts/Jobs/common.yml
View File

@@ -1,4 +1,15 @@
# Eyes
# Timers
- type: loadoutEffectGroup # WD
id: TimerTrueAssistant
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobPassenger
time: 180000 # 50 hours
# Eyes
- type: itemLoadout
id: GlassesGarOrange
@@ -141,6 +152,17 @@
equipment:
outerClothing: ClothingOuterHoodieBlack
- type: itemLoadout
id: CoatSpaceAsshole
equipment: CoatSpaceAsshole
effects:
- !type:GroupLoadoutEffect
proto: TimerTrueAssistant
- type: startingGear
id: CoatSpaceAsshole
equipment:
outerClothing: ClothingOuterCoatSpaceAsshole
# Gloves
- type: itemLoadout
@@ -337,7 +359,7 @@
- type: startingGear
id: CommonSatchelLeather
equipment:
back: ClothingBackpackSatchelLeather
back: ClothingBackpackSatchelLeatherFilled
# Mask
@@ -443,12 +465,13 @@
equipment:
belt: ClothingBeltUtility
# Inhands
# Job trinkets
- type: itemLoadout
id: Cane
equipment: Cane
- type: startingGear
id: Cane
equipment:
belt: Cane
storage:
back:
- Cane

39
Resources/Prototypes/Loadouts/loadout_groups.yml
View File

@@ -65,6 +65,7 @@
- CaptainBackpack
- CaptainSatchel
- CaptainDuffel
- CaptainDuffel
- CommonSatchelLeather # WD
- type: loadoutGroup
@@ -75,6 +76,13 @@
- CaptainOuterClothing
- CaptainWintercoat
- type: loadoutGroup
id: CaptainOuterClothing
name: loadout-group-gloves
minLimit: 0
loadouts:
- CaptainGloves
- type: loadoutGroup
id: CaptainShoes
name: loadout-group-shoes
@@ -209,6 +217,7 @@
- CoatGentle
- AssistantWintercoat
- CoatBomber
- CoatSpaceAsshole
- type: loadoutGroup # WD
id: AssistantPDA
@@ -405,6 +414,7 @@
minLimit: 0
loadouts:
- JanitorWintercoat
- JanitorWetFloorSign # WD
- type: loadoutGroup
id: JanitorPDA
@@ -724,8 +734,8 @@
- BootsWinter
- type: loadoutGroup # WD
id: InhandCane
name: loadout-group-inhand
id: ItemCane
name: loadout-group-job-trinkets
minLimit: 0
loadouts:
- Cane
@@ -749,6 +759,7 @@
name: loadout-group-ears
loadouts:
- QuartermasterHeadset
- QuartermasterHeadsetAlt
- type: loadoutGroup
id: QuartermasterJumpsuit
@@ -858,6 +869,12 @@
- MercenaryBand
- MercenaryBeret
- type: loadoutGroup # WD
id: SalvageSpecialistHeadset
name: loadout-group-ears
loadouts:
- SalvageSpecialistHeadset
- type: loadoutGroup # WD
id: SalvageSpecialistEyes
name: loadout-group-eyes
@@ -1582,12 +1599,6 @@
# Medical
- type: loadoutGroup
id: ChiefMedicalOfficerEars
name: loadout-group-ears
loadouts:
- CMOHeadset
- type: loadoutGroup
id: ChiefMedicalOfficerHead
name: loadout-group-head
@@ -1600,6 +1611,13 @@
- PurpleSurgeryCap
- CowboyWhite
- type: loadoutGroup # WD
id: ChiefMedicalOfficerEars
name: loadout-group-ears
loadouts:
- CMOHeadset
- CMOHeadsetAlt
- type: loadoutGroup
id: ChiefMedicalOfficerJumpsuit
name: loadout-group-jumpsuit
@@ -1749,7 +1767,7 @@
- type: loadoutGroup
id: MedicalInternPDA
name: loadout-group-jumpsuit
name: loadout-group-pda
loadouts:
- MedicalInternPDA
@@ -1764,11 +1782,12 @@
- PurpleSurgeryCap
- CowboyWhite
- type: loadoutGroup
- type: loadoutGroup # WD
id: ChemistEyes
name: loadout-group-eyes
minLimit: 0
loadouts:
- ChemistGlasses
- GlassesGarOrange
- type: loadoutGroup

9
Resources/Prototypes/Loadouts/role_loadouts.yml
View File

@@ -96,7 +96,7 @@
- CommonBackpack
- CommonShoes # WD
- LibrarianPDA
- InhandCane
- ItemCane # WD
- Trinkets
- type: roleLoadout
@@ -224,7 +224,7 @@
id: JobSalvageSpecialist
groups:
- SalvageSpecialistHead # WD
- CommonCargoEars # WD
- SalvageSpecialistHeadset # WD
- SalvageSpecialistEyes # WD
- SalvageSpecialistMask # WD
- SalvageSpecialistJumpsuit # WD
@@ -372,6 +372,7 @@
- HeadofSecurityJumpsuit
- CommonSecurityBackpack
- HeadofSecurityOuterClothing
- CommonGloves # WD
- CommonSecurityShoes
- HeadofSecurityPDA
- Trinkets
@@ -385,6 +386,7 @@
- CommonSecurityNeck
- WardenJumpsuit
- CommonSecurityBackpack
- CommonGloves # WD
- CommonSecurityShoes
- WardenPDA
- Trinkets
@@ -399,6 +401,7 @@
- SeniorOfficerJumpsuit
- CommonSecurityBackpack
- SecurityOuterClothing
- CommonGloves # WD
- CommonSecurityShoes
- SeniorOfficerPDA
- Trinkets
@@ -413,6 +416,7 @@
- SecurityJumpsuit
- CommonSecurityBackpack
- SecurityOuterClothing
- CommonGloves # WD
- CommonSecurityShoes
- SecurityPDA
- SecurityBelt
@@ -440,6 +444,7 @@
- CommonSecurityNeck
- SecurityCadetJumpsuit
- CommonSecurityBackpack
- CommonGloves # WD
- CommonSecurityShoes
- SecurityCadetPDA
- Trinkets