Merge remote-tracking branch 'refs/remotes/wizards/master'

# Conflicts: # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/ServerInfo/Guidebook/Cargo/Cargo.xml # Resources/ServerInfo/Guidebook/Controls/Radio.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Medical/Chemist.xml # Resources/ServerInfo/Guidebook/Medical/Medical.xml # Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Security/Security.xml # Resources/ServerInfo/Guidebook/Service/Bartender.xml # Resources/ServerInfo/Guidebook/Service/Chef.xml # Resources/ServerInfo/Guidebook/SpaceStation14.xml # Resources/ServerInfo/Guidebook/Survival.xml
space-sunrise · Jun 9, 2024 · 7c9680e · 7c9680e
2 parents 48515e3 + 5f91c3f
commit 7c9680e
Show file tree

Hide file tree

Showing 31 changed files with 563 additions and 127 deletions.
diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
@@ -9,6 +9,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Silicons.Laws.Ui;
 
@@ -27,6 +28,8 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet<string>? radioChannels)
         var identifier = law.LawIdentifierOverride ?? $"{law.Order}";
         var lawIdentifier = Loc.GetString("laws-ui-law-header", ("id", identifier));
         var lawDescription = Loc.GetString(law.LawString);
+        var lawIdentifierPlaintext = FormattedMessage.RemoveMarkupPermissive(lawIdentifier);
+        var lawDescriptionPlaintext = FormattedMessage.RemoveMarkupPermissive(lawDescription);
 
         LawNumberLabel.SetMarkup(lawIdentifier);
         LawLabel.SetMessage(lawDescription);
@@ -46,7 +49,7 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet<string>? radioChannels)
 
         localButton.OnPressed += _ =>
         {
-            _chatManager.SendMessage($"{lawIdentifier}: {lawDescription}", ChatSelectChannel.Local);
+            _chatManager.SendMessage($"{lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Local);
         };
 
         LawAnnouncementButtons.AddChild(localButton);
@@ -73,9 +76,9 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet<string>? radioChannels)
                 switch (radioChannel)
                 {
                     case SharedChatSystem.CommonChannel:
-                        _chatManager.SendMessage($"{SharedChatSystem.RadioCommonPrefix} {lawIdentifier}: {lawDescription}", ChatSelectChannel.Radio); break;
+                        _chatManager.SendMessage($"{SharedChatSystem.RadioCommonPrefix} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
                     default:
-                        _chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifier}: {lawDescription}", ChatSelectChannel.Radio); break;
+                        _chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
                 }
             };
 

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,18 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Fix some shuttle console stuff surrounding the Map screen.
-    type: Fix
-  id: 6203
-  time: '2024-03-22T01:57:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26305
-- author: nikthechampiongr
-  changes:
-  - message: You can now move again if you stop being pulled while in cuffs.
-    type: Fix
-  id: 6204
-  time: '2024-03-22T01:59:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26312
 - author: lzk228
   changes:
   - message: Snoring is now a trait in character preference menu.
@@ -3850,3 +3836,18 @@
   id: 6702
   time: '2024-06-08T18:48:09.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28734
+- author: UBlueberry
+  changes:
+  - message: The guidebook has been heavily reorganized to improve convenience for
+      all types of users.
+    type: Tweak
+  id: 6703
+  time: '2024-06-08T23:00:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28603
+- author: Psychpsyo
+  changes:
+  - message: New lobby background art!
+    type: Add
+  id: 6704
+  time: '2024-06-08T23:29:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28724
diff --git a/Resources/Locale/en-US/guidebook/guidebook.ftl b/Resources/Locale/en-US/guidebook/guidebook.ftl
@@ -1,8 +1,8 @@
 guidebook-window-title = Guidebook
 guidebook-placeholder-text = Select an entry.
-guidebook-placeholder-text-2 = If you're new, select the topmost entry to get started.
+guidebook-placeholder-text-2 = If you're new, head over to "New? Start here!"
 guidebook-filter-placeholder-text = Filter items
 
 
 guidebook-monkey-unspin = Unspin Monkey
-guidebook-monkey-disco = Disco Monkey
+guidebook-monkey-disco = Disco Monkey
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -1,3 +1,4 @@
+guide-entry-ss14 = Station and Shifts
 guide-entry-engineering = Engineering
 guide-entry-construction = Construction
 guide-entry-airlock-security = Airlock Upgrades
@@ -14,27 +15,14 @@ guide-entry-ame = Antimatter Engine (AME)
 guide-entry-singularity = Singularity / Tesla
 guide-entry-teg = Thermo-electric Generator (TEG)
 guide-entry-rtg = RTG
