From 13c6888eeba727999f4fe2e38cbe288d16a95858 Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Mon, 23 Oct 2023 21:05:35 +0900
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20(#508)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix cult blindfold

* Add stamina resistances

* Energy bolt is energy

* Laser shield is anti-laser

* Cult blindfold welding protection

* Eject id cards on deconstruct

* Wires panel power fix

* Add markings for species

* Ebow gaming
---
 .../ActivatableUIRequiresPowerSystem.cs       |  2 --
 .../Entities/Objects/Shields/shields.yml      |  4 ++++
 .../Weapons/Guns/Projectiles/bolts.yml        | 19 +++++++++++++++++--
 .../Construction/Graphs/machines/computer.yml |  7 ++++++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs
index 5f32b4b06b..a5ff99758e 100644
--- a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs
@@ -24,8 +24,6 @@ internal sealed class ActivatableUIRequiresPowerSystem : EntitySystem
     {
         if (args.Cancelled) return;
         if (this.IsPowered(uid, EntityManager)) return;
-        if (TryComp<WiresPanelComponent>(uid, out var panel) && panel.Open)
-            return;
         _popup.PopupCursor(Loc.GetString("base-computer-ui-component-not-powered", ("machine", uid)), args.User);
         args.Cancel();
     }
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 41ac60bc14..cd63946fa3 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -89,6 +89,10 @@
           Heat: 0.7
         flatReductions:
           Heat: 2
+    - type: Reflect
+      reflectProb: 0.25
+      reflects:
+        - Energy
 
 - type: entity
   name: riot bullet shield
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml
index f2dbf59b25..2e9447f8f3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml
@@ -14,7 +14,22 @@
     damage:
       types:
         Poison: 15
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.2,0.1,0.2"
+        hard: false
+        mask:
+        - Opaque
   - type: StunOnCollide
-    stunAmount: 2
-    knockdownAmount: 2
+    stunAmount: 1
+    knockdownAmount: 1
+    slowdownAmount: 3
+    walkSpeedModifier: 0.6
+    runSpeedModifier: 0.4
 
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
index 16a275add4..18585d5057 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Computer
   start: start
   graph:
@@ -126,6 +126,11 @@
             - !type:AllWiresCut {}
           steps:
             - tool: Screwing
+          completed:
+            - !type:EmptyContainer
+              container: IdCardConsole-privilegedId
+            - !type:EmptyContainer
+              container: IdCardConsole-targetId
 
     - node: monitorBroken
       entity: ComputerBroken