Merge branch 'master' into engitape

Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>

Resources/Changelog/DeltaVChangelog.yml

@@ -1,23 +1,4 @@
 Entries:
-- author: NoElkaTheGod
-  changes:
-  - message: Fixed ghosts not being able to see things like the monument or telegnostic
-      projections.
-    type: Fix
-  - message: Fixed entropic colossi not being able to see the monument.
-    type: Fix
-  id: 1606
-  time: '2025-08-18T11:57:52.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4226
-- author: NoElkaTheGod
-  changes:
-  - message: Cosmic cultists can now siphon targets that are in critical condition.
-      This would give much more entropy, but also kill the target. Mindshielded targets
-      give even more entropy.
-    type: Tweak
-  id: 1607
-  time: '2025-08-18T12:57:15.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/4178
 - author: HTMLSystem
   changes:
   - message: The engi department loadouts has had more options added.
@@ -4481,4 +4462,18 @@
   id: 2105
   time: '2026-01-27T16:05:20.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/5284
+- author: Pharaz4
+  changes:
+  - message: Wizard has been disabled pending a balance update.
+    type: Remove
+  id: 2106
+  time: '2026-01-27T17:55:11.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5228
+- author: Toby222
+  changes:
+  - message: Prevented the plasteel market from crashing and burning.
+    type: Fix
+  id: 2107
+  time: '2026-01-27T18:58:24.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5298
 Order: 1

Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml

@@ -1,4 +1,4 @@
-# base
+# base
 
 - type: entity
   id: VendingMachine
@@ -2211,7 +2211,7 @@
   - type: VendingMachine
     pack: TankDispenserEVAInventory
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers
+    sprite: _DV/Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualizer for remaining tanks as layers # Delta V - Changed Sprites
     state: dispenser
 
 - type: entity
@@ -2224,7 +2224,7 @@
   - type: VendingMachine
     pack: TankDispenserEngineeringInventory
   - type: Sprite
-    sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers
+    sprite: _DV/Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualizer for remaining tanks as layers # Delta V - Changed Sprites
     layers:
     - state: dispenser
     - state: dispensereng

Resources/Prototypes/GameRules/events.yml

@@ -51,7 +51,7 @@
     - id: SleeperAgents
     - id: ZombieOutbreak
     - id: LoneOpsSpawn
-    - id: WizardSpawn
+    #- id: WizardSpawn # DeltaV - Disabled until overhauled
     - !type:NestedSelector
       tableId: DerelictBorgEventTable
 

Resources/Prototypes/GameRules/roundstart.yml

@@ -22,8 +22,8 @@
     rules:
     - id: Thief
       prob: 0.5
-    - id: SubWizard
-      prob: 0.05
+    #- id: SubWizard # Delta V - Removed until overhauled
+    #  prob: 0.05
     - id: Devil # Goob
       prob: 0.05 # DeltaV - Was 0.02
 

Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml

@@ -4,7 +4,7 @@
   id: EngineeringStaticDeltaV
   recipes:
   - HolotapeProjector
-  - SheetPlasteel
+  - SheetPlasteel1Engineering
 
 ## Dynamic
 

Resources/Prototypes/_DV/Recipes/Lathes/misc.yml

@@ -61,8 +61,8 @@
   result: FloorTileItemMowedAstroSnow
 
 - type: latheRecipe
-  id: SheetPlasteel
-  result: SheetPlasteel
+  id: SheetPlasteel1Engineering
+  result: SheetPlasteel1
   completetime: 1
   materials:
     Steel: 200

Resources/Textures/_DV/Structures/Machines/VendingMachines/tankdispenser.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177, eng layer by peptide",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "dispenser"
+        },
+        {
+            "name": "dispensereng"
+        }
+    ]
+}