-guide-entry-controls = Controls
-guide-entry-radio = Radio
 guide-entry-jobs = Jobs
 guide-entry-cargo = Cargo
 guide-entry-cargo-bounties = Cargo Bounties
 guide-entry-salvage = Salvage
 guide-entry-survival = Survival
-guide-entry-chemicals = Chemicals
-guide-entry-elements = Elements
-guide-entry-narcotics = Narcotics
-guide-entry-pyrotechnics = Pyrotechnic
-guide-entry-toxins = Toxins
-guide-entry-foods = Foods
-guide-entry-biological = Biological
-guide-entry-others = Others
-guide-entry-botanical = Botanicals
-guide-entry-ss14 = Space Station 14
 guide-entry-janitorial = Janitorial
 guide-entry-bartender = Bartender
 guide-entry-chef = Chef
-guide-entry-foodrecipes = Food Recipes
 guide-entry-medical = Medical
 guide-entry-medicaldoctor = Medical Doctor
 guide-entry-chemist = Chemist
@@ -58,7 +46,28 @@ guide-entry-security = Security
 guide-entry-forensics = Forensics
 guide-entry-defusal = Large Bomb Defusal
 guide-entry-criminal-records = Criminal Records
+guide-entry-command = Command
+guide-entry-service = Service
+
+guide-entry-newplayer = New? Start here!
+guide-entry-charactercreation = Character Creation
 guide-entry-species = Species
+guide-entry-yourfirstcharacter = Your First Character
+guide-entry-controls = Controls
+guide-entry-radio = Radio and Speech
+
+guide-entry-references = Tables and References
+guide-entry-drinks = Drinks
+guide-entry-foodrecipes = Food Recipes
+guide-entry-chemicals = Chemicals
+guide-entry-elements = Elements
+guide-entry-narcotics = Narcotics
+guide-entry-pyrotechnics = Pyrotechnic
+guide-entry-toxins = Toxins
+guide-entry-foods = Foods
+guide-entry-biological = Biological
+guide-entry-botanical = Botanicals
+guide-entry-others = Others
 
 guide-entry-antagonists = Antagonists
 guide-entry-nuclear-operatives = Nuclear Operatives

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -22,6 +22,7 @@
   parent: BoxCardboard
   id: BoxSurvivalEngineering
   description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
+  suffix: Engineering
   components:
   - type: StorageFill
     contents:
@@ -106,6 +107,7 @@
   parent: BoxCardboard
   id: BoxSurvivalSyndicate
   description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
+  suffix: Syndicate
   components:
   - type: StorageFill
     contents:

diff --git a/Resources/Prototypes/Guidebook/botany.yml b/Resources/Prototypes/Guidebook/botany.yml
diff --git a/Resources/Prototypes/Guidebook/cargo.yml b/Resources/Prototypes/Guidebook/cargo.yml
@@ -4,8 +4,14 @@
   text: "/ServerInfo/Guidebook/Cargo/Cargo.xml"
   children:
   - CargoBounties
+  - Salvage
 
 - type: guideEntry
   id: CargoBounties
   name: guide-entry-cargo-bounties
   text: "/ServerInfo/Guidebook/Cargo/CargoBounties.xml"
