Cryo fixes again (#735)

* Fix the DoAfter * Fix again * Fix again
new-frontiers-14 · Dec 22, 2023 · c9c96fc · c9c96fc
1 parent 9487383
commit c9c96fc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs b/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs
@@ -170,8 +170,8 @@ private void OnAutoCryoSleep(EntityUid uid, CryoSleepComponent component, CryoSt
         if (args.Cancelled || args.Handled)
             return;
 
-        var body = args.Used;
-        var pod = args.Target;
+        var pod = args.Used;
+        var body = args.Target;
         if (body is not { Valid: true } || pod is not { Valid: true })
             return;
 
@@ -305,7 +305,7 @@ public bool EjectBody(EntityUid pod, CryoSleepComponent? component = null, Entit
             return false;
 
         component.BodyContainer.Remove(toEject.Value, force: true);
-        _climb.ForciblySetClimbing(toEject.Value, pod);
+        //_climb.ForciblySetClimbing(toEject.Value, pod);
 
         if (component.CryosleepDoAfter != null && _doAfter.GetStatus(component.CryosleepDoAfter) == DoAfterStatus.Running)
             _doAfter.Cancel(component.CryosleepDoAfter);

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/cryo_sleep_pod.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/cryo_sleep_pod.yml
@@ -13,6 +13,17 @@
     delay: 999999
   - type: Physics
     bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 190
+        mask:
+        - MachineMask
+        layer:
+        - MobLayer # To allow people to pass through
   - type: MaterialStorage
   - type: Appearance
   - type: Climbable