Merge branch 'master' into map-testing

DeltaV-Station · Nov 24, 2024 · ddcc1a6 · ddcc1a6
2 parents 07eaff5 + 3a0ec3d
commit ddcc1a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,10 +1,4 @@
 Entries:
-- author: Gregg
-  changes:
-  - message: Adjusted the rules in regards to PDA confiscation and borg memory.
-    type: Tweak
-  id: 206
-  time: '2024-01-19T10:30:34.0000000+00:00'
 - author: DebugOk
   changes:
   - message: Zombies can no longer be psionic
@@ -3764,3 +3758,10 @@
   id: 705
   time: '2024-11-24T10:15:12.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2277
+- author: Big Orthagonal
+  changes:
+  - message: Diagonal secborgs are not real and were never real.
+    type: Fix
+  id: 706
+  time: '2024-11-24T11:57:37.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2278
diff --git a/Resources/Prototypes/DeltaV/borg_types.yml b/Resources/Prototypes/DeltaV/borg_types.yml
@@ -37,6 +37,8 @@
   # Visual
   clientComponents:
   - type: Sprite
+    noRot: true
+    drawdepth: Mobs
     sprite: DeltaV/Mobs/Silicon/chassis.rsi
     layers:
     - state: security