Merge remote-tracking branch 'origin/master'

Author: Dunrab

Content.Server/_Floof/Geras/GerasSystem.cs

@@ -4,6 +4,10 @@
 using Content.Server.Popups;
 using Content.Shared._Floof.Geras;
 using Robust.Shared.Player;
+using Content.Server.Body.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Humanoid;
+using Content.Shared.Sprite;
 
 namespace Content.Server._Floof.Geras;
 
@@ -38,8 +42,30 @@ private void OnMorphIntoGeras(EntityUid uid, GerasComponent component, MorphInto
         if (HasComp<ZombieComponent>(uid))
             return; // i hate zomber.
 
+        var colors = GrabHumanoidColors(uid); // begin imp
+
         var ent = _polymorphSystem.PolymorphEntity(uid, component.GerasPolymorphId);
 
+        if (colors != null) // Match Geras to Humanoid Skin color
+        {
+            (var skinColor, var eyeColor) = colors.Value;
+            if (TryComp<RandomSpriteComponent>(ent, out var randomSprite)) // has to use random sprite
+            {
+                foreach (var entry in randomSprite.Selected)
+                {
+                    var state = randomSprite.Selected[entry.Key];
+                    state.Color = entry.Key switch
+                    {
+                        "colorMap" => skinColor,
+                        "eyesMap" => eyeColor,
+                        _ => state.Color
+                    };
+                    randomSprite.Selected[entry.Key] = state;
+                }
+                Dirty(ent.Value, randomSprite);
+            }
+        } // end imp
+
         if (!ent.HasValue)
             return;
 
@@ -48,4 +74,16 @@ private void OnMorphIntoGeras(EntityUid uid, GerasComponent component, MorphInto
 
         args.Handled = true;
     }
+
+    private (Color, Color)? GrabHumanoidColors(EntityUid entity) //imp
+    {
+        if (TryComp<HumanoidAppearanceComponent>(entity, out var humanoid)) // Get Humanoid Appearance
+        {
+            var skinColor = humanoid.SkinColor;
+            var eyeColor = humanoid.EyeColor;
+            return (skinColor, eyeColor);
+        }
+
+        return null; // if a non-humanoid or someone with no bloodstream ascends, don't modify the colors
+    }
 }

Resources/Changelog/Euphoria.yml

@@ -1519,3 +1519,17 @@ Entries:
         emote wheel.
   id: 186
   time: '2026-03-22T07:32:43.0000000+00:00'
+- author: Dunrab
+  changes:
+    - type: Tweak
+      message: Meta's dorms now are dorms airlocks and will start linked.
+    - type: Fix
+      message: Fixed salvage mining shuttle docking to arrivals on Arena.
+  id: 187
+  time: '2026-03-24T09:22:39.0000000+00:00'
+- author: ScarlettJFG
+  changes:
+    - type: Tweak
+      message: Geras have character color now.
+  id: 188
+  time: '2026-03-24T09:33:06.0000000+00:00'

Resources/Maps/Floof/arena.yml

@@ -4,7 +4,7 @@ meta:
   engineVersion: 268.0.0
   forkId: ""
   forkVersion: ""
-  time: 02/23/2026 17:46:48
+  time: 03/08/2026 18:10:13
   entityCount: 28840
 maps:
 - 1
@@ -10511,21 +10511,6 @@ entities:
     - type: Transform
       pos: -14.5,56.5
       parent: 2
-  - uid: 27923
-    components:
-    - type: Transform
-      pos: 44.5,53.5
-      parent: 2
-  - uid: 27924
-    components:
-    - type: Transform
-      pos: 44.5,56.5
-      parent: 2
-  - uid: 27925
-    components:
-    - type: Transform
-      pos: 36.5,55.5
-      parent: 2
 - proto: AirlockArmoryGlassLocked
   entities:
   - uid: 152
@@ -12041,6 +12026,26 @@ entities:
     - type: Transform
       pos: -25.5,-14.5
       parent: 2
+- proto: AirlockLockableDorms
+  entities:
+  - uid: 27923
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,55.5
+      parent: 2
+  - uid: 27924
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,56.5
+      parent: 2
+  - uid: 27925
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,53.5
+      parent: 2
 - proto: AirlockMailGlassLocked
   entities:
   - uid: 381
