Revert "Rofls (#532)" (#535)

This reverts commit 66142d4f27.

Resources/Audio/_WL/Lobby/attributions.yml

@@ -1,4 +1,4 @@
-- files: ["the_station.ogg"]
+- files: ["the_station.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "The Station | SS13 Fan Track by A-Guy"
   source: "https://www.youtube.com/watch?v=Dyn5AVhwaR4"
@@ -22,8 +22,3 @@
   license: "CC-BY-SA-3.0"
   copyright: "maxstack"
   source: "https://opengameart.org/content/through-space"
-
-- files: ["hehe.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "uwu"
-  source: "https://opengameart.org/content/through-space"

Resources/Locale/ru-RU/_WL/holopad/holopad.ftl

@@ -1 +1 @@
-holopad-command-adjutant = Командование — Горничная
+holopad-command-adjutant = Командование — Адъютант

Resources/Locale/ru-RU/_WL/job/job-names.ftl

@@ -1,3 +1,3 @@
-job-name-adjutant = горничная командования
+job-name-adjutant = адъютант
 
-JobAdjutant = горничная командования
+JobAdjutant = адъютант

Resources/Locale/ru-RU/_WL/paper/stamp-component.ftl

@@ -1 +1 @@
-stamp-component-stamped-name-adjutant = Горничная Командования
+stamp-component-stamped-name-adjutant = Адъютант

Resources/Locale/ru-RU/_WL/prototypes/entities/objects/misc/identification_cards.ftl

@@ -1,2 +1,2 @@
-ent-AdjutantIDCard = ID-карта горничной командования
+ent-AdjutantIDCard = ID-карта адъютанта
     .desc = { ent-IDCardStandard.desc }

Resources/Prototypes/Catalog/Jukebox/Standard.yml

@@ -0,0 +1,62 @@
+- type: jukebox
+  id: FlipFlap
+  # WL-Changes-start
+  author: X-CEED
+  name: Flip Flap
+  # WL-Changes-end
+  path:
+    path: /Audio/Jukebox/flip-flap.ogg
+
+- type: jukebox
+  id: Tintin
+  # WL-Changes-start
+  author: Jeroen Tel
+  name: Tintin on the Moon
+  # WL-Changes-end
+  path:
+    path: /Audio/Jukebox/title3.ogg
+
+- type: jukebox
+  id: Thunderdome
+  # WL-Changes-start
+  author: MashedByMachines
+  name: Sector 11
+  # WL-Changes-end
+  path:
+    path: /Audio/Jukebox/sector11.ogg
+
+- type: jukebox
+  id: Constellations
+  # WL-Changes-start
+  author: Qwertyquerty
+  name: Constellations
+  # WL-Changes-end
+  path:
+    path: /Audio/Jukebox/constellations.ogg
+
+- type: jukebox
+  id: Drifting
+  # WL-Changes-start
+  author: Qwertyquerty
+  name: Drifting
+  # WL-Changes-end
+  path:
+    path: /Audio/Jukebox/drifting.ogg
+
+- type: jukebox
+  id: starlight
+  # WL-Changes-start
+  author: Qwertyquerty
+  name: Starlight
+  # WL-Changes-end
+  path:
+    path: /Audio/Jukebox/starlight.ogg
+
+- type: jukebox
+  id: sunset
+  # WL-Changes-start
+  author: PigeonBeans
+  name: Sunset
+  # WL-Changes-end
+  path:
+    path: /Audio/Jukebox/sunset.ogg

Resources/Prototypes/SoundCollections/lobby.yml

@@ -1,4 +1,32 @@
 - type: soundCollection
   id: LobbyMusic
   files:
-    - /Audio/_WL/Lobby/hehe.ogg
+    - /Audio/Lobby/thunderdome.ogg
+    - /Audio/Lobby/absconditus.ogg
+    - /Audio/Lobby/space_asshole.ogg
+    - /Audio/Lobby/the_wizard.ogg
+    - /Audio/Lobby/endless_space.ogg
+    - /Audio/Lobby/singuloose.ogg
+    - /Audio/Lobby/comet_haley.ogg
+    - /Audio/Lobby/title2.ogg
+    - /Audio/Lobby/title3.ogg
+    - /Audio/Lobby/mod.flip-flap.ogg
+    - /Audio/Lobby/Spac_Stac.ogg
+    - /Audio/Lobby/pwmur.ogg
+    - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
+    - /Audio/Lobby/every_light_is_blinking_at_once.ogg
+    - /Audio/Corvax/Lobby/title2.ogg # Corvax-LobbyMusic
+    - /Audio/Corvax/Lobby/service.ogg # Corvax-LobbyMusic
+    - /Audio/Corvax/Lobby/nodecision.ogg # Corvax-LobbyMusic
+    # WL-Changes-start
+    - /Audio/_WL/Lobby/the_station.ogg
+    - /Audio/_WL/Lobby/spacebard.ogg
+    - /Audio/_WL/Lobby/quirky_goblins.ogg
+    - /Audio/_WL/Lobby/atomicamnesiammx.ogg
+    - /Audio/_WL/Lobby/through_space.ogg
+    - /Audio/_WL/Jukebox/Custom/Tintin_on_the_Moon_(Noisemakers_Remix).ogg
+    - /Audio/_WL/Jukebox/Custom/vibe_ace.ogg
+    - /Audio/_WL/Jukebox/Custom/marhaba.ogg
+    - /Audio/_WL/Jukebox/Custom/Monument.ogg
+    - /Audio/_WL/Jukebox/Custom/Fyreont-Endless-Space-_SolusLunes-cover_.ogg
+    # WL-Changes-end

Resources/Prototypes/_WL/Catalog/jukebox/Standard.yml

@@ -1,13 +1,195 @@
 - type: jukebox
-  id: bark
-  author: thquib
-  name: i am going to bark at you
+  id: motive
+  author: A-Guy
+  name: Motive
   path:
-    path: /Audio/_WL/Jukebox/bark.ogg
+    path: /Audio/_WL/Jukebox/Motive-A-Guy.ogg
 
 - type: jukebox
-  id: first
-  author: awoo
-  name: Первоклассная Космическая Станция
+  id: megacorps
+  author: A-Guy
+  name: Megacorps
   path:
-    path: /Audio/_WL/Jukebox/rofls.ogg
+    path: /Audio/_WL/Jukebox/Nothing-danger-with-megacorps-A-Guy.ogg
+
+- type: jukebox
+  id: nuclear-operation
+  author: A-Guy
+  name: Nuclear Operation
+  path:
+    path: /Audio/_WL/Jukebox/Nuclear-operation-remake-A-Guy.ogg
+
+- type: jukebox
+  id: radify
+  author: A-Guy
+  name: Radify
+  path:
+    path: /Audio/_WL/Jukebox/Radify-A-Guy.ogg
+
+- type: jukebox
+  id: tech-Fairy
+  author: A-Guy
+  name: Tech Fairy
+  path:
+    path: /Audio/_WL/Jukebox/Tech-Fairy-A-Guy.ogg
+
+- type: jukebox
+  id: RevolutionSS13
+  author: A-Guy
+  name: Revolution
+  path:
+    path: /Audio/_WL/Jukebox/RevolutionSS13.ogg
+
+- type: jukebox
+  id: Absconditus
+  author: ZhayTee
+  name: Absconditus
+  path:
+    path: /Audio/Lobby/absconditus.ogg
+
+- type: jukebox
+  id: AtomicAmnesiaMMX
+  author: Philip Dyer
+  name: Atomic Amnesia MMX
+  path:
+    path: /Audio/_WL/Lobby/atomicamnesiammx.ogg
+
+- type: jukebox
+  id: CometHaley
+  author: Stellardrone
+  name: Comet Haley
+  path:
+    path: /Audio/Lobby/comet_haley.ogg
+
+- type: jukebox
+  id: EndlessSpace
+  author: SolusLunes
+  name: Endless Space
+  path:
+    path: /Audio/Lobby/endless_space.ogg
+
+- type: jukebox
+  id: EveryLightIsBlinkingAtOnce
+  author: Sunbeamstress/Lauren Loveless
+  name: Every Light is Blinking at Once
+  path:
+    path: /Audio/Lobby/every_light_is_blinking_at_once.ogg
+
+- type: jukebox
+  id: LasersRipApartTheBulkhead
+  author: Sunbeamstress/Lauren Loveless
+  name: lasers rip apart the bulkhead
+  path:
+    path: /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
+
+- type: jukebox
+  id: PWMUR
+  author: Sunbeamstress/Lauren Loveless
+  name: phoron will make us rich
+  path:
+    path: /Audio/Lobby/pwmur.ogg
+
+- type: jukebox
+  id: Singuloose
+  author: Janis Schiedková
+  name: Singuloose
+  path:
+    path: /Audio/Lobby/singuloose.ogg
+
+- type: jukebox
+  id: SpacStac
+  author: Hayabusa
+  name: Spac Stack
+  path:
+    path: /Audio/Lobby/Spac_Stac.ogg
+
+- type: jukebox
+  id: SpaceAsshole
+  author: Chris Remo
+  name: Space Asshole
+  path:
+    path: /Audio/Lobby/space_asshole.ogg
+
+- type: jukebox
+  id: RussianSpacebardSong
+  author: Choojoy
+  name: Russian Spacebard Song
+  path:
+    path: /Audio/_WL/Lobby/spacebard.ogg
+
+- type: jukebox
+  id: TheStation
+  author: A-Guy
+  name: The Station
+  path:
+    path: /Audio/_WL/Lobby/the_station.ogg
+
+- type: jukebox
+  id: TheWizard
+  author: Chris Remo
+  name: The Wizard
+  path:
+    path: /Audio/Lobby/the_wizard.ogg
+
+- type: jukebox
+  id: Title2
+  author: Jonathan Dunn
+  name: title2
+  path:
+    path: /Audio/Lobby/title2.ogg
+
+- type: jukebox
+  id: Title3
+  author: Cuboos
+  name: Title3
+  path:
+    path: /Audio/Lobby/title3.ogg
+
+- type: jukebox
+  id: Service
+  author: Seeitsthem
+  name: Service
+  path:
+    path: /Audio/Corvax/Lobby/service.ogg
+
+- type: jukebox
+  id: NoDecision
+  author: cobber3
+  name: No decision
+  path:
+    path: /Audio/Corvax/Lobby/nodecision.ogg
+
+- type: jukebox
+  id: CarolOfTheBells
+  author: Audionautix
+  name: Carol Of The Bells
+  path:
+    path: /Audio/Corvax/Lobby/NewYear/carol-of-the-bells.ogg
+
+- type: jukebox
+  id: DanceOfTheSugarPlumFairy
+  author: Kevin MacLeod
+  name: Dance of the Sugar Plum Fairy
+  path:
+    path: /Audio/Corvax/Lobby/NewYear/dance-of-sugar-plum-fairy.ogg
+
+- type: jukebox
+  id: DeckTheHallsB
+  author: Kevin MacLeod
+  name: Deck the Halls B
+  path:
+    path: /Audio/Corvax/Lobby/NewYear/deck-in-the-halls.ogg
+
+- type: jukebox
+  id: JingleBells
+  author: Kevin MacLeod
+  name: Jingle Bells
+  path:
+    path: /Audio/Corvax/Lobby/NewYear/jingle-bells.ogg
+
+- type: jukebox
+  id: WishYouMerryChristmas
+  author: Twin Musicom
+  name: Wish You a Merry Christmas
+  path:
+    path: /Audio/Corvax/Lobby/NewYear/wish-you-a-merry-christmas.ogg

Resources/Prototypes/_WL/Catalog/jukebox/custom.yml

@@ -0,0 +1,62 @@
+- type: jukebox
+  id: VibeAce
+  author: Kevin MacLeod
+  name: Vibe Ace
+  path:
+    path: /Audio/_WL/Jukebox/Custom/vibe_ace.ogg
+
+- type: jukebox
+  id: Marhaba
+  author: Ian Alex Mac
+  name: Marhaba
+  path:
+    path: /Audio/_WL/Jukebox/Custom/marhaba.ogg
+
+- type: jukebox
+  id: Monument
+  author: Six Umbrellas
+  name: Monument
+  path:
+    path: /Audio/_WL/Jukebox/Custom/Monument.ogg
+
+- type: jukebox
+  id: TintinOnTheMoonNoisemakerRemix
+  author: Noisemaker
+  name: Tintin on the Moon (remix)
+  path:
+    path: /Audio/_WL/Jukebox/Custom/Tintin_on_the_Moon_(Noisemakers_Remix).ogg
+
+- type: jukebox
+  id: EndlessSpaceFyreontRemix
+  author: Fyreont
+  name: Endless Space (remix)
+  path:
+    path: /Audio/_WL/Jukebox/Custom/Fyreont-Endless-Space-_SolusLunes-cover_.ogg
+
+- type: jukebox
+  id: ToccataInBitMinor
+  author: MRX
+  name: Toccata in Bit Minor
+  path:
+    path: /Audio/_WL/Jukebox/Custom/Toccata-In-Bit-Minor.ogg
+
+- type: jukebox
+  id: EmptyMarket
+  author: mrjajkes
+  name: Empty Market
+  path:
+    path: /Audio/_WL/Jukebox/Custom/Empty-Market.ogg
+
+- type: jukebox
+  id: GetThatAntag
+  author: mrjajkes
+  name: Get That Antag
+  path:
+    path: /Audio/_WL/Jukebox/Custom/Get-That-Antag.ogg
+
+- type: jukebox
+  id: TraitorousIntent
+  author: mrjajkes
+  name: Traitorous Intent
+  path:
+    path: /Audio/_WL/Jukebox/Custom/Traitorous-Intent.ogg

Resources/Prototypes/_WL/Loadouts/role_loadouts.yml

@@ -1,7 +1,10 @@
 - type: roleLoadout
   id: JobAdjutant
   groups:
+  - AdjutantHead
+  - AdjutantJumpsuit
   - AdjutantBackpack
+  - AdjutantOuterClothing
   - Survival
   - Trinkets
   - WLNeck # WL-Changes: Neck add

Resources/Prototypes/_WL/Roles/Jobs/Command/adjutant.yml

@@ -3,6 +3,9 @@
   name: job-name-adjutant
   description: job-description-adjutant
   playTimeTracker: JobAdjutant
+  subnames:
+  - Male: бюрократический супервайзер
+  - Male: младший администратор
   requirements:
     - !type:AgeRequirement
       age: 4 # WL-Changes-AgeRequirement
@@ -39,9 +42,6 @@
     shoes: ClothingShoesBootsLaceup
     id: AdjutantPDA
     ears: ClothingHeadsetAltCommand
-    jumpsuit: ClothingUniformJumpskirtTacticalMaid
-    head: ClothingHeadHatTacticalMaidHeadband
-    gloves: ClothingHandsTacticalMaidGloves
   storage:
     back:
     - Flash

Resources/manifest.yml

@@ -1,5 +1,5 @@
 defaultWindowTitle: Space Station 14 - Corvax Whitelist [RU] #WL-Changes: Rebrand
 windowIconSet: /Textures/Logo/icon-ru # Corvax-Theme
-splashLogo: /Textures/_WL/Logo/svin.jpg # Corvax-Theme #WL-Changes: new logo
+splashLogo: /Textures/_WL/Logo/wl_logo.png # Corvax-Theme #WL-Changes: new logo
 
 # PJB PLEASE