Bartender Loadout Groups (Also Item Group Localizations)

Resources/Locale/en-US/loadouts/categories.ftl

@@ -8,6 +8,7 @@ loadout-category-Head = Head
 loadout-category-Items = Items
 loadout-category-Jobs = Jobs
 loadout-category-JobsAUncategorized = Uncategorized
+loadout-category-JobsCargo = Logistics
 loadout-category-JobsCommand = Command
 loadout-category-JobsCommandAUncategorized = Uncategorized
 loadout-category-JobsCommandCaptain = Captain
@@ -17,12 +18,13 @@ loadout-category-JobsCommandHOP = Head of Personnel
 loadout-category-JobsCommandHOS = Head of Security
 loadout-category-JobsCommandQM = Logistics Officer
 loadout-category-JobsCommandRD = Mystagogue
-loadout-category-JobsCargo = Cargo
 loadout-category-JobsEngineering = Engineering
 loadout-category-JobsMedical = Medical
-loadout-category-JobsScience = Science
+loadout-category-JobsScience = Epistemics
 loadout-category-JobsSecurity = Security
 loadout-category-JobsService = Service
+loadout-category-JobsServiceUncategorized = Uncategorized
+loadout-category-JobsServiceBartender = Bartender
 loadout-category-Mask = Mask
 loadout-category-Neck = Neck
 loadout-category-Outer = Outer

Resources/Locale/en-US/loadouts/itemgroups.ftl

@@ -0,0 +1,66 @@
+# This list is sorted Mixed Alphabetically with Generic always being placed first, Departments alphabetically, Items Groups Alphabetically, and Jobs Alphabetically after all Department items
+# Generic - Clothing
+character-item-group-LoadoutEyes = Civilian Eyewear
+character-item-group-LoadoutGloves = Civilian Gloves
+character-item-group-LoadoutHead = Civilian Headgear
+character-item-group-LoadoutMasks = Civilian Masks
+character-item-group-LoadoutNeck = Civilian Neckwear
+character-item-group-LoadoutOuter = Civilian Outerwear
+character-item-group-LoadoutShoes = Civilian Shoes
+character-item-group-LoadoutUniformsCivilian = Civilian Uniforms
+
+# Generic - Items
+character-item-group-LoadoutAirTank = Emergency Air Tanks
+character-item-group-LoadoutLighters = Lighters
+character-item-group-LoadoutInstrumentsAny = Musical Instruments (Non-Musician)
+character-item-group-LoadoutSmokes = Smokeables
+character-item-group-LoadoutBoxKits = Survival Kits
+character-item-group-LoadoutWritables = Writing Tools
+
+# Cargo
+character-item-group-LoadoutNeckCargo = Logistics Neckwear
+character-item-group-LoadoutOuterCargo = Logistics Outerwear
+character-item-group-LoadoutShoesCargo = Logistics Shoes
+
+# Engineering
+character-item-group-LoadoutEyesEngineering = Engineering Eyewear
+character-item-group-LoadoutHeadEngineering = Engineering Headgear
+character-item-group-LoadoutOuterEngineering = Engineering Outerwear
+character-item-group-LoadoutUniformsEngineering = Engineering Uniforms
+
+# Medical
+character-item-group-LoadoutEyesMedical = Medical Eyewear
+character-item-group-LoadoutGlovesMedical = Medical Gloves
+character-item-group-LoadoutHeadMedical = Medical Headgear
+character-item-group-LoadoutNeckMedical = Medical Neckwear
+character-item-group-LoadoutOuterMedical = Medical Outerwear
+character-item-group-LoadoutShoesMedical = Medical Shoes
+character-item-group-LoadoutUniformsMedical = Medical Uniforms
+
+# Security
+character-item-group-LoadoutBeltSecurity = Security Belts
+character-item-group-LoadoutEquipmentSecurity = Security Equipment
+character-item-group-LoadoutEyesSecurity = Security Eyewear
+character-item-group-LoadoutGlovesSecurity = Security Gloves
+character-item-group-LoadoutHeadSecurity = Security Headgear
+character-item-group-LoadoutMaskSecurity = Security Masks
+character-item-group-LoadoutNeckSecurity = Security Neckwear
+character-item-group-LoadoutOuterSecurity = Security Outerwear
+character-item-group-LoadoutShoesSecurity = Security Shoes
+character-item-group-LoadoutUniformsSecurity = Security Uniforms
+
+# Service
+character-item-group-LoadoutEquipmentService = Service Equipment
+character-item-group-LoadoutMaskService = Service Masks
+character-item-group-LoadoutNeckService = Service Neckwear
+character-item-group-LoadoutOuterService = Service Outerwear
+character-item-group-LoadoutShoesService = Service Shoes
+character-item-group-LoadoutUniformsService = Service Uniforms
+
+# Service - Bartender
+character-item-group-LoadoutBartenderAmmo = Bartender Ammo
+character-item-group-LoadoutBartenderOuterwear = Bartender Outerwear
+character-item-group-LoadoutBartenderWeapon = Bartender Weapon
+
+# Service - Musician
+character-item-group-LoadoutMusicianInstruments = Musician Instruments

Resources/Prototypes/Catalog/Fills/Lockers/service.yml

@@ -5,8 +5,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterArmorDuraVest # DeltaV - ClothingOuterArmorBasicSlim replaced in favour of stabproof vest
-      - id: WeaponShotgunDoubleBarreledRubber
       - id: DrinkShaker
       - id: ClothingEyesHudBeer
       - id: HandLabeler
@@ -17,8 +15,6 @@
         prob: 0.5
       - id: DrinkBottleBeer
         prob: 0.5
-      - id: BoxBeanbag
-        amount: 2
       - id: RagItem
         amount: 2
       - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!

Resources/Prototypes/CharacterItemGroups/serviceGroups.yml

@@ -76,5 +76,25 @@
     - type: loadout
       id: LoadoutServiceClownCowToolboxFilled
 
+# Bartender
+- type: characterItemGroup
+  id: LoadoutBartenderOuterwear
+  items:
+    - type: loadout
+      id: LoadoutServiceBartenderArmorDuraVest
 
+- type: characterItemGroup
+  id: LoadoutBartenderAmmo
+  items:
+    - type: loadout
+      id: LoadoutServiceBartenderBoxBeanbags
+    - type: loadout
+      id: LoadoutServiceBartenderBoxLightRifleRubber
 
+- type: characterItemGroup
+  id: LoadoutBartenderWeapon
+  items:
+    - type: loadout
+      id: LoadoutServiceBartenderShotgunDoubleBarreledRubber
+    - type: loadout
+      id: LoadoutServiceBartenderMosinRubber

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -55,6 +55,16 @@
       path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
     fireOnDropChance: 1
 
+- type: entity
+  name: Kardashev-Mosin
+  parent: WeaponSniperMosin
+  id: WeaponSniperMosinRubber
+  description: A weapon for hunting, or endless trench warfare. Uses .30 rifle rubber ammo.
+  suffix: Non-Lethal
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleRubber
+
 - type: entity
   name: Hristov
   parent: BaseWeaponSniper

Resources/Prototypes/Loadouts/Categories/categories.yml

@@ -91,6 +91,15 @@
 
 - type: loadoutCategory
   id: JobsService
+  subCategories:
+    - JobsServiceUncategorized
+    - JobsServiceBartender
+
+- type: loadoutCategory
+  id: JobsServiceUncategorized
+
+- type: loadoutCategory
+  id: JobsServiceBartender
 
 - type: loadoutCategory
   id: Mask