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(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