Upstream Merge 6 22 2024

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -204,8 +204,8 @@ public override void LoadProfile(EntityUid uid, HumanoidCharacterProfile profile
         humanoid.Species = profile.Species;
         humanoid.SkinColor = profile.Appearance.SkinColor;
         humanoid.EyeColor = profile.Appearance.EyeColor;
-        humanoid.Height = profile.Height; // Parkstation-HeightSlider
-        humanoid.Width = profile.Width; // Parkstation-HeightSlider
+        humanoid.Height = profile.Height;
+        humanoid.Width = profile.Width;
 
         UpdateSprite(humanoid, Comp<SpriteComponent>(uid));
     }

Content.Client/Preferences/UI/HumanoidProfileEditor.xaml

@@ -109,7 +109,7 @@
                                     <Control HorizontalExpand="True"/>
                                     <OptionButton Name="CSpawnPriorityButton" HorizontalAlignment="Right" />
                                 </BoxContainer>
-								<!-- Height -->
+								                <!-- Height -->
                                 <BoxContainer HorizontalExpand="True">
                                     <Label Name="CHeightLabel" MinWidth="110" />
                                     <Slider Name="CHeightSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
@@ -121,6 +121,10 @@
                                     <Slider Name="CWidthSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
                                     <Button Name="CWidthReset" Text="{Loc 'ui-options-bind-reset'}" />
                                 </BoxContainer>
+                                <!--Weight -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Name="CWeightLabel" />
+                                </BoxContainer>
                             </BoxContainer>
                             <!-- Skin -->
                             <BoxContainer Margin="10" HorizontalExpand="True" Orientation="Vertical">
@@ -154,18 +158,29 @@
                         <BoxContainer Name="CAntagList" Orientation="Vertical" />
                     </ScrollContainer>
                 </BoxContainer>
-                <BoxContainer Orientation="Vertical" Margin="10">
+                <BoxContainer Name="CTraitsTab" Orientation="Vertical" Margin="10">
                     <!-- Traits -->
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Name="CTraitsList" Orientation="Vertical" />
-                    </ScrollContainer>
+                    <Label Name="TraitPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
+                    <ProgressBar Name="TraitPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
+
+                    <Button Name="TraitsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-traits-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-traits-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
+
+                    <TabContainer Name="CTraitsTabs" VerticalExpand="True" />
                 </BoxContainer>
                 <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
                     <!-- Loadouts -->
                     <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
                     <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
 
-                    <Button Name="CHideShowUnusableButton" Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}" ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}" ToggleMode="True" Margin="0 0 0 5" />
+                    <Button Name="LoadoutsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
 
                     <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
                 </BoxContainer>

Content.Client/Traits/ParacusiaSystem.cs

@@ -1,11 +1,12 @@
 using System.Numerics;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Random;
 using Robust.Client.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Client.Traits;
 

Content.Server/Flash/FlashSystem.cs

@@ -14,13 +14,13 @@
 using Content.Shared.Inventory;
 using Content.Shared.Physics;
 using Content.Shared.Tag;
-using Content.Shared.Traits.Assorted;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Flash
 {

Content.Server/Implants/ImplanterSystem.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
@@ -57,6 +58,17 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
                 return;
             }
 
+            // Check if we are trying to implant a implant which is already implanted
+            if (implant.HasValue && !component.AllowMultipleImplants && CheckSameImplant(target, implant.Value))
+            {
+                var name = Identity.Name(target, EntityManager, args.User);
+                var msg = Loc.GetString("implanter-component-implant-already", ("implant", implant), ("target", name));
+                _popup.PopupEntity(msg, target, args.User);
+                args.Handled = true;
+                return;
+            }
+
+
             //Implant self instantly, otherwise try to inject the target.
             if (args.User == target)
                 Implant(target, target, uid, component);
@@ -67,6 +79,15 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
         args.Handled = true;
     }
 
+    public bool CheckSameImplant(EntityUid target, EntityUid implant)
+    {
+        if (!TryComp<ImplantedComponent>(target, out var implanted))
+            return false;
+
+        var implantPrototype = Prototype(implant);
+        return implanted.ImplantContainer.ContainedEntities.Any(entity => Prototype(entity) == implantPrototype);
+    }
+
     /// <summary>
     /// Attempt to implant someone else.
     /// </summary>

Content.Server/StationEvents/Events/MassHallucinationsRule.cs

@@ -2,7 +2,7 @@
 using Content.Server.StationEvents.Components;
 using Content.Server.Traits.Assorted;
 using Content.Shared.Mind.Components;
-using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.StationEvents.Events;
 

Content.Server/Traits/Assorted/ParacusiaSystem.cs

