Rebrand, Lobby Art, and Music.

Content.Server/Forensics/Systems/ForensicsSystem.cs

@@ -131,53 +131,32 @@ public void CopyForensicsFrom(ForensicsComponent src, EntityUid target)
 
         private void OnAfterInteract(EntityUid uid, CleansForensicsComponent component, AfterInteractEvent args)
         {
-            if (args.Handled || !args.CanReach)
+            if (args.Handled || !args.CanReach || !TryComp<ForensicsComponent>(args.Target, out var forensicsComp))
                 return;
 
-            if (TryComp<ForensicsComponent>(args.Target, out var forensicsComp)
-                && forensicsComp.DNAs.Count > 0 && forensicsComp.CanDnaBeCleaned
-                && forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count > 0
-                && forensicsComp.Scent != string.Empty)
-            {
-                var cleanDelay = component.CleanDelay;
-                if (HasComp<ScentComponent>(args.Target))
-                    cleanDelay += 30;
+            if ((forensicsComp.DNAs.Count <= 0 || !forensicsComp.CanDnaBeCleaned)
+                && forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count <= 0
+                && forensicsComp.Scent == string.Empty)
+                return; // Nothing to do if there is no DNAs, fibers, and scent
 
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
-                {
-                    BreakOnHandChange = true,
-                    NeedHand = true,
-                    BreakOnDamage = true,
-                    BreakOnTargetMove = true,
-                    MovementThreshold = 0.01f,
-                    DistanceThreshold = forensicsComp.CleanDistance,
-                };
-
-                _doAfterSystem.TryStartDoAfter(doAfterArgs);
-                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", args.Target)), args.User, args.User);
-
-                args.Handled = true;
-                return;
-            }
+            var cleanDelay = component.CleanDelay;
+            if (HasComp<ScentComponent>(args.Target))
+                cleanDelay += 30;
 
-            if (TryComp<ScentComponent>(args.Target, out var scentComp))
+            var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
             {
-                var cleanDelay = component.CleanDelay + 30;
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
-                {
-                    BreakOnHandChange = true,
-                    NeedHand = true,
-                    BreakOnDamage = true,
-                    BreakOnTargetMove = true,
-                    MovementThreshold = 0.01f,
-                    DistanceThreshold = 1.5f,
-                };
-
-                _doAfterSystem.TryStartDoAfter(doAfterArgs);
-                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", args.Target)), args.User, args.User);
-
-                args.Handled = true;
-            }
+                BreakOnHandChange = true,
+                NeedHand = true,
+                BreakOnDamage = true,
+                BreakOnTargetMove = true,
+                MovementThreshold = 0.01f,
+                DistanceThreshold = forensicsComp.CleanDistance,
+            };
+
+            _doAfterSystem.TryStartDoAfter(doAfterArgs);
+            _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", args.Target)), args.User, args.User);
+
+            args.Handled = true;
         }
 
         private void OnCleanForensicsDoAfter(EntityUid uid, ForensicsComponent component, CleanForensicsDoAfterEvent args)
@@ -202,7 +181,8 @@ private void OnCleanForensicsDoAfter(EntityUid uid, ForensicsComponent component
             if (TryComp<ResidueComponent>(args.Used, out var residue))
                 targetComp.Residues.Add(string.IsNullOrEmpty(residue.ResidueColor) ? Loc.GetString("forensic-residue", ("adjective", residue.ResidueAdjective)) : Loc.GetString("forensic-residue-colored", ("color", residue.ResidueColor), ("adjective", residue.ResidueAdjective)));
 
-            // If the ent has a Scent Component, we compleatly generate a new one and apply the new scent to all currently weared items.
+            // If the ent has a Scent Component, we completely generate a new one and apply the new scent to all currently worn items.
+            // TODO this is never gonna work unless you like, wash yourself with the soap???
             if (TryComp<ScentComponent>(args.Target, out var scentComp))
             {
                 var generatedscent = GenerateFingerprint(length: 5);

Content.Shared/Traits/Assorted/Components/SingerComponent.cs

@@ -11,6 +11,9 @@ public sealed partial class SingerComponent : Component
     [DataField(required: true), AutoNetworkedField]
     public ProtoId<SingerInstrumentPrototype> Proto = string.Empty;
 
+    [DataField(serverOnly: true)]
+    public EntProtoId? MidiActionId = "ActionHarpyPlayMidi";
+
     [DataField(serverOnly: true)]
     public EntityUid? MidiAction;
 }

Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs

@@ -33,17 +33,12 @@ private void OnStartup(Entity<SingerComponent> ent, ref ComponentStartup args)
         if (!ProtoMan.TryIndex(ent.Comp.Proto, out var singer))
             return;
 
-        _actionsSystem.AddAction(ent, ref ent.Comp.MidiAction, singer.MidiActionId);
+        _actionsSystem.AddAction(ent, ref ent.Comp.MidiAction, ent.Comp.MidiActionId);
 
         var instrumentComp = EnsureInstrumentComp(ent);
         var defaultData = singer.InstrumentList[singer.DefaultInstrument];
         _instrument.SetInstrumentProgram(instrumentComp, defaultData.Item1, defaultData.Item2);
         SetUpSwappableInstrument(ent, singer);
-
-        EntityManager.TryGetComponent<UserInterfaceComponent>(ent.Owner, out var comp);
-        var entui = new Entity<UserInterfaceComponent?>(ent.Owner, comp);
-        if (singer.MidiUi is { } uiKey && !_ui.IsUiOpen(entui, uiKey))
-            _ui.OpenUi(entui, uiKey, entui);
     }
 
     private void OnShutdown(Entity<SingerComponent> ent, ref ComponentShutdown args)

