Merge branch 'Fansana:master' into edit-lpo

Fansana · Nov 5, 2024 · 81643a4 · 81643a4
2 parents 580dcf0 + 7d05d1d
commit 81643a4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs b/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs
@@ -34,6 +34,8 @@ private void OnPowerUsed(DarkSwapActionEvent args)
 
                 if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost / 2, args.CheckInsulation))
                 {
+                    SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates);
+                    SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(args.Performer).Coordinates);
                     RemComp(args.Performer, ethereal);
                     args.Handled = true;
                 }

diff --git a/Content.Server/Shadowkin/EtherealSystem.cs b/Content.Server/Shadowkin/EtherealSystem.cs
@@ -79,9 +79,6 @@ public override void OnShutdown(EntityUid uid, EtherealComponent component, Comp
         RemComp<RespiratorImmuneComponent>(uid);
         RemComp<MovementIgnoreGravityComponent>(uid);
 
-        SpawnAtPosition("ShadowkinShadow", Transform(uid).Coordinates);
-        SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(uid).Coordinates);
-
         foreach (var light in component.DarkenedLights.ToArray())
         {
             if (!TryComp<PointLightComponent>(light, out var pointLight)
@@ -181,7 +178,7 @@ public override void Update(float frameTime)
 
                 if (etherealLight.AttachedEntity == uid
                     && _random.Prob(0.03f))
-                        etherealLight.AttachedEntity = EntityUid.Invalid;
+                    etherealLight.AttachedEntity = EntityUid.Invalid;
 
                 if (!etherealLight.OldRadiusEdited)
                 {
@@ -213,4 +210,4 @@ public override void Update(float frameTime)
             }
         }
     }
-}
+}
diff --git a/Resources/Prototypes/Floof/Entities/Structures/Furniture/sleeping_bag.yml b/Resources/Prototypes/Floof/Entities/Structures/Furniture/sleeping_bag.yml
@@ -12,6 +12,8 @@
   - type: Construction
     graph: SleepingBag
     node: sleepingbag
+    containers:
+    - entity_storage
   - type: Item
     size: Normal
   - type: Sprite
@@ -64,9 +66,6 @@
           True: {visible: false}
           False: {visible: true}
   - type: Pullable
-  - type: ContainerContainer
-    containers:
-      entity_storage: !type:Container
   - type: EntityStorage
     airtight: false
     capacity: 2
@@ -75,6 +74,9 @@
       path: /Audio/Misc/zip.ogg
     openSound:
       path: /Audio/Misc/zip.ogg
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
 
 - type: entity
   id: SleepingBagFolded

diff --git a/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml
@@ -686,14 +686,12 @@
 - type: reaction
   id: Voltage
   reactants:
-    EnergyDrink:
-      amount: 1
     Rum:
       amount: 2
     Sugar:
       amount: 1
-    Vodka:
-      amount: 2
+    VodkaRedBool:
+      amount: 3
   products:
     Voltage: 6
 
@@ -809,7 +807,7 @@
     JennTonic: 3
 
 - type: reaction
-  id: Hallelujah 
+  id: Hallelujah
   reactants:
     Wine:
       amount: 2