Apply changes from Maintainer meeting for staging (#40852)

Content.Server/Stunnable/Systems/StunOnCollideSystem.cs

@@ -27,7 +27,6 @@ internal sealed class StunOnCollideSystem : EntitySystem
         if (ent.Comp.Refresh)
         {
             _stunSystem.TryUpdateStunDuration(target, ent.Comp.StunAmount);
-
             _movementMod.TryUpdateMovementSpeedModDuration(
                 target,
                 MovementModStatusSystem.TaserSlowdown,

Resources/Changelog/Changelog.yml

@@ -1,4 +1,15 @@
 Entries:
+- author: CoconutThunder
+  changes:
+  - message: Fixed lubed items being thrown when looking at the pickup verb.
+    type: Fix
+  - message: Fixed multihanded items showing a popup when looking at the pickup verb.
+    type: Fix
+  - message: Fixed a bug with lubed handcuffs.
+    type: Fix
+  id: 8561
+  time: '2025-05-25T05:10:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38705
 - author: CoconutThunder
   changes:
   - message: The Chief Medical Officer should now appear with the correct precedence
@@ -3561,14 +3572,6 @@
   id: 9012
   time: '2025-09-27T20:51:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40572
-- author: keronshb
-  changes:
-  - message: 'EXPERIMENTAL: Tasers, a short-ranged gun capable of causing targets
-      to become prone, are now added into Warden, HoS, and Security locker fills.'
-    type: Add
-  id: 9013
-  time: '2025-09-27T21:21:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39087
 - author: SurrealShibe
   changes:
   - message: Vulpkanin now audibly gasp.

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -324,7 +324,6 @@
     - id: RubberStampHos
     - id: BoxHoSCircuitboards
     - id: WeaponDisabler
-    - id: WeaponTaser
     - id: WantedListCartridge
     - id: DrinkHosFlask
 

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -28,7 +28,6 @@
     children:
     - id: FlashlightSeclite
     - id: WeaponDisabler
-    - id: WeaponTaser
     - id: ClothingBeltSecurityFilled
     - id: Flash
     - id: ClothingEyesGlassesSecurity
@@ -73,7 +72,6 @@
     - id: FlashlightSeclite
       prob: 0.8
     - id: WeaponDisabler
-    - id: WeaponTaser
     - id: ClothingUniformJumpsuitSecGrey
       prob: 0.3
     - id: ClothingHeadHelmetBasic
@@ -107,7 +105,6 @@
   table: !type:AllSelector
     children:
     - id: ClothingEyesGlassesSecurity
-    - id: WeaponTaser
     - id: WeaponDisabler
     - id: TrackingImplanter
       amount: 2

Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml

@@ -119,10 +119,6 @@
       weight: 0.1
       children:
       - id: DawInstrumentMachineCircuitboard
-    - !type:GroupSelector
-      weight: 0.05
-      children:
-      - id: SuperSynthesizerInstrument
 
 - type: entityTable
   id: SalvageInstrumentTable
@@ -140,8 +136,6 @@
       tableId: WoodwindInstrumentTable
     - !type:NestedSelector
       tableId: SpecialInstrumentTable
-    - id: SuperSynthesizerInstrument
-      weight: 0.3
 
 - type: entity
   id: RandomInstruments

Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml

@@ -26,6 +26,7 @@
 - type: entity
   parent: BaseKeyedInstrument
   id: SuperSynthesizerInstrument
+  suffix: Admin
   name: super synthesizer
   description: Blasting the ghetto with Touhou MIDIs since 2020.
   components:
@@ -41,7 +42,7 @@
 - type: entity
   parent: SuperSynthesizerInstrument
   id: SuperSynthesizerNoLimitInstrument
-  suffix: NoLimits
+  suffix: NoLimits Admin
   components:
   - type: Instrument
     respectMidiLimits: false

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -611,7 +611,6 @@
     slots:
     - Belt
   - type: Gun
-    fireRate: 0.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser.ogg
   - type: ProjectileBatteryAmmoProvider

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -227,8 +227,7 @@
     lifetime: 0.170 # Very short range
   - type: StunOnCollide
     stunAmount: 0
-    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun baton
-    drop: false #Ranged KD and item drop are too strong in one package
+    knockdownAmount: 2.5 # Enough to subdue and follow up with a stun batong
     slowdownAmount: 2.5
     walkSpeedModifier: 0.5
     sprintSpeedModifier: 0.5
@@ -256,7 +255,6 @@
     lifetime: 1.0 # Not so short range
   - type: StunOnCollide
     stunAmount: 5
-    drop: true # this is the evil taser
     knockdownAmount: 10
     slowdownAmount: 10
     walkSpeedModifier: 0.5

Resources/Prototypes/Reagents/narcotics.yml

@@ -289,19 +289,16 @@
   meltingPoint: 128.0
   metabolisms:
     Narcotic:
-      effects: # It would be nice to have speech slurred or mumbly, but accents are a bit iffy atm. Same for distortion effects.
-      - !type:MovespeedModifier
-        walkSpeedModifier: 0.65
-        sprintSpeedModifier: 0.65
+      effects:
       - !type:ModifyStatusEffect
         conditions:
         - !type:ReagentThreshold
           reagent: Nocturine
           min: 8
         effectProto: StatusEffectForcedSleeping
-        time: 6
-        delay: 5
-        type: Update
+        time: 3
+        delay: 6
+        type: Add
 
 - type: reagent
   id: MuteToxin