@@ -1,5 +1,7 @@
 using Content.Shared.Traits.Assorted;
+using Content.Shared.Traits.Assorted.Systems;
 using Robust.Shared.Audio;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Traits.Assorted;
 

Content.Server/Traits/TraitSystem.cs

@@ -1,17 +1,26 @@
+using System.Linq;
 using Content.Server.GameTicking;
+using Content.Server.Players.PlayTimeTracking;
+using Content.Shared.Customization.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Roles;
 using Content.Shared.Traits;
+using Pidgin.Configuration;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
 
 namespace Content.Server.Traits;
 
 public sealed class TraitSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly ISerializationManager _serializationManager = default!;
-    [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly ISerializationManager _serialization = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly CharacterRequirementsSystem _characterRequirements = default!;
+    [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
 
     public override void Initialize()
     {
@@ -25,16 +34,17 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
     {
         foreach (var traitId in args.Profile.TraitPreferences)
         {
-            if (!_prototypeManager.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
+            if (!_prototype.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
             {
                 Log.Warning($"No trait found with ID {traitId}!");
                 return;
             }
 
-            if (traitPrototype.Whitelist != null && !traitPrototype.Whitelist.IsValid(args.Mob))
-                continue;
-
-            if (traitPrototype.Blacklist != null && traitPrototype.Blacklist.IsValid(args.Mob))
+            if (!_characterRequirements.CheckRequirementsValid(traitPrototype, traitPrototype.Requirements,
+                _prototype.Index<JobPrototype>(args.JobId ?? _prototype.EnumeratePrototypes<JobPrototype>().First().ID),
+                args.Profile, _playTimeTracking.GetTrackerTimes(args.Player),
+                EntityManager, _prototype, _configuration,
+                out _))
                 continue;
 
             // Add all components required by the prototype
@@ -43,22 +53,10 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
                 if (HasComp(args.Mob, entry.Component.GetType()))
                     continue;
 
-                var comp = (Component) _serializationManager.CreateCopy(entry.Component, notNullableOverride: true);
+                var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
                 comp.Owner = args.Mob;
                 EntityManager.AddComponent(args.Mob, comp);
             }
-
-            // Add item required by the trait
-            if (traitPrototype.TraitGear != null)
-            {
-                if (!TryComp(args.Mob, out HandsComponent? handsComponent))
-                    continue;
-
-                var coords = Transform(args.Mob).Coordinates;
-                var inhandEntity = EntityManager.SpawnEntity(traitPrototype.TraitGear, coords);
-                _sharedHandsSystem.TryPickup(args.Mob, inhandEntity, checkActionBlocker: false,
-                    handsComp: handsComponent);
-            }
         }
     }
 }

Content.Server/Weapons/Melee/MeleeWeaponSystem.cs

@@ -8,6 +8,7 @@
 using Content.Shared.Actions.Events;
 using Content.Shared.Administration.Components;
 using Content.Shared.CombatMode;
+using Content.Shared.Contests;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -43,6 +44,7 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
     [Dependency] private readonly SolutionContainerSystem _solutions = default!;
     [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
 
     public override void Initialize()
     {
@@ -138,7 +140,7 @@ protected override bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid
         if (attemptEvent.Cancelled)
             return false;
 
-        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode);
+        var chance = CalculateDisarmChance(user, target, inTargetHand, combatMode) * _contests.MassContest(user, target);
 
         if (_random.Prob(chance))
         {

Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs

@@ -21,7 +21,7 @@ public override void Initialize()
 
     private void HandleLand(EntityUid uid, GunComponent component, ref ThrowDoHitEvent args)
     {
-        if (_random.Prob(component.Reliability))
+        if (_random.Prob(component.FireOnDropChance))
             _gun.AttemptShoot(uid, uid, component, Transform(uid).Coordinates.Offset(Transform(uid).LocalRotation.ToVec()));
     }
 }

Content.Server/Weapons/Ranged/Systems/GunSystem.cs

@@ -6,6 +6,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stunnable;
 using Content.Server.Weapons.Ranged.Components;
+using Content.Shared.Contests;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -39,6 +40,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
     [Dependency] private readonly StunSystem _stun = default!;
+    [Dependency] private readonly ContestsSystem _contests = default!;
 
     public const float DamagePitchVariation = SharedMeleeWeaponSystem.DamagePitchVariation;
     public const float GunClumsyChance = 0.5f;
@@ -97,7 +99,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
         var toMap = toCoordinates.ToMapPos(EntityManager, TransformSystem);
         var mapDirection = toMap - fromMap.Position;
         var mapAngle = mapDirection.ToAngle();
-        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle());
+        var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle(), user);
 
         // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
         var fromEnt = MapManager.TryFindGridAt(fromMap, out var gridUid, out var grid)
@@ -311,15 +313,16 @@ private Angle[] LinearSpread(Angle start, Angle end, int intervals)
         return angles;
     }
 
-    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction)
+    private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction, EntityUid? shooter)
     {
         var timeSinceLastFire = (curTime - component.LastFire).TotalSeconds;
         var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + component.AngleIncreaseModified.Theta - component.AngleDecayModified.Theta * timeSinceLastFire, component.MinAngleModified.Theta, component.MaxAngleModified.Theta);
         component.CurrentAngle = new Angle(newTheta);
         component.LastFire = component.NextFire;
 
         // Convert it so angle can go either side.
