Merge branch 'master' into Sec-Shades-Returns

.github/CODEOWNERS

@@ -10,7 +10,7 @@
 # /Resources/Textures/ @leonardo-dabepis # No write access
 # /Resources/DeltaV/Textures/ @leonardo-dabepis
 # /Resources/Nyanotrasen/Textures/ @leonardo-dabepis
-# /Resources/Maps/ @IamVelcroboy
-# /Resources/Prototypes/Maps/ @IamVelcroboy
+/Resources/Maps/ @IamVelcroboy
+/Resources/Prototypes/Maps/ @IamVelcroboy
 
 /Tools/ @DebugOk

Content.Server/Nyanotrasen/Item/ShockCollar/ShockCollarSystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Mobs.Components;
+using Content.Shared.Timing;
 using Content.Server.Explosion.EntitySystems; // Why is trigger under explosions by the way? Even doors already use it.
 using Content.Server.Electrocution;
 using Robust.Shared.Containers;
@@ -9,6 +10,8 @@ public sealed partial class ShockCollarSystem : EntitySystem
 {
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -25,6 +28,13 @@ private void OnTrigger(EntityUid uid, ShockCollarComponent component, TriggerEve
         if (!HasComp<MobStateComponent>(containerEnt)) // If it's not a mob we don't care
             return;
 
+        // DeltaV: prevent clocks from instantly killing people
+        TryComp<UseDelayComponent>(uid, out var useDelay);
+        if (_useDelay.ActiveDelay(uid, useDelay))
+            return;
+
+        _useDelay.BeginDelay(uid, useDelay);
+
         _electrocutionSystem.TryDoElectrocution(containerEnt, null, 5, TimeSpan.FromSeconds(2), true);
     }
 }

Resources/Changelog/DeltaVChangelog.yml

@@ -1345,3 +1345,15 @@ Entries:
       message: Atmos hopefully shouldn't break anymore
   id: 201
   time: '2024-01-07T22:10:36.0000000+00:00'
+- author: Bribrooo
+  changes:
+    - type: Add
+      message: 'added a ChemVend inside of Chemistry on Pebble Station '
+  id: 202
+  time: '2024-01-11T06:14:27.0000000+00:00'
+- author: Adrian
+  changes:
+    - type: Tweak
+      message: Shoukou has maintenance now in logistics and in security
+  id: 203
+  time: '2024-01-12T22:08:47.0000000+00:00'

Resources/Prototypes/DeltaV/Access/mics.yml

@@ -0,0 +1,44 @@
+- type: accessGroup
+  id: AllAccessBorg
+  tags:
+#    - EmergencyShuttleRepealAll
+#    - Captain
+#    - HeadOfPersonnel
+#    - ChiefEngineer
+#    - ChiefMedicalOfficer
+#    - HeadOfSecurity
+#    - ResearchDirector
+    - Command
+    - Security
+    - Detective
+#    - Armory
+    - Lawyer
+    - Engineering
+    - Medical
+#    - Quartermaster
+    - Salvage
+    - Cargo
+    - Research
+    - Service
+    - Maintenance
+    - External
+    - Janitor
+    - Theatre
+    - Bar
+    - Chemistry
+    - Kitchen
+    - Chapel
+    - Hydroponics
+    - Atmospherics
+    - Mail
+#   - Orders
+    - Mantis
+    - Paramedic
+    - Psychologist
+    - Boxer
+    - Clown
+    - Library
+    - Mime
+    - Musician
+    - Reporter
+    - Zookeeper

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -216,7 +216,7 @@
   - type: Access
     enabled: false
     groups:
-    - AllAccess
+    - AllAccessBorg
   - type: Lock
     locked: true
   - type: ActivatableUIRequiresLock

Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/shock_collar.yml

@@ -2,13 +2,15 @@
   parent: ClothingNeckBase
   id: ShockCollar
   name: shock collar
-  description: Shocking. Placeholder sprite.
+  description: Shocking. # DeltaV: sprite is fine
   components:
   - type: Sprite
     sprite: Nyanotrasen/Clothing/Neck/Misc/shock.rsi
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Neck/Misc/shock.rsi
   - type: ShockCollar
+  - type: UseDelay
+    delay: 3 # DeltaV: prevent clocks instakilling people
   - type: TriggerOnSignal
   - type: DeviceNetwork
     deviceNetId: Wireless