Merge branch 'space-wizards:master' into Thief_rebalance

space-wizards · Sep 23, 2024 · 5fa5b5f · 5fa5b5f
2 parents fe2acfa + 16c46af
commit 5fa5b5f
Show file tree

Hide file tree

Showing 10 changed files with 228 additions and 77 deletions.
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
@@ -39,7 +39,7 @@ public async Task DeconstructComputer()
         await StartDeconstruction(ComputerId);
 
         // Initial interaction turns id computer into generic computer
-        await InteractUsing(Screw);
+        await InteractUsing(Pry);
         AssertPrototype(ComputerFrame);
 
         // Perform deconstruction steps
@@ -69,7 +69,7 @@ public async Task ChangeComputer()
         await SpawnTarget(ComputerId);
 
         // Initial interaction turns id computer into generic computer
-        await InteractUsing(Screw);
+        await InteractUsing(Pry);
         AssertPrototype(ComputerFrame);
 
         // Perform partial deconstruction steps

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,19 +1,4 @@
 Entries:
-- author: Jezithyr
-  changes:
-  - message: Removed the Geras ability from Slimes
-    type: Remove
-  id: 6923
-  time: '2024-07-16T22:50:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29731
-- author: K-Dynamic
-  changes:
-  - message: nerfed paraylze timer of all slippable objects (including soaps, water
-      puddles, and clown-related items)
-    type: Tweak
-  id: 6924
-  time: '2024-07-16T23:26:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/27879
 - author: EmoGarbage404
   changes:
   - message: Resprited wall signs.
@@ -3924,3 +3909,19 @@
   id: 7422
   time: '2024-09-23T07:28:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/32395
+- author: Errant
+  changes:
+  - message: Computers now have a maintenance panel with a Power and AI wire (if AI-connected).
+    type: Tweak
+  - message: Computer deconstruction now begins with the crowbar, not the screwdriver.
+    type: Tweak
+  id: 7423
+  time: '2024-09-23T10:51:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32273
+- author: lzk228
+  changes:
+  - message: Guidebook books now do damage like default writeable books.
+    type: Fix
+  id: 7424
+  time: '2024-09-23T11:12:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32403
diff --git a/Resources/Locale/en-US/wires/wire-names.ftl b/Resources/Locale/en-US/wires/wire-names.ftl
@@ -40,6 +40,7 @@ wires-board-name-fatextractor = FatExtractor
 wires-board-name-flatpacker = Flatpacker
 wires-board-name-spaceheater = Space Heater
 wires-board-name-jukebox = Jukebox
+wires-board-name-computer = Computer
 
 # names that get displayed in the wire hacking hud & admin logs.
 

diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -60,6 +60,15 @@
     openOnActivation: true
     guides:
     - SS14
+  - type: MeleeWeapon  # Should write it again since BaseGuidebook doesn't inherit BookBase
+    soundHit:
+      collection: Punch
+    damage:
+      types:
+        Blunt: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
 
 - type: entity
   id: BookSpaceEncyclopedia

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
@@ -30,6 +30,8 @@
       state: generic
     - map: ["computerLayerKeys"]
       state: generic_keys
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -40,6 +42,10 @@
         computerLayerKeys:
           True: { visible: true, shader: unshaded }
           False: { visible: true, shader: shaded }
+      enum.WiresVisuals.MaintenancePanelState:
+        enum.WiresVisualLayers.MaintenancePanel:
+          True: { visible: false }
+          False: { visible: true }
   - type: LitOnPowered
   - type: PointLight
     radius: 1.5
@@ -61,3 +67,26 @@
   - type: LightningTarget
     priority: 1
   - type: RequireProjectileTarget
+  - type: Electrified
+    enabled: false
+    usesApcPower: true
+  - type: WiresPanel
+  - type: WiresVisuals
+  - type: Wires
+    boardName: wires-board-name-computer
+    layoutId: Computer
+#
+#     This is overwritten by children, so needs to be defined there
+#  - type: UserInterface
+#    interfaces:
+#      enum.WiresUiKey.Key:
+#        type: WiresBoundUserInterface
+
+- type: entity
+  parent: BaseComputer
+  id: BaseComputerAiAccess
+  components:
+  - type: StationAiWhitelist
+  - type: Wires
+    boardName: wires-board-name-computer
+    layoutId: ComputerAi