-        var random = Random.NextFloat(-0.5f, 0.5f);
+
+        var random = Random.NextFloat(-0.5f, 0.5f) / _contests.MassContest(shooter);
         var spread = component.CurrentAngle.Theta * random;
         var angle = new Angle(direction.Theta + component.CurrentAngle.Theta * random);
         DebugTools.Assert(spread <= component.MaxAngleModified.Theta);

Content.Server/Zombies/ZombieSystem.Transform.cs

@@ -35,8 +35,8 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Zombies;
 using Content.Shared.Prying.Components;
-using Content.Shared.Traits.Assorted;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Server.Zombies
 {

Content.Shared/CCVar/CCVars.cs

@@ -341,14 +341,34 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> DebugCoordinatesAdminOnly =
             CVarDef.Create("game.debug_coordinates_admin_only", true, CVar.SERVER | CVar.REPLICATED);
 
+
+        /// <summary>
+        ///     Whether to allow characters to select traits.
+        /// </summary>
+        public static readonly CVarDef<bool> GameTraitsEnabled =
+            CVarDef.Create("game.traits_enabled", true, CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many traits a character can have at most.
+        /// </summary>
+        public static readonly CVarDef<int> GameTraitsMax =
+            CVarDef.Create("game.traits_max", 5, CVar.REPLICATED);
+
+        /// <summary>
+        ///     How many points a character should start with.
+        /// </summary>
+        public static readonly CVarDef<int> GameTraitsDefaultPoints =
+            CVarDef.Create("game.traits_default_points", 5, CVar.REPLICATED);
+
+
         /// <summary>
-        /// Whether or not to allow characters to select loadout items.
+        ///     Whether to allow characters to select loadout items.
         /// </summary>
         public static readonly CVarDef<bool> GameLoadoutsEnabled =
             CVarDef.Create("game.loadouts_enabled", true, CVar.REPLICATED);
 
         /// <summary>
-        /// How many points to give to each player for loadouts.
+        ///     How many points to give to each player for loadouts.
         /// </summary>
         public static readonly CVarDef<int> GameLoadoutsPoints =
             CVarDef.Create("game.loadouts_points", 14, CVar.REPLICATED);
@@ -2134,6 +2154,17 @@ public static readonly CVarDef<float>
             CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
 
         /// <summary>
+        ///     Whether height & width sliders adjust a character's Fixture Component
+        /// </summary>
+        public static readonly CVarDef<bool> HeightAdjustModifiesHitbox =
+            CVarDef.Create("heightadjust.modifies_hitbox", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Whether height & width sliders adjust a player's view distance
+        /// </summary>
+        public static readonly CVarDef<bool> HeightAdjustModifiesZoom =
+            CVarDef.Create("heightadjust.modifies_zoom", true, CVar.SERVERONLY);
+
         ///     Enables station goals
         /// </summary>
         public static readonly CVarDef<bool> StationGoalsEnabled =
@@ -2144,5 +2175,18 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<float> StationGoalsChance =
             CVarDef.Create("game.station_goals_chance", 0.1f, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Toggles all MassContest functions. All mass contests output 1f when false
+        /// </summary>
+        public static readonly CVarDef<bool> DoMassContests =
+            CVarDef.Create("contests.do_mass_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     The maximum amount that Mass Contests can modify a physics multiplier, given as a +/- percentage
+        ///     Default of 0.25f outputs between * 0.75f and 1.25f
+        /// </summary>
+        public static readonly CVarDef<float> MassContestsMaxPercentage =
+            CVarDef.Create("contests.max_percentage", 0.25f, CVar.REPLICATED | CVar.SERVER);
     }
 }

Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs

@@ -2,6 +2,7 @@
 
 namespace Content.Shared.Clothing.Loadouts.Prototypes;
 
+
 /// <summary>
 ///     A prototype defining a valid category for <see cref="LoadoutPrototype"/>s to go into.
 /// </summary>