Updates to fix YAML linter's complaining

Resources/Locale/en-US/cargo/bounties.ftl

@@ -133,6 +133,8 @@ bounty-item-flour = Flour
 bounty-item-cocoapowder = Cocoa Powder
 bounty-item-frostoil = Frost Oil
 bounty-item-opporozidone = Opporozidone
+bounty-item-liquid-desoxyephedrine = Liquid Desoxyephedrine
+bounty-item-liquid-space-mirage = Liquid Space Mirage
 
 bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it.
 bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream.

Resources/Locale/en-US/guidebook/factions.ftl

@@ -0,0 +1,17 @@
+Factions = Factions
+FactionCreation = Faction Creation
+FactionModification = Faction Modification
+TheThreshold = The Threshold
+MakingMoney = Making Money
+ThresholdCargo = Threshold Cargo
+ThresholdMiningHunting = Threshold Mining/Hunting
+ThresholdScience = Threshold Science
+Death = Death
+Achievements = Achievements
+GridControl = Grid Control
+AccessControl = Access Control
+Precursor = Precursor
+Dealer = Dealer
+BountyHunter = Bounty Hunter & Assassin
+PrecursorPurchases = Precursor Purchases
+SectorChaos = Sector Chaos

Resources/Prototypes/Catalog/Bounties/explorationbounties.yml

@@ -1,7 +1,7 @@
-
 - type: cargoBounty
   id: BountyTechDisk
   reward: 2500
+  description: bounty-description-tech-disk
   idPrefix: SS13-
   entries:
   - name: bounty-item-tech-disk

Resources/Prototypes/Catalog/Bounties/gasbounties.yml

@@ -1,6 +1,7 @@
 - type: cargoBounty
   id: BountyOxygen
   reward: 0.55 # 9900
+  description: bounty-description-artifact
   gasId: Oxygen
   group: GasBounty
   bountyType: PayPerGas
@@ -11,6 +12,7 @@
 - type: cargoBounty
   id: BountyNitrogen
   reward: 0.5
+  description: bounty-description-artifact
   gasId: Nitrogen
   group: GasBounty
   bountyType: PayPerGas
@@ -21,6 +23,7 @@
 - type: cargoBounty
   id: BountyHydrogen
   reward: 0.75
+  description: bounty-description-artifact
   gasId: Hydrogen
   group: GasBounty
   bountyType: PayPerGas
@@ -31,6 +34,7 @@
 - type: cargoBounty
   id: BountyPlasmaGas
   reward: 0.75
+  description: bounty-description-artifact
   gasId: Plasma
   group: GasBounty
   bountyType: PayPerGas
@@ -41,6 +45,7 @@
 - type: cargoBounty
   id: BountyChlorine
   reward: 2.25
+  description: bounty-description-artifact
   gasId: Chlorine
   group: GasBounty
   bountyType: PayPerGas
@@ -51,6 +56,7 @@
 - type: cargoBounty
   id: BountyFluorine
   reward: 2.5
+  description: bounty-description-artifact
   gasId: Fluorine
   group: GasBounty
   bountyType: PayPerGas

Resources/Prototypes/Catalog/Bounties/precursor.yml

@@ -1,23 +1,25 @@
 - type: cargoBounty
   id: BountyPrecursorSpaceDrugs
   reward: 40
+  description: bounty-description-artifact
   reagentId: SpaceDrugs
   group: PrecursorBounty
   bountyType: PayPerReagent
   successXP: -200
   idPrefix: PREC-
   entries:
-  - name: Liquid Space Mirage
+  - name: bounty-item-liquid-space-mirage
     amount: 250
 
 - type: cargoBounty
   id: BountyPrecursorDesoxyephedrine
   reward: 50
+  description: bounty-description-artifact
   reagentId: Desoxyephedrine
   group: PrecursorBounty
   bountyType: PayPerReagent
   successXP: -200
   idPrefix: PREC-
   entries:
-  - name: Liquid Desoxyephedrine
+  - name: bounty-item-liquid-desoxyephedrine
     amount: 200

Resources/Prototypes/Catalog/Bounties/servicebounties.yml

@@ -134,6 +134,7 @@
 - type: cargoBounty
   id: BountyFlower
   reward: 660
+  description: bounty-description-flower
   idPrefix: CC
   entries:
   - name: bounty-item-flower

Resources/Prototypes/Catalog/Cargo/explorermarket.yml

@@ -393,7 +393,7 @@
   id: BulkPlantBGoneExTS
   icon:
     sprite: Objects/Specific/Chemistry/jug.rsi
-    state: jug
+    state: icon_empty
   product: CratePlantBGone
   cost: 2500
   category: cargoproduct-category-name-hydroponics

Resources/Prototypes/Catalog/Cargo/sciencemarket.yml

@@ -142,7 +142,7 @@
   id: BulkPlantBGoneSTS
   icon:
     sprite: Objects/Specific/Chemistry/jug.rsi
-    state: jug
+    state: icon_empty
   product: CratePlantBGone
   cost: 2500
   category: cargoproduct-category-name-hydroponics

Resources/Prototypes/Catalog/Jukebox/Standard.yml

