Merge branch 'Goob-Station:master' into merge-upstream

Author: whateverusername0

Content.Server/Voting/VoteCommands.cs

@@ -79,17 +79,17 @@ public sealed class CreateCustomCommand : LocalizedEntityCommands
 
         private ISawmill _sawmill = default!;
 
-        private const int MaxArgCount = 10;
+        private const int MaxArgCount = 31;
 
         public override string Command => "customvote";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             _sawmill = Logger.GetSawmill("vote");
 
-            if (args.Length < 3 || args.Length > MaxArgCount)
+            if (args.Length < 2 || args.Length > MaxArgCount)
             {
-                shell.WriteError(Loc.GetString("shell-need-between-arguments",("lower", 3), ("upper", 10)));
+                shell.WriteError(Loc.GetString("shell-need-between-arguments",("lower", 2), ("upper", 31)));
                 return;
             }
 

Content.Server/_White/FootPrint/FootPrintsSystem.cs

@@ -3,7 +3,7 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared._White.FootPrint;
-using Content.Shared._White.Standing;
+using Content.Shared.Standing;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Map;
@@ -24,7 +24,7 @@ public sealed class FootPrintsSystem : EntitySystem
     private EntityQuery<TransformComponent> _transformQuery;
     private EntityQuery<MobThresholdsComponent> _mobThresholdQuery;
     private EntityQuery<AppearanceComponent> _appearanceQuery;