Resources/Audio/Lobby/attributions.yml

@@ -1,4 +1,9 @@
-- files: ["01 The Gamble.ogg", "02 Guilty Pleasures.ogg", "03 Jazzcuzzi.ogg", "04 The Walk.ogg", "05 Velvet Bossa.ogg", "06 Colors.ogg", "07 Midnight Jam.ogg", "08 Miles Ahead.ogg", "09 Moody.ogg", "10 Flying Away.ogg", "11 Take It Easy.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "All songs used are produced by Danya Vodovoz, royalty free."
-  source: "https://soundcloud.com/danyavodovoz"
+- files: ["bach-toccata.ogg", "vivaldi-spring.ogg", "vivaldi-winter.ogg"]
+  license: "CC-BY-NC-4.0"
+  copyright: "Gregor Quendel"
+  source: "https://freemusicarchive.org"
+
+- files: ["vivaldi-credo-et-carnatust.ogg"]
+  license: "CC-BY-NC-4.0"
+  copyright: "Advent Chamber Orchestra"
+  source: "https://freemusicarchive.org"

Resources/Audio/StationEvents/attributions.yml

@@ -1,14 +1,4 @@
-- files: ["running_out.ogg"]
+- files: ["hallofthemountainking.ogg.ogg"]
   license: "CC-BY-3.0"
-  copyright: "Created by Bolgarich"
-  source: "https://www.youtube.com/watch?v=SzEp2nv6oZ4"
-
-- files: ["clearly_nuclear.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "Created by mryikes"
-  source: "https://www.youtube.com/watch?v=chix8uz-oUQ"
-
-- files: ["chip_nightmare.ogg"]
-  license: "CC-BY-SA-4.0"
-  copyright: "Created by BasedUser on top of chip-meltdown.mod by Reanimator (Thom)."
-  source: "http://ygg.baseduser.eu.org/chip-nightmare_ss14.ogg"
+  copyright: "Created by Kevin MacLeod"
+  source: "https://www.youtube.com/watch?v=2RDX5sVEfs4"

Resources/Changelog/Changelog.yml

@@ -7315,3 +7315,17 @@ Entries:
   id: 6456
   time: '2024-10-16T12:55:19.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1052
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: 'Fixed Harpy singing not opening the Midi Player. '
+  id: 6457
+  time: '2024-10-16T22:51:18.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1056
+- author: Mnemotechnician
+  changes:
+    - type: Fix
+      message: Soap once again can be used to clean evidence off.
+  id: 6458
+  time: '2024-10-16T22:54:33.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1061

Resources/Prototypes/Entities/Mobs/Species/base.yml

@@ -197,6 +197,9 @@
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
+      enum.InstrumentUiKey.Key:
+        type: InstrumentBoundUserInterface
+        requireInputValidation: false
   - type: Puller
   - type: Speech
     speechSounds: Alto

Resources/Prototypes/SoundCollections/NukeMusic.yml

@@ -1,7 +1,4 @@
 - type: soundCollection
   id: NukeMusic
   files:
-    - /Audio/StationEvents/running_out.ogg
-    - /Audio/StationEvents/countdown.ogg
-    - /Audio/StationEvents/clearly_nuclear.ogg
-    - /Audio/StationEvents/chip_nightmare.ogg
+    - /Audio/StationEvents/hallofthemountainking.ogg

Resources/Prototypes/SoundCollections/lobby.yml

@@ -1,21 +1,8 @@
 - type: soundCollection
   id: LobbyMusic
   files:
-    #- /Audio/Lobby/434387_Time_Lapse_of_Clouds.ogg
-    - /Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg
-    - /Audio/Lobby/aggravated.it.ogg
-    - /Audio/Lobby/autumnal_equinox.xm.ogg
-    - /Audio/Lobby/comet_haley.ogg
-    #- /Audio/Lobby/drozerix_-_alone.xm.ogg
-    - /Audio/Lobby/drozerix_-_leisurely_voice.xm.ogg
-    - /Audio/Lobby/endless_space.ogg
-    - /Audio/Lobby/marhaba.ogg
-    - /Audio/Lobby/melcom-cyberpunk.it.ogg
-    - /Audio/Lobby/midori_-_conundrum_final.it.ogg
-    - /Audio/Lobby/mod.flip-flap.ogg
-    - /Audio/Lobby/psirius_-_nights_of_orion.xm.ogg
-    #- /Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg
-    - /Audio/Lobby/superposition.ogg
-    - /Audio/Lobby/hackers.ogg
-    - /Audio/Lobby/every_light_is_blinking_at_once.ogg
-    - /Audio/Lobby/DOS=HIGH,_UMB.ogg
+    - /Audio/Lobby/bach-toccata.ogg
+    - /Audio/Lobby/vivaldi-credo-et-carnatust.ogg
+    - /Audio/Lobby/vivaldi-spring.ogg
+    - /Audio/Lobby/vivaldi-winter.ogg
+

Resources/Prototypes/lobbyscreens.yml

@@ -1,43 +1,15 @@
 - type: lobbyBackground
-  id: Robotics
-  background: /Textures/LobbyScreens/robotics.webp
+  id: NightWatch
+  background: /Textures/LobbyScreens/nightwatch.webp
 
 - type: lobbyBackground
-  id: Supermatter
-  background: /Textures/LobbyScreens/supermatter.webp
+  id: LibraryGuidingThePeople
+  background: /Textures/LobbyScreens/library-guiding-the-people.webp
 
 - type: lobbyBackground
-  id: Warden
-  background: /Textures/LobbyScreens/warden.webp
+  id: SchoolOfAthens
+  background: /Textures/LobbyScreens/school-of-athens.webp
 
 - type: lobbyBackground
-  id: Pharmacy
-  background: /Textures/LobbyScreens/pharmacy.webp
-
-- type: lobbyBackground
-  id: SSXIV
-  background: /Textures/LobbyScreens/ssxiv.webp
-
-- type: lobbyBackground
-  id: Susstation
-  background: /Textures/LobbyScreens/susstation.webp
-
-- type: lobbyBackground
-  id: SkellyVsTheRev
-  background: /Textures/LobbyScreens/skellyvstherev.webp
-
-- type: lobbyBackground
-  id: Doomed
-  background: /Textures/LobbyScreens/doomed.webp
-
-- type: lobbyBackground
-  id: Blueprint
-  background: /Textures/LobbyScreens/blueprint.webp
-
-- type: lobbyBackground
-  id: TerminalStation
-  background: /Textures/LobbyScreens/terminalstation.webp
-
-- type: lobbyBackground
-  id: JustAWeekAway
-  background: /Textures/LobbyScreens/justaweekaway.webp
+  id: LastSupper
+  background: /Textures/LobbyScreens/last-supper.webp

Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json

@@ -31,6 +31,10 @@
       "name": "equipped-head-unshaded",
       "directions": 4
     },
+    {
+      "name": "equipped-head-unshaded-vox",
+      "directions": 4
+    },
     {
       "name": "equipped-head-vox",
       "directions": 4

Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json

@@ -32,6 +32,10 @@
       "name": "equipped-head-unshaded",
       "directions": 4
     },
+    {
+      "name": "equipped-head-unshaded-vox",
+      "directions": 4
+    },
     {
       "name": "equipped-head-vox",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json

@@ -18,6 +18,10 @@
         "name": "equipped-OUTERCLOTHING-harpy",
         "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-vox",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json

@@ -18,6 +18,10 @@
         "name": "equipped-OUTERCLOTHING-harpy",
         "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-vox",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json

@@ -18,6 +18,10 @@
         "name": "equipped-OUTERCLOTHING-harpy",
         "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-vox",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json

@@ -18,6 +18,10 @@
         "name": "equipped-OUTERCLOTHING-harpy",
         "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-vox",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json

@@ -18,6 +18,10 @@
         "name": "equipped-OUTERCLOTHING-harpy",
         "directions": 4
     },
+    {
+        "name": "equipped-OUTERCLOTHING-vox",
+        "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4