Simple-Station · Peptide90 · Jul 5, 2024 · May 30, 2024 · May 30, 2024 · May 31, 2024
diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl
@@ -9,7 +9,7 @@ character-species-requirement = You must {$inverted ->
 character-trait-requirement = You must {$inverted ->
     [true] not have
     *[other] have
-} the trait [color=lightblue]{$trait}[/color]
+} one of these traits: [color=lightblue]{$traits}[/color]
 character-backpack-type-requirement = You must {$inverted ->
     [true] not use
     *[other] use

diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -1,8 +1,15 @@
 # Alphabetically ordered, except for Uncategorized since it is always first
 
-loadout-category-Uncategorized = Uncategorized
 loadout-category-Accessories = Accessories
+loadout-category-Eyes = Eyes
+loadout-category-Hands = Hands
+loadout-category-Head = Head
 loadout-category-Items = Items
 loadout-category-Jobs = Jobs
+loadout-category-Mask = Mask
+loadout-category-Neck = Neck
 loadout-category-Outer = Outer
+loadout-category-Shoes = Shoes
+loadout-category-Species = Species
+loadout-category-Uncategorized = Uncategorized
 loadout-category-Uniform = Uniform
diff --git a/Resources/Locale/en-US/loadouts/items.ftl b/Resources/Locale/en-US/loadouts/items.ftl
@@ -11,3 +11,5 @@ loadout-description-LoadoutItemPlushieSharkBlue = Dive into battle with your ver
 loadout-description-LoadoutItemPlushieSharkPink = Unleash the power of pink with the Pink Shark Plushie! This rosy-hued predator might not have real teeth, but its sheer adorableness is enough to take a bite out of anyone's resolve. Watch as foes melt away in the face of its cottony charm.
 loadout-description-LoadoutItemPlushieSharkGrey = Introducing the Grey Shark Plushie, the apex predator of snuggles! With its sleek and understated design, this plushie strikes the perfect balance between cuddle companion and imaginary ocean guardian. Beware; opponents may be mesmerized by its dorsal fin's hypnotic sway!
 loadout-description-LoadoutItemPlushieCarp = Brace for extraterrestrial antics with the Purple Space Carp Plushie! A fishy invader from the cosmic deep, this plushie brings a splash of humor to zero-gravity escapades. From hostile waters to interstellar giggles, it's a cuddly contradiction that's out of this world
+loadout-description-LoadoutSolCommonTranslator = The most common of all translators, such that it can be purchased in any civilized station.
+                                                 This device translates Sol Common speech into Galactic Common.
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -607,6 +607,20 @@
   - type: Clothing
     sprite: Clothing/Belt/securitywebbing.rsi
 
+- type: entity
+  parent: ClothingBeltSecurityWebbing
+  id: ClothingBeltSecurityWebbingFilled
+  name: security webbing
+  description: Unique and versatile chest rig, can hold security gear.
+  components:
+  - type: StorageFill
+    contents:
+      - id: GrenadeFlashBang
+      - id: TearGasGrenade
+      - id: Stunbaton
+      - id: Handcuffs
+      - id: Handcuffs
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltMercWebbing

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -80,7 +80,7 @@
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: Omnizine
-            Quantity: 30
+            Quantity: 5
 
 - type: entity
   id: CigaretteOmnizine

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -182,7 +182,7 @@
   id: CigPackSyndicate
   parent: CigPackBase
   name: Interdyne herbals packet
-  description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves.
+  description: Premium medicinal cigarettes from the Interdyne Corporation. Not endorsed by the Terra-Gov Surgeon General.
   components:
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi

diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
@@ -64,19 +64,6 @@
   items:
     - ClothingUniformJumpsuitSeniorEngineer
 
-- type: loadout
-  id: LoadoutEngineeringChickenSuit # :)
-  category: Jobs
-  cost: 3
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - AtmosphericTechnician
-  items:
-    - ClothingOuterSuitChicken
-    - ClothingHeadHatChickenhead
-
 - type: loadout
   id: LoadoutEngineeringEyesMeson
   category: Jobs