-    private EntityQuery<LayingDownComponent> _layingQuery;
+    private EntityQuery<StandingStateComponent> _standStateQuery;
 
    public override void Initialize()
    {
@@ -33,7 +33,7 @@ public override void Initialize()
        _transformQuery = GetEntityQuery<TransformComponent>();
        _mobThresholdQuery = GetEntityQuery<MobThresholdsComponent>();
        _appearanceQuery = GetEntityQuery<AppearanceComponent>();
-       _layingQuery = GetEntityQuery<LayingDownComponent>();
+       _standStateQuery = GetEntityQuery<StandingStateComponent>();
 
        SubscribeLocalEvent<FootPrintsComponent, ComponentStartup>(OnStartupComponent);
        SubscribeLocalEvent<FootPrintsComponent, MoveEvent>(OnMove);
@@ -53,7 +53,7 @@ private void OnMove(EntityUid uid, FootPrintsComponent component, ref MoveEvent
             return;
 
         var dragging = mobThreshHolds.CurrentThresholdState is MobState.Critical or MobState.Dead
-                       || _layingQuery.TryComp(uid, out var laying);
+                       || _standStateQuery.TryComp(uid, out var standState) && standState.CurrentState == StandingState.Lying;
         var distance = (transform.LocalPosition - component.StepPos).Length();
         var stepSize = dragging ? component.DragSize : component.StepSize;
 

Resources/Audio/_Goobstation/Effects/Grenades/attributions.yml

@@ -0,0 +1,4 @@
+- files: ["beenade_buzz.ogg"]
+  license: "CC0-1.0"
+  copyright: "Bees buzzing 2 by fthgurdy -- https://freesound.org/s/528934/ -- License: Creative Commons 0, trimmed and mixed by BeeRobyn"
+  source: "https://freesound.org/s/528934/"

Resources/Audio/_Goobstation/Effects/Grenades/beenade_buzz.ogg

@@ -1772,3 +1772,45 @@ Entries:
         wherever the corpse was moved.
   id: 215
   time: '2024-11-09T02:58:50.0000000+00:00'
+- author: AstroDogeDX
+  changes:
+    - type: Fix
+      message: >-
+        Added missing datasets for ATS and Salvage Shuttle names, now they look
+        normal on the Mass Scanner!
+  id: 216
+  time: '2024-11-11T01:36:37.0000000+00:00'
+- author: starch70
+  changes:
+    - type: Tweak
+      message: >-
+        NTrep and BSO are separate access now (currently only affects their
+        lockers)
+  id: 217
+  time: '2024-11-11T01:45:10.0000000+00:00'
+- author: Aidenkrz
+  changes:
+    - type: Tweak
+      message: Autodespawn Footsteps/Dragging
+    - type: Fix
+      message: Footsteps are actually footsteps now.
+  id: 218
+  time: '2024-11-11T02:29:14.0000000+00:00'
+- author: TwoDucksOnnaPlane
+  changes:
+    - type: Tweak
+      message: Buffed .30 and .20 caliber damages.
+  id: 219
+  time: '2024-11-12T05:37:52.0000000+00:00'
+- author: Aidenkrz
+  changes:
+    - type: Tweak
+      message: Replaced moth roaches with moth maggots.
+  id: 220
+  time: '2024-11-12T06:50:04.0000000+00:00'
+- author: deltanedas
+  changes:
+    - type: Fix
+      message: Fixed mining drills stunlocking you.
+  id: 221
+  time: '2024-11-12T20:30:06.0000000+00:00'

Resources/Changelog/GoobChangelog.yml

@@ -4,7 +4,7 @@ changeling-chemicals-deficit = Not enough chemicals!
 changeling-action-fail-lesserform = Can't use it while in lesser form!
 changeling-action-fail-absorbed = Need to absorb {$number} more organics to use it!
 
-changeling-absorb-start = {CAPITALIZE(THE($user))} starts absorbing {CAPITALIZE(THE($target))}'s!
+changeling-absorb-start = {CAPITALIZE(THE($user))} starts absorbing {CAPITALIZE(THE($target))}'s DNA!
 changeling-absorb-fail-incapacitated = You can't absorb it until it's not incapacitated.
 changeling-absorb-fail-absorbed = You've already absorbed it.
 changeling-absorb-fail-unabsorbable = The target is not absorbable.

Resources/Locale/en-US/_Goobstation/changeling/abilities/changeling.ftl

@@ -2,7 +2,7 @@ ghost-role-information-nukie-reinforcement-name = Nuclear Operative
 ghost-role-information-nukie-reinforcement-description = The nuclear operatives need reinforcements. You, a reserve agent, will help them.
 ghost-role-information-nukie-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the nuclear operatives who summoned you.
 
-ghost-role-information-SyndiRoach-name = SyndiRoach
+ghost-role-information-SyndiRoach-name = SyndiMaggot
 ghost-role-information-SyndiRoach-description = You're the faithful trained pet of nuclear operatives with a microbomb. Serve your master to the death!
 ghost-role-information-SyndiRoach-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.
 

Resources/Locale/en-US/_Goobstation/ghost/ghost-role-component.ftl

@@ -0,0 +1,2 @@
+id-card-access-level-ntr = Nanotrasen Representative
+id-card-access-level-bso = Blueshield Officer

Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl

@@ -22,8 +22,8 @@ uplink-miniature-energy-crossbow-desc = The syndicate's energy crossbow, small,
 uplink-pie-cannon-name = Regenerating Pie Cannon
 uplink-pie-cannon-desc = A pie cannon that automatically regenerates pies, one every ten seconds.
 
-uplink-mobroach-microbomb-name = SyndiRoach Teleporter
-uplink-mobroach-microbomb-desc = Call in a handy mothroach equipped with a microbomb implant. Explodes when seriously injured.
+uplink-mobroach-microbomb-name = SyndiMaggot Teleporter
+uplink-mobroach-microbomb-desc = Call in a handy moth maggot equipped with a microbomb implant. Explodes when seriously injured.
 
 uplink-advanced-combat-medipen-name = Advanced Combat Medipen
 uplink-advanced-combat-medipen-desc = An advanced single-use medipen containing chemicals that will rapidly heal most types of damage taken in a fight.

Resources/Locale/en-US/_Goobstation/store/uplink-catalog.ftl

@@ -32,8 +32,8 @@ ghost-role-information-silicon-rules = You are a [color=#6495ed][bold]Silicon[/b
 ghost-role-information-mouse-name = Mouse
 ghost-role-information-mouse-description = A hungry and mischievous mouse.
 
-ghost-role-information-mothroach-name = Mothroach
-ghost-role-information-mothroach-description = A cute but mischievous mothroach.
+ghost-role-information-mothroach-name = Moth Maggot
+ghost-role-information-mothroach-description = A cute but mischievous grub.
 
 ghost-role-information-snail-name = Snail
 ghost-role-information-snail-description = A little snail who doesn't mind a bit of space. Just stay on grid!
@@ -252,7 +252,7 @@ ghost-role-information-medical-description = You are a medical professional, but
 ghost-role-information-cargo-name = Cargo
 ghost-role-information-cargo-description = You are part of a logistics mission, but seem to have found yourself in a strange situation...
 
-ghost-role-information-engineering-name = Engineering 
+ghost-role-information-engineering-name = Engineering
 ghost-role-information-engineering-description = You are on an engineering job, but seem to have found yourself in a strange situation...
 
 ghost-role-information-science-name = Science