@@ -77,7 +77,7 @@
     path: /Audio/Jukebox/dreaminginspace.ogg
 
 - type: jukebox
-  id: Welcome To The Threshold
+  id: welcometothethreshold
   name: mrjajkes - Welcome To The Threshold
   path:
     path: /Audio/Lobby/Welcome_To_The_Threshold.ogg

Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

@@ -1214,87 +1214,76 @@
 - type: marking
   id: HumanHairCIA2
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_cia2
 
 - type: marking
   id: HumanHairCIA3
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_cia3
 
 - type: marking
   id: HumanHairCIA5
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_cia5
 
 - type: marking
   id: HumanHairIRS
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_irs
 
 - type: marking
   id: HumanHairFlatPressed
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_flatpressed
 
 - type: marking
   id: HumanHairWaver
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_waver
 
 - type: marking
   id: HumanHairElegant
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_elegantbun
 
 - type: marking
   id: HumanHairLowBun
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_low_bun
 
 - type: marking
   id: HumanHairLowBunAlt
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_low_bun_alt
 
 - type: marking
   id: HumanHairLowPonyTail
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_low_ponytail
 
 - type: marking
   id: HumanHairLowPonyTailAlt
   bodyPart: Hair
-  markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair_persistence.rsi
       state: hair_low_ponytail_alt

Resources/Prototypes/Guidebook/antagonist.yml

@@ -1,59 +1,59 @@
-# - type: guideEntry
-#   id: Antagonists
-#   name: guide-entry-antagonists
-#   text: "/ServerInfo/Guidebook/Antagonist/Antagonists.xml"
-#   children:
-#   - Traitors
-#   - Thieves
-#   - Revolutionaries
-#   - NuclearOperatives
-#   - SpaceNinja
-#   - Wizard
-#   - Zombies
-#   - Xenoborgs
-#   - MinorAntagonists
-
-# - type: guideEntry
-#   id: Traitors
-#   name: guide-entry-traitors
-#   text: "/ServerInfo/Guidebook/Antagonist/Traitors.xml"
-
-# - type: guideEntry
-#   id: NuclearOperatives
-#   name: guide-entry-nuclear-operatives
-#   text: "/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml"
-
-# - type: guideEntry
-#   id: Zombies
-#   name: guide-entry-zombies
-#   text: "/ServerInfo/Guidebook/Antagonist/Zombies.xml"
-
-# - type: guideEntry
-#   id: Revolutionaries
-#   name: guide-entry-revolutionaries
-#   text: "/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml"
-
-# - type: guideEntry
-#   id: MinorAntagonists
-#   name: guide-entry-minor-antagonists
-#   text: "/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml"
-
-# - type: guideEntry
-#   id: SpaceNinja
-#   name: guide-entry-space-ninja
-#   text: "/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml"
-
-# - type: guideEntry
-#   id: Thieves
-#   name: guide-entry-thieves
-#   text: "/ServerInfo/Guidebook/Antagonist/Thieves.xml"
-
-# - type: guideEntry
-#   id: Wizard
-#   name: guide-entry-wizard
-#   text: "/ServerInfo/Guidebook/Antagonist/Wizard.xml"
-
-# - type: guideEntry
-#   id: Xenoborgs
-#   name: guide-entry-xenoborgs
-#   text: "/ServerInfo/Guidebook/Antagonist/Xenoborgs.xml"
+- type: guideEntry
+  id: Antagonists
+  name: guide-entry-antagonists
+  text: "/ServerInfo/Guidebook/Antagonist/Antagonists.xml"
+  children:
+  - Traitors
+  - Thieves
+  - Revolutionaries
+  - NuclearOperatives
+  - SpaceNinja
+  - Wizard
+  - Zombies
+  - Xenoborgs
+  - MinorAntagonists
+
+- type: guideEntry
+  id: Traitors
+  name: guide-entry-traitors
+  text: "/ServerInfo/Guidebook/Antagonist/Traitors.xml"
+
+- type: guideEntry
+  id: NuclearOperatives
+  name: guide-entry-nuclear-operatives
+  text: "/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml"
+
+- type: guideEntry
+  id: Zombies
+  name: guide-entry-zombies
+  text: "/ServerInfo/Guidebook/Antagonist/Zombies.xml"
+
+- type: guideEntry
+  id: Revolutionaries
+  name: guide-entry-revolutionaries
+  text: "/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml"
+
+- type: guideEntry
+  id: MinorAntagonists
+  name: guide-entry-minor-antagonists
+  text: "/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml"
+
+- type: guideEntry
+  id: SpaceNinja
+  name: guide-entry-space-ninja
+  text: "/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml"
+
+- type: guideEntry
+  id: Thieves
+  name: guide-entry-thieves
+  text: "/ServerInfo/Guidebook/Antagonist/Thieves.xml"
+
+- type: guideEntry
+  id: Wizard
+  name: guide-entry-wizard
+  text: "/ServerInfo/Guidebook/Antagonist/Wizard.xml"
+
+- type: guideEntry
+  id: Xenoborgs
+  name: guide-entry-xenoborgs
+  text: "/ServerInfo/Guidebook/Antagonist/Xenoborgs.xml"