Merge branch 'DeltaV-Station:master' into master

Carolyn3114 · Dec 3, 2023 · 6b0b917 · 6b0b917
2 parents f506755 + e829b13
commit 6b0b917
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -205,10 +205,11 @@ public bool CanStart(EntityUid uid, MaterialReclaimerComponent component)
     /// </summary>
     public bool CanGib(EntityUid uid, EntityUid victim, MaterialReclaimerComponent component)
     {
-        return component.Powered &&
-               component.Enabled &&
-               HasComp<BodyComponent>(victim) &&
-               HasComp<EmaggedComponent>(uid);
+        return false; // DeltaV - Kinda LRP
+        // return component.Powered &&
+        //       component.Enabled &&
+        //       HasComp<BodyComponent>(victim) &&
+        //       HasComp<EmaggedComponent>(uid);
     }
 
     /// <summary>

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1017,3 +1017,12 @@ Entries:
         by science.
   id: 152
   time: '2023-11-27T22:42:27.0000000+00:00'
+- author: DebugOk
+  changes:
+    - type: Tweak
+      message: >-
+        Mindshields are now made with significantly cheaper components, and they
+        dont fuse properly anymore. Meaning they can be removed with a little
+        effort.
+  id: 153
+  time: '2023-12-03T00:48:41.0000000+00:00'
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -306,7 +306,7 @@
   noSpawn: true
   components:
    - type: SubdermalImplant
-     permanent: true
+     #permanent: true # DeltaV - Temporarily allow them to be removed until a special item for this is created
    - type: Tag
      tags:
        - MindShield