diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs index b26a361d5a..8f91ec41e8 100644 --- a/Content.Server/Forensics/Systems/ForensicsSystem.cs +++ b/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(args.Target, out var forensicsComp)) return; - if (TryComp(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(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(args.Target)) + cleanDelay += 30; - if (TryComp(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(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(args.Target, out var scentComp)) { var generatedscent = GenerateFingerprint(length: 5); diff --git a/Content.Shared/Traits/Assorted/Components/SingerComponent.cs b/Content.Shared/Traits/Assorted/Components/SingerComponent.cs index 9c79166ef6..f36969e742 100644 --- a/Content.Shared/Traits/Assorted/Components/SingerComponent.cs +++ b/Content.Shared/Traits/Assorted/Components/SingerComponent.cs @@ -11,6 +11,9 @@ public sealed partial class SingerComponent : Component [DataField(required: true), AutoNetworkedField] public ProtoId Proto = string.Empty; + [DataField(serverOnly: true)] + public EntProtoId? MidiActionId = "ActionHarpyPlayMidi"; + [DataField(serverOnly: true)] public EntityUid? MidiAction; } diff --git a/Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs b/Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs index f772075dfb..56f76af9bb 100644 --- a/Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs +++ b/Content.Shared/Traits/Assorted/Systems/SharedSingerSystem.cs @@ -33,17 +33,12 @@ private void OnStartup(Entity 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(ent.Owner, out var comp); - var entui = new Entity(ent.Owner, comp); - if (singer.MidiUi is { } uiKey && !_ui.IsUiOpen(entui, uiKey)) - _ui.OpenUi(entui, uiKey, entui); } private void OnShutdown(Entity ent, ref ComponentShutdown args) diff --git a/Resources/Audio/Lobby/01 The Gamble.ogg b/Resources/Audio/Lobby/01 The Gamble.ogg deleted file mode 100644 index c1cfdd5385..0000000000 Binary files a/Resources/Audio/Lobby/01 The Gamble.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/02 Guilty Pleasures.ogg b/Resources/Audio/Lobby/02 Guilty Pleasures.ogg deleted file mode 100644 index 9a281d1948..0000000000 Binary files a/Resources/Audio/Lobby/02 Guilty Pleasures.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/03 Jazzcuzzi.ogg b/Resources/Audio/Lobby/03 Jazzcuzzi.ogg deleted file mode 100644 index 49e7a33205..0000000000 Binary files a/Resources/Audio/Lobby/03 Jazzcuzzi.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/04 The Walk.ogg b/Resources/Audio/Lobby/04 The Walk.ogg deleted file mode 100644 index 481b08e650..0000000000 Binary files a/Resources/Audio/Lobby/04 The Walk.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/05 Velvet Bossa.ogg b/Resources/Audio/Lobby/05 Velvet Bossa.ogg deleted file mode 100644 index dcb639de43..0000000000 Binary files a/Resources/Audio/Lobby/05 Velvet Bossa.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/06 Colors.ogg b/Resources/Audio/Lobby/06 Colors.ogg deleted file mode 100644 index 83a8d3a3ee..0000000000 Binary files a/Resources/Audio/Lobby/06 Colors.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/07 Midnight Jam.ogg b/Resources/Audio/Lobby/07 Midnight Jam.ogg deleted file mode 100644 index 18e4e8de8a..0000000000 Binary files a/Resources/Audio/Lobby/07 Midnight Jam.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/08 Miles Ahead.ogg b/Resources/Audio/Lobby/08 Miles Ahead.ogg deleted file mode 100644 index db632e7721..0000000000 Binary files a/Resources/Audio/Lobby/08 Miles Ahead.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/09 Moody.ogg b/Resources/Audio/Lobby/09 Moody.ogg deleted file mode 100644 index 29720317d2..0000000000 Binary files a/Resources/Audio/Lobby/09 Moody.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/10 Flying Away.ogg b/Resources/Audio/Lobby/10 Flying Away.ogg deleted file mode 100644 index 84bda9db8f..0000000000 Binary files a/Resources/Audio/Lobby/10 Flying Away.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/11 Take It Easy.ogg b/Resources/Audio/Lobby/11 Take It Easy.ogg deleted file mode 100644 index f305357554..0000000000 Binary files a/Resources/Audio/Lobby/11 Take It Easy.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/434387_Time_Lapse_of_Clouds.ogg b/Resources/Audio/Lobby/434387_Time_Lapse_of_Clouds.ogg deleted file mode 100644 index 3a1cbd84ab..0000000000 Binary files a/Resources/Audio/Lobby/434387_Time_Lapse_of_Clouds.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/DOS=HIGH,_UMB.ogg b/Resources/Audio/Lobby/DOS=HIGH,_UMB.ogg deleted file mode 100644 index 792951969b..0000000000 Binary files a/Resources/Audio/Lobby/DOS=HIGH,_UMB.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg b/Resources/Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg deleted file mode 100644 index b519711768..0000000000 Binary files a/Resources/Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/aggravated.it.ogg b/Resources/Audio/Lobby/aggravated.it.ogg deleted file mode 100644 index 0e633d7f62..0000000000 Binary files a/Resources/Audio/Lobby/aggravated.it.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml index 9e777c37d1..3ccbac1f10 100644 --- a/Resources/Audio/Lobby/attributions.yml +++ b/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" diff --git a/Resources/Audio/Lobby/autumnal_equinox.xm.ogg b/Resources/Audio/Lobby/autumnal_equinox.xm.ogg deleted file mode 100644 index 9d47c47d57..0000000000 Binary files a/Resources/Audio/Lobby/autumnal_equinox.xm.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/bach-toccata.ogg b/Resources/Audio/Lobby/bach-toccata.ogg new file mode 100644 index 0000000000..04d6c3fd97 Binary files /dev/null and b/Resources/Audio/Lobby/bach-toccata.ogg differ diff --git a/Resources/Audio/Lobby/comet_haley.ogg b/Resources/Audio/Lobby/comet_haley.ogg deleted file mode 100644 index 3b2eed5ed6..0000000000 Binary files a/Resources/Audio/Lobby/comet_haley.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/drozerix_-_alone.xm.ogg b/Resources/Audio/Lobby/drozerix_-_alone.xm.ogg deleted file mode 100644 index cb3e2a65a4..0000000000 Binary files a/Resources/Audio/Lobby/drozerix_-_alone.xm.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/drozerix_-_leisurely_voice.xm.ogg b/Resources/Audio/Lobby/drozerix_-_leisurely_voice.xm.ogg deleted file mode 100644 index 7589fd9c04..0000000000 Binary files a/Resources/Audio/Lobby/drozerix_-_leisurely_voice.xm.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/endless_space.ogg b/Resources/Audio/Lobby/endless_space.ogg deleted file mode 100644 index 8325f05c5b..0000000000 Binary files a/Resources/Audio/Lobby/endless_space.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/every_light_is_blinking_at_once.ogg b/Resources/Audio/Lobby/every_light_is_blinking_at_once.ogg deleted file mode 100644 index ef19f504f2..0000000000 Binary files a/Resources/Audio/Lobby/every_light_is_blinking_at_once.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/flip-flap.txt b/Resources/Audio/Lobby/flip-flap.txt deleted file mode 100644 index df2274855e..0000000000 --- a/Resources/Audio/Lobby/flip-flap.txt +++ /dev/null @@ -1,42 +0,0 @@ -Short: FASt sWINNGy - jAZZy mODULe [PT] -Author: X-CEED / eNDZEIt (x-ceed@union.org.pl) -Uploader: X-CEED / eNDZEIt (x-ceed union org pl) -Type: mods/xceed -Architecture: generic - - - ..ooOO(()) aLl yOu nEEd iZ dA mUsIc bY X-cEEd! (())OOoo.. - _______ _______ -x\----- \ ____)\ X-[EE[) \----- \ ____)\ - c\ \/ / \ \/ / - e\ / the musician of \ / - e\ / / \ / / - d/ / eNDZEIt & aPPeNDIx / /x - / / \ / / \c - / ____ \ e-mail: x-ceed@union.org.pl / ____ \e - )/ \ \ phone: +48 (o22)7749849 )/ \ \e - \______\ irc: #amisia, #amigascne \______\d - - ..ooOO(()) aLl yOu nEEd iZ dA mUsIc bY X-cEEd! (())OOoo.. - - - /X/ fLIP-fLAP \X\ - - bY - - X-CEED of eNDZEIt & aPPeNDIx - - -ATTENTION - ATTENTION - ATTENTION - ATTENTION - ATTENTION - ATTENTION ---------------------------------------------------------------------- - - This music is copyrighted by - Wojciech ("X-CEED") Panufnik and - MAY NOT be sold without my personal permision. - You can distribute and spread it as long as - you don't take money for that. If - you want to make any profit on it, - please contact me. - ---------------------------------------------------------------------- -ATTENTION---ATTENTION---ATTENTION---ATTENTION---ATTENTION---ATTENTION diff --git a/Resources/Audio/Lobby/hackers.ogg b/Resources/Audio/Lobby/hackers.ogg deleted file mode 100644 index 8460cd752f..0000000000 Binary files a/Resources/Audio/Lobby/hackers.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/marhaba.ogg b/Resources/Audio/Lobby/marhaba.ogg deleted file mode 100644 index 7aa5902f15..0000000000 Binary files a/Resources/Audio/Lobby/marhaba.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/melcom-cyberpunk.it.ogg b/Resources/Audio/Lobby/melcom-cyberpunk.it.ogg deleted file mode 100644 index 5cddbf907c..0000000000 Binary files a/Resources/Audio/Lobby/melcom-cyberpunk.it.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/midori_-_conundrum_final.it.ogg b/Resources/Audio/Lobby/midori_-_conundrum_final.it.ogg deleted file mode 100644 index f873383718..0000000000 Binary files a/Resources/Audio/Lobby/midori_-_conundrum_final.it.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/mod.flip-flap.ogg b/Resources/Audio/Lobby/mod.flip-flap.ogg deleted file mode 100644 index dd582c564f..0000000000 Binary files a/Resources/Audio/Lobby/mod.flip-flap.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/psirius_-_nights_of_orion.xm.ogg b/Resources/Audio/Lobby/psirius_-_nights_of_orion.xm.ogg deleted file mode 100644 index 9a2d624bb0..0000000000 Binary files a/Resources/Audio/Lobby/psirius_-_nights_of_orion.xm.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg b/Resources/Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg deleted file mode 100644 index dcad39255e..0000000000 Binary files a/Resources/Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/superposition.ogg b/Resources/Audio/Lobby/superposition.ogg deleted file mode 100644 index 3c16ed2b12..0000000000 Binary files a/Resources/Audio/Lobby/superposition.ogg and /dev/null differ diff --git a/Resources/Audio/Lobby/vivaldi-credo-et-carnatust.ogg b/Resources/Audio/Lobby/vivaldi-credo-et-carnatust.ogg new file mode 100644 index 0000000000..b9ad187ead Binary files /dev/null and b/Resources/Audio/Lobby/vivaldi-credo-et-carnatust.ogg differ diff --git a/Resources/Audio/Lobby/vivaldi-spring.ogg b/Resources/Audio/Lobby/vivaldi-spring.ogg new file mode 100644 index 0000000000..462c67bc74 Binary files /dev/null and b/Resources/Audio/Lobby/vivaldi-spring.ogg differ diff --git a/Resources/Audio/Lobby/vivaldi-winter.ogg b/Resources/Audio/Lobby/vivaldi-winter.ogg new file mode 100644 index 0000000000..40dfc1c207 Binary files /dev/null and b/Resources/Audio/Lobby/vivaldi-winter.ogg differ diff --git a/Resources/Audio/StationEvents/attribution.txt b/Resources/Audio/StationEvents/attribution.txt deleted file mode 100644 index 84a99426d3..0000000000 --- a/Resources/Audio/StationEvents/attribution.txt +++ /dev/null @@ -1 +0,0 @@ -countdown.ogg is created by qwertyquerty and licensed under CC-BY-SA-3.0. It is taken from https://github.com/BeeStation/BeeStation-Hornet at commit 79b8cc23cfb347cf23ea70fc5f6f39afedf9cde7. diff --git a/Resources/Audio/StationEvents/attributions.yml b/Resources/Audio/StationEvents/attributions.yml index 9b3ad13484..744b03cab0 100644 --- a/Resources/Audio/StationEvents/attributions.yml +++ b/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" diff --git a/Resources/Audio/StationEvents/chip_nightmare.ogg b/Resources/Audio/StationEvents/chip_nightmare.ogg deleted file mode 100644 index c721c0ca24..0000000000 Binary files a/Resources/Audio/StationEvents/chip_nightmare.ogg and /dev/null differ diff --git a/Resources/Audio/StationEvents/clearly_nuclear.ogg b/Resources/Audio/StationEvents/clearly_nuclear.ogg deleted file mode 100644 index 2c8b18e1b1..0000000000 Binary files a/Resources/Audio/StationEvents/clearly_nuclear.ogg and /dev/null differ diff --git a/Resources/Audio/StationEvents/countdown.ogg b/Resources/Audio/StationEvents/countdown.ogg deleted file mode 100644 index bd34212158..0000000000 Binary files a/Resources/Audio/StationEvents/countdown.ogg and /dev/null differ diff --git a/Resources/Audio/StationEvents/hallofthemountainking.ogg b/Resources/Audio/StationEvents/hallofthemountainking.ogg new file mode 100644 index 0000000000..7e28eeb708 Binary files /dev/null and b/Resources/Audio/StationEvents/hallofthemountainking.ogg differ diff --git a/Resources/Audio/StationEvents/running_out.ogg b/Resources/Audio/StationEvents/running_out.ogg deleted file mode 100644 index 3b64a23054..0000000000 Binary files a/Resources/Audio/StationEvents/running_out.ogg and /dev/null differ diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bdd73a7aa3..96ce3622f1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 271ef0c1bd..c0d23c489c 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/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 diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml index b101719139..5439777b16 100644 --- a/Resources/Prototypes/SoundCollections/NukeMusic.yml +++ b/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 diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index 263ea38645..016ac6b309 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/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 + diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml index d8c5d28379..a3fdcda714 100644 --- a/Resources/Prototypes/lobbyscreens.yml +++ b/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 \ No newline at end of file + id: LastSupper + background: /Textures/LobbyScreens/last-supper.webp diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index 8236090f7a..c24aa39b80 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json index 29335fd904..64ba4dc5d6 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json index 458fb144f7..2edd20e1dc 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json index 226372c9d3..cde1c05977 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json index 8d09b75006..87ae5d0fb0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json index 9f4fd0c063..5edb377409 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json index 8c3ddde70a..e3387cff96 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt b/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt deleted file mode 100644 index 7d7777fa10..0000000000 --- a/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt +++ /dev/null @@ -1,3 +0,0 @@ -Note: -PNG, JPEG and WebP is supported. Please prefer a lossy WebP compression since lobby art is big. -You also need to put a prototype in Resources/Prototypes/lobbyscreens.yml diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml index 4dd3dc945b..392a0bf790 100644 --- a/Resources/Textures/LobbyScreens/attributions.yml +++ b/Resources/Textures/LobbyScreens/attributions.yml @@ -1,44 +1,19 @@ -- files: ["supermatter.webp", "robotics.webp"] - license: "CC-BY-NC-SA-3.0" - copyright: "Veritius#2351 (257233913951289344) on discord / @Veritius on GitHub" - source: "https://github.com/Veritius" - -- files: ["warden.webp", "pharmacy.webp"] - license: "CC-BY-NC-SA-3.0" - copyright: "Solbusaur#4343 (220208697429852160) on discord" - source: "https://github.com/space-wizards/space-station-14" - -- files: ["ssxiv.webp"] - license: "CC-BY-NC-SA-3.0" - copyright: "Abyssal#4842 on discord / @aby_doodles on Twitter" - source: "https://twitter.com/aby_doodles" - -- files: ["susstation.webp"] - license: "CC-BY-NC-SA-3.0" - copyright: "Alekshhh github" - source: "https://github.com/space-wizards/space-station-14" - -- files: ["skellyvstherev.webp"] - license: "CC-BY-SA-4.0" - copyright: "Hannah 'FairlySadPanda' Dawson 2024" - source: "https://github.com/FairlySadPanda" - -- files: ["doomed.webp"] - license: "CC-BY-NC-SA-3.0" - copyright: "brainfood1183 github" - source: "https://github.com/space-wizards/space-station-14" +- files: ["nightwatch.webp"] + license: "CC-BY-SA-3.0" + copyright: "Piras314" + source: "https://goobstation.com" -- files: ["blueprint.webp"] - license: "CC-BY-NC-SA-3.0" - copyright: "data_redacted on discord" - source: "https://github.com/space-wizards/space-station-14" +- files: ["library-guiding-the-people.webp"] + license: "CC-BY-SA-3.0" + copyright: "Piras314" + source: "https://goobstation.com" -- files: ["terminalstation.webp"] +- files: ["school-of-athens.webp"] license: "CC-BY-SA-3.0" - copyright: "aserovich on discord" - source: "https://github.com/space-wizards/space-station-14" + copyright: "Piras314" + source: "https://goobstation.com" -- files: ["justaweekaway.webp"] +- files: ["last-supper.webp"] license: "CC-BY-SA-3.0" - copyright: "plantyfern on discord" - source: "https://github.com/space-wizards/space-station-14" \ No newline at end of file + copyright: "Piras314" + source: "https://goobstation.com" diff --git a/Resources/Textures/LobbyScreens/blueprint.png.yml b/Resources/Textures/LobbyScreens/blueprint.png.yml deleted file mode 100644 index 5c43e23305..0000000000 --- a/Resources/Textures/LobbyScreens/blueprint.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/LobbyScreens/blueprint.webp b/Resources/Textures/LobbyScreens/blueprint.webp deleted file mode 100644 index 50f88f55a2..0000000000 Binary files a/Resources/Textures/LobbyScreens/blueprint.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/doomed.webp b/Resources/Textures/LobbyScreens/doomed.webp deleted file mode 100644 index 58a7313b23..0000000000 Binary files a/Resources/Textures/LobbyScreens/doomed.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/justaweekaway.yml b/Resources/Textures/LobbyScreens/justaweekaway.yml deleted file mode 100644 index 5c43e23305..0000000000 --- a/Resources/Textures/LobbyScreens/justaweekaway.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/LobbyScreens/last-supper.webp b/Resources/Textures/LobbyScreens/last-supper.webp new file mode 100644 index 0000000000..062c2e2d88 Binary files /dev/null and b/Resources/Textures/LobbyScreens/last-supper.webp differ diff --git a/Resources/Textures/LobbyScreens/doomed.webp.yml b/Resources/Textures/LobbyScreens/last-supper.webp.yml similarity index 100% rename from Resources/Textures/LobbyScreens/doomed.webp.yml rename to Resources/Textures/LobbyScreens/last-supper.webp.yml diff --git a/Resources/Textures/LobbyScreens/library-guiding-the-people.webp b/Resources/Textures/LobbyScreens/library-guiding-the-people.webp new file mode 100644 index 0000000000..66dbea4da3 Binary files /dev/null and b/Resources/Textures/LobbyScreens/library-guiding-the-people.webp differ diff --git a/Resources/Textures/LobbyScreens/robotics.webp.yml b/Resources/Textures/LobbyScreens/library-guiding-the-people.webp.yml similarity index 100% rename from Resources/Textures/LobbyScreens/robotics.webp.yml rename to Resources/Textures/LobbyScreens/library-guiding-the-people.webp.yml diff --git a/Resources/Textures/LobbyScreens/nightwatch.webp b/Resources/Textures/LobbyScreens/nightwatch.webp new file mode 100644 index 0000000000..47acc9b4b6 Binary files /dev/null and b/Resources/Textures/LobbyScreens/nightwatch.webp differ diff --git a/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml b/Resources/Textures/LobbyScreens/nightwatch.webp.yml similarity index 100% rename from Resources/Textures/LobbyScreens/skellyvstherev.webp.yml rename to Resources/Textures/LobbyScreens/nightwatch.webp.yml diff --git a/Resources/Textures/LobbyScreens/pharmacy.webp b/Resources/Textures/LobbyScreens/pharmacy.webp deleted file mode 100644 index 0ee24d88be..0000000000 Binary files a/Resources/Textures/LobbyScreens/pharmacy.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/pharmacy.webp.yml b/Resources/Textures/LobbyScreens/pharmacy.webp.yml deleted file mode 100644 index 51ff40335e..0000000000 --- a/Resources/Textures/LobbyScreens/pharmacy.webp.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: false diff --git a/Resources/Textures/LobbyScreens/robotics.webp b/Resources/Textures/LobbyScreens/robotics.webp deleted file mode 100644 index 43d32581cf..0000000000 Binary files a/Resources/Textures/LobbyScreens/robotics.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/school-of-athens.webp b/Resources/Textures/LobbyScreens/school-of-athens.webp new file mode 100644 index 0000000000..e992740b60 Binary files /dev/null and b/Resources/Textures/LobbyScreens/school-of-athens.webp differ diff --git a/Resources/Textures/LobbyScreens/ssxiv.webp.yml b/Resources/Textures/LobbyScreens/school-of-athens.webp.yml similarity index 100% rename from Resources/Textures/LobbyScreens/ssxiv.webp.yml rename to Resources/Textures/LobbyScreens/school-of-athens.webp.yml diff --git a/Resources/Textures/LobbyScreens/skellyvstherev.webp b/Resources/Textures/LobbyScreens/skellyvstherev.webp deleted file mode 100644 index 09bcf5b2f7..0000000000 Binary files a/Resources/Textures/LobbyScreens/skellyvstherev.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/ssxiv.webp b/Resources/Textures/LobbyScreens/ssxiv.webp deleted file mode 100644 index 32e248f802..0000000000 Binary files a/Resources/Textures/LobbyScreens/ssxiv.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/supermatter.webp b/Resources/Textures/LobbyScreens/supermatter.webp deleted file mode 100644 index d5fb190ae6..0000000000 Binary files a/Resources/Textures/LobbyScreens/supermatter.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/supermatter.webp.yml b/Resources/Textures/LobbyScreens/supermatter.webp.yml deleted file mode 100644 index dabd6601f7..0000000000 --- a/Resources/Textures/LobbyScreens/supermatter.webp.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/LobbyScreens/susstation.webp b/Resources/Textures/LobbyScreens/susstation.webp deleted file mode 100644 index c30abb4670..0000000000 Binary files a/Resources/Textures/LobbyScreens/susstation.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/susstation.webp.yml b/Resources/Textures/LobbyScreens/susstation.webp.yml deleted file mode 100644 index dabd6601f7..0000000000 --- a/Resources/Textures/LobbyScreens/susstation.webp.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/LobbyScreens/terminalstation.webp b/Resources/Textures/LobbyScreens/terminalstation.webp deleted file mode 100644 index ae7cab269d..0000000000 Binary files a/Resources/Textures/LobbyScreens/terminalstation.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/terminalstation.webp.yml b/Resources/Textures/LobbyScreens/terminalstation.webp.yml deleted file mode 100644 index 5c43e23305..0000000000 --- a/Resources/Textures/LobbyScreens/terminalstation.webp.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/LobbyScreens/warden.webp b/Resources/Textures/LobbyScreens/warden.webp deleted file mode 100644 index 997bd6701c..0000000000 Binary files a/Resources/Textures/LobbyScreens/warden.webp and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/warden.webp.yml b/Resources/Textures/LobbyScreens/warden.webp.yml deleted file mode 100644 index 51ff40335e..0000000000 --- a/Resources/Textures/LobbyScreens/warden.webp.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: false diff --git a/Resources/Textures/Logo/icon-license.txt b/Resources/Textures/Logo/icon-license.txt index 96e188db5a..1290036d68 100644 --- a/Resources/Textures/Logo/icon-license.txt +++ b/Resources/Textures/Logo/icon-license.txt @@ -1,4 +1,5 @@ The files below are licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International. +Produced by Cheeki @cowpolice on Discord. icon.ico icon/icon-16x16.png diff --git a/Resources/Textures/Logo/icon.ico b/Resources/Textures/Logo/icon.ico index 808d68ab4d..d90a5443a7 100644 Binary files a/Resources/Textures/Logo/icon.ico and b/Resources/Textures/Logo/icon.ico differ diff --git a/Resources/Textures/Logo/icon/icon-128x128.png b/Resources/Textures/Logo/icon/icon-128x128.png index 3df438d4dc..e3dc515a51 100644 Binary files a/Resources/Textures/Logo/icon/icon-128x128.png and b/Resources/Textures/Logo/icon/icon-128x128.png differ diff --git a/Resources/Textures/Logo/icon/icon-16x16.png b/Resources/Textures/Logo/icon/icon-16x16.png index 5eae9a0ed3..7f0733c3c2 100644 Binary files a/Resources/Textures/Logo/icon/icon-16x16.png and b/Resources/Textures/Logo/icon/icon-16x16.png differ diff --git a/Resources/Textures/Logo/icon/icon-24x24.png b/Resources/Textures/Logo/icon/icon-24x24.png index 47248c1411..3caf3a7682 100644 Binary files a/Resources/Textures/Logo/icon/icon-24x24.png and b/Resources/Textures/Logo/icon/icon-24x24.png differ diff --git a/Resources/Textures/Logo/icon/icon-256x256.png b/Resources/Textures/Logo/icon/icon-256x256.png index 71bfd8680b..8e216d58cf 100644 Binary files a/Resources/Textures/Logo/icon/icon-256x256.png and b/Resources/Textures/Logo/icon/icon-256x256.png differ diff --git a/Resources/Textures/Logo/icon/icon-32x32.png b/Resources/Textures/Logo/icon/icon-32x32.png index 3239259319..e53d167df2 100644 Binary files a/Resources/Textures/Logo/icon/icon-32x32.png and b/Resources/Textures/Logo/icon/icon-32x32.png differ diff --git a/Resources/Textures/Logo/icon/icon-48x48.png b/Resources/Textures/Logo/icon/icon-48x48.png index 8b0bbaf1ee..bfc6cb64cb 100644 Binary files a/Resources/Textures/Logo/icon/icon-48x48.png and b/Resources/Textures/Logo/icon/icon-48x48.png differ diff --git a/Resources/Textures/Logo/icon/icon-64x64.png b/Resources/Textures/Logo/icon/icon-64x64.png index 7a8fde00b4..067966984e 100644 Binary files a/Resources/Textures/Logo/icon/icon-64x64.png and b/Resources/Textures/Logo/icon/icon-64x64.png differ diff --git a/Resources/Textures/Logo/logo.png b/Resources/Textures/Logo/logo.png index 71bfd8680b..68d3c05f54 100644 Binary files a/Resources/Textures/Logo/logo.png and b/Resources/Textures/Logo/logo.png differ diff --git a/Resources/Textures/Logo/logo.svg b/Resources/Textures/Logo/logo.svg index 3b414992c9..fdab1f4de2 100644 --- a/Resources/Textures/Logo/logo.svg +++ b/Resources/Textures/Logo/logo.svg @@ -1,135 +1,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Resources/Textures/Logo/splashlogo.png b/Resources/Textures/Logo/splashlogo.png index 4cbf5d15a2..68d3c05f54 100644 Binary files a/Resources/Textures/Logo/splashlogo.png and b/Resources/Textures/Logo/splashlogo.png differ