+
+- type: guideEntry
+  id: Salvage
+  name: guide-entry-salvage
+  text: "/ServerInfo/Guidebook/Cargo/Salvage.xml"
diff --git a/Resources/Prototypes/Guidebook/command.yml b/Resources/Prototypes/Guidebook/command.yml
@@ -0,0 +1,4 @@
+- type: guideEntry
+  id: Command
+  name: guide-entry-command
+  text: "/ServerInfo/Guidebook/Command.xml"
diff --git a/Resources/Prototypes/Guidebook/meta.yml b/Resources/Prototypes/Guidebook/meta.yml
diff --git a/Resources/Prototypes/Guidebook/newplayer.yml b/Resources/Prototypes/Guidebook/newplayer.yml
@@ -0,0 +1,32 @@
+- type: guideEntry
+  id: NewPlayer
+  name: guide-entry-newplayer
+  text: "/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml"
+  children:
+  - Controls
+  - CharacterCreation
+
+- type: guideEntry
+  id: Controls
+  name: guide-entry-controls
+  text: "/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml"
+  children:
+  - Radio
+
+- type: guideEntry
+  id: Radio
+  name: guide-entry-radio
+  text: "/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml" 
+
+- type: guideEntry
+  id: CharacterCreation
+  name: guide-entry-charactercreation
+  text: "/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml"
+  children:
+  - YourFirstCharacter
+  - Species 
+
+- type: guideEntry
+  id: YourFirstCharacter
+  name: guide-entry-yourfirstcharacter
+  text: "/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml"
diff --git a/Resources/Prototypes/Guidebook/radio.yml b/Resources/Prototypes/Guidebook/radio.yml
diff --git a/Resources/Prototypes/Guidebook/references.yml b/Resources/Prototypes/Guidebook/references.yml
@@ -0,0 +1,26 @@
+- type: guideEntry
+  id: References
+  name: guide-entry-references
+  text: "/ServerInfo/Guidebook/References.xml"
+  children:
+  - Chemicals
+  - Drinks
+  - FoodRecipes
+  - Writing
+
+- type: guideEntry
+  id: Drinks
+  name: guide-entry-drinks
+  text: "/ServerInfo/Guidebook/ReferenceTables/Drinks.xml"
+
+- type: guideEntry
+  id: FoodRecipes
+  name: guide-entry-foodrecipes
+  text: "/ServerInfo/Guidebook/Service/FoodRecipes.xml"
+
+- type: guideEntry
+  id: Writing
+  name: guide-entry-writing
+  text: "/ServerInfo/Guidebook/Writing.xml"
+
+
diff --git a/Resources/Prototypes/Guidebook/salvage.yml b/Resources/Prototypes/Guidebook/salvage.yml
diff --git a/Resources/Prototypes/Guidebook/service.yml b/Resources/Prototypes/Guidebook/service.yml
@@ -0,0 +1,31 @@
+- type: guideEntry
+  id: Service
+  name: guide-entry-service
+  text: "/ServerInfo/Guidebook/Service/Service.xml"
+  filterEnabled: True
+  children:
+  - Bartender
+  - Botany
+  - Chef
+  - Janitorial
+
+- type: guideEntry
+  id: Bartender
+  name: guide-entry-bartender
+  text: "/ServerInfo/Guidebook/Service/Bartender.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Botany
+  name: guide-entry-botany
+  text: "/ServerInfo/Guidebook/Service/Botany.xml"
+
+- type: guideEntry
+  id: Chef
+  name: guide-entry-chef
+  text: "/ServerInfo/Guidebook/Service/Chef.xml"
+
+- type: guideEntry
+  id: Janitorial
+  name: guide-entry-janitorial
+  text: "/ServerInfo/Guidebook/Service/Janitorial.xml"
diff --git a/Resources/Prototypes/Guidebook/shiftandcrew.yml b/Resources/Prototypes/Guidebook/shiftandcrew.yml
@@ -3,41 +3,10 @@
   name: guide-entry-jobs
   text: "/ServerInfo/Guidebook/Jobs.xml"
   children:
-  - Bartender
-  - Chef
-  - Botany
+  - Cargo
+  - Command
   - Engineering
+  - Medical
   - Science
   - Security
-  - Janitorial
-  - Cargo
-  - Salvage
-  - Medical
-
-- type: guideEntry
-  id: Survival
-  name: guide-entry-survival
-  text: "/ServerInfo/Guidebook/Survival.xml"
-
-- type: guideEntry
-  id: Janitorial
-  name: guide-entry-janitorial
-  text: "/ServerInfo/Guidebook/Service/Janitorial.xml"
-
-- type: guideEntry
-  id: Bartender
-  name: guide-entry-bartender
-  text: "/ServerInfo/Guidebook/Service/Bartender.xml"
-  filterEnabled: True
-
-- type: guideEntry
-  id: Chef
-  name: guide-entry-chef
-  text: "/ServerInfo/Guidebook/Service/Chef.xml"
-  children:
-  - Food Recipes
-
-- type: guideEntry
-  id: Food Recipes
-  name: guide-entry-foodrecipes
-  text: "/ServerInfo/Guidebook/Service/FoodRecipes.xml"
+  - Service
diff --git a/Resources/Prototypes/Guidebook/ss14.yml → Resources/Prototypes/Guidebook/station.yml b/Resources/Prototypes/Guidebook/ss14.yml → Resources/Prototypes/Guidebook/station.yml
@@ -6,18 +6,15 @@
   - Controls
   - Jobs
   - Survival
-  - Chemicals
   - Antagonists
-  - Species
-  - Writing
   - Glossary
 
-- type: guideEntry
-  id: Writing
-  name: guide-entry-writing
-  text: "/ServerInfo/Guidebook/Writing.xml"
-
 - type: guideEntry
   id: Glossary
   name: guide-entry-glossary
   text: "/ServerInfo/Guidebook/Glossary.xml"
+
+- type: guideEntry
+  id: Survival
+  name: guide-entry-survival
+  text: "/ServerInfo/Guidebook/Survival.xml"
diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
@@ -44,4 +44,8 @@
 
 - type: lobbyBackground
   id: JustAWeekAway
-  background: /Textures/LobbyScreens/justaweekaway.webp
+  background: /Textures/LobbyScreens/justaweekaway.webp
+
+- type: lobbyBackground
+  id: JaniShootout
+  background: /Textures/LobbyScreens/janishootout.webp