@@ -12885,7 +12890,7 @@ entities:
       pos: -0.5,-58.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -16724.064
+      secondsUntilStateChange: -16762.701
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -16590,44 +16595,50 @@ entities:
       parent: 2
 - proto: BenchSofaCorpLeft
   entities:
-  - uid: 27927
+  - uid: 27926
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 36.5,58.5
+      pos: 37.5,59.5
       parent: 2
-  - uid: 27933
+  - uid: 27979
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 43.5,51.5
+      pos: 43.5,52.5
       parent: 2
-  - uid: 27934
+  - uid: 28068
     components:
     - type: Transform
-      pos: 44.5,59.5
+      rot: -1.5707963267948966 rad
+      pos: 45.5,58.5
       parent: 2
 - proto: BenchSofaCorpRight
   entities:
-  - uid: 27926
+  - uid: 27927
     components:
     - type: Transform
-      pos: 37.5,59.5
+      rot: 1.5707963267948966 rad
+      pos: 36.5,58.5
       parent: 2
-  - uid: 27979
+  - uid: 27933
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 43.5,52.5
+      pos: 43.5,51.5
       parent: 2
-  - uid: 28068
+  - uid: 27934
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 45.5,58.5
+      pos: 44.5,59.5
       parent: 2
 - proto: BenchSofaLeft
   entities:
+  - uid: 9888
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-0.5
+      parent: 2
   - uid: 9891
     components:
     - type: Transform
@@ -16640,6 +16651,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 30.5,-0.5
       parent: 2
+  - uid: 22068
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-0.5
+      parent: 2
 - proto: BenchSofaMiddle
   entities:
   - uid: 9882
@@ -16652,20 +16669,6 @@ entities:
     - type: Transform
       pos: 31.5,0.5
       parent: 2
-- proto: BenchSofaRight
-  entities:
-  - uid: 9888
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-0.5
-      parent: 2
-  - uid: 22068
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-0.5
-      parent: 2
 - proto: BikeHorn
   entities:
   - uid: 975
@@ -67620,7 +67623,7 @@ entities:
       pos: 23.5,47.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -26895.55
+      secondsUntilStateChange: -26934.188
       state: Opening
   - uid: 27810
     components:
@@ -78916,7 +78919,7 @@ entities:
       pos: -3.5,-52.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -54388.645
+      secondsUntilStateChange: -54427.28
       state: Closing
   - uid: 11888
     components:
@@ -145074,6 +145077,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 38.5,56.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        27923:
+        - - Pressed
+          - DoorBolt
     - type: Fixtures
       fixtures: {}
   - uid: 28070
@@ -145082,6 +145090,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 46.5,51.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        27925:
+        - - Pressed
+          - DoorBolt
     - type: Fixtures
       fixtures: {}
   - uid: 28071
@@ -145090,6 +145103,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 45.5,56.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        27924:
+        - - Pressed
+          - DoorBolt
     - type: Fixtures
       fixtures: {}
   - uid: 28265

Resources/Maps/Floof/meta.yml

@@ -20,18 +20,23 @@
   - type: Item
     size: Huge
   - type: Sprite
-    color: "#FFFFFF55"
+    layers:
+    - map: [ "colorMap" ]
+      state: slime_geras
+    - map: [ "eyesMap" ]
+      state: slime_geras_eyes
+      shader: unshaded
+  - type: RandomSprite
+    selected:
+      colorMap:
+        slime_geras: "#0000FF"
+      eyesMap:
+        slime_geras_eyes: "#0000FF"
   - type: MeleeWeapon
     attackRate: 2
     damage:
       types:
         Blunt: 4
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: blue_adult_slime
-      Dead:
-        Base: blue_adult_slime_dead
   - type: Tag # Floof
     tags:
     - FootstepSound

Resources/Prototypes/_Floof/Entities/Mobs/NPCs/slimes.yml

@@ -109,6 +109,21 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "slime_geras",
+      "delays": [
+        [
+          0.15,
+          0.15,
+          0.15,
+          0.15
+        ]
+      ]
+    },
+    {
+      "name": "slime_geras_eyes",
+      "directions": 4
     }
   ]
 }