Stable merge (#38822)

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

@@ -50,7 +50,6 @@
   - type: StorageFill
     contents:
       - id: ClothingHeadHatHopcap
-      - id: ClothingHeadHatBeretHop
       - id: ClothingOuterWinterHoP
       - id: ClothingEyesGlasses
       - id: ClothingNeckCloakHop

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -66,52 +66,6 @@
   categories:
   - UplinkWeaponry
 
-- type: listing
-  id: UplinkHyperEutacticBlade
-  name: uplink-hypereutactic-blade-name
-  description: uplink-hypereutactic-blade-desc
-  icon: { sprite: /Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi, state: icon }
-  discountCategory: veryRareDiscounts
-  discountDownTo:
-    Telecrystal: 15
-  productEntity: HyperEutacticBlade
-  cost:
-    Telecrystal: 18
-  categories:
-  - UplinkWeaponry
-  conditions:
-  - !type:BuyerWhitelistCondition
-    blacklist:
-      components:
-      - SurplusBundle
-  - !type:StoreWhitelistCondition
-    blacklist:
-      tags:
-      - NukeOpsUplink
-
-- type: listing
-  id: UplinkHyperEutaticBlade
-  name: uplink-hypereutatic-blade-name
-  description: uplink-hypereutatic-blade-desc
-  icon: { sprite: /Textures/Objects/Weapons/Melee/hypereutactic_blade.rsi, state: icon }
-  discountCategory: veryRareDiscounts
-  discountDownTo:
-    Telecrystal: 13
-  productEntity: HyperEutaticBlade
-  cost:
-    Telecrystal: 16
-  categories:
-  - UplinkWeaponry
-  conditions:
-  - !type:BuyerWhitelistCondition
-    blacklist:
-      components:
-      - SurplusBundle
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - NukeOpsUplink
-
 - type: listing
   id: UplinkEnergyDagger
   name: uplink-edagger-name

Resources/Prototypes/Datasets/Names/scurret.yml

@@ -2,10 +2,10 @@
   id: NamesFirstScurret
   values:
     prefix: names-scurret-first-dataset-
-    count: 36
+    count: 50
 
 - type: localizedDataset
   id: NamesLastScurret
   values:
     prefix: names-scurret-last-dataset-
-    count: 36
+    count: 50

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -1360,20 +1360,3 @@
       path: /Audio/Items/flashlight_on.ogg
     soundDeactivate:
       path: /Audio/Items/flashlight_off.ogg
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatBeretHop
-  name: head of personnel's beret
-  description: A dark blue beret with a ruby inserted in the center, for true connoisseurs of bureaucracy!
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hats/beret_hop.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hats/beret_hop.rsi
-  - type: Tag
-    tags:
-    - HamsterWearable
-    - ClothMade
-    - Recyclable
-    - WhitelistChameleon

Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml

@@ -104,6 +104,38 @@
           32:
             sprite: Mobs/Animals/scurret/displacement.rsi
             state: neck
+      ears:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: ears
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: eyes
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: mask
+      back:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/scurret/displacement.rsi
+            state: back
+  - type: Hands
+    leftHandDisplacement:
+      sizeMaps:
+        32:
+          sprite: Mobs/Animals/scurret/displacement.rsi
+          state: hand
+
   - type: InventorySlots
   - type: Food
   - type: Hunger
@@ -139,6 +171,14 @@
     available:
     - enum.DamageStateVisualLayers.Base:
         scurret: ScurretColors
+  # They are of a mysterious gender.
+  - type: Grammar
+    attributes:
+      gender: epicene
+      proper: true
+  # Strips the name identifier from them, so they're just "Confident Waters" rather than "Confident Waters (123)"
+  - type: NameIdentifier
+    group: null
 
 # Emotional Support Scurrets have a ghost role and equipment. At the moment, these are intended to be used for admemes, but
 # feel free to hook them into random content.
@@ -169,4 +209,4 @@
   name: Emotional Support Scurret
   id: MobEmotionalSupportScurret
   parent: [MobScurret, MobBaseEmotionalSupportScurret]
-  description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnolds's Pizza's "loyal workforce". This one is here as a temp.
+  description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnold's Pizza's "loyal workforce". This one is here as a temp.

Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml

@@ -296,12 +296,11 @@
             Slash: 12
             Heat: 12
             Structural: 15
-  # Disabled until the wield active sfx no longer stacks
-  #- type: ItemToggleActiveSound
-  #  activeSound:
-  #    path: /Audio/Weapons/ebladehum.ogg
-  #    params:
-  #      volume: 3
+  - type: ItemToggleActiveSound
+    activeSound:
+      path: /Audio/Weapons/ebladehum.ogg
+      params:
+        volume: 3
   - type: ComponentToggler
     components:
     - type: Sharp
@@ -387,17 +386,6 @@
     reflectProb: 1.0
     spread: 75
 
-# Nukie variant, reduced reflection rate.
-- type: entity
-  parent: HyperEutacticBlade
-  id: HyperEutaticBlade
-  name: hypereutatic-blade
-  description: Often mistaken for the Hypereutactic Blade. This mass produced, off-brand, knockoff gets the same job done but with less reflection.
-  components:
-  - type: Reflect
-    reflectProb: 0.75
-    spread: 75
-
 # Borgs
 - type: entity
   suffix: One-Handed, For Borgs

Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml

@@ -35,11 +35,6 @@
   equipment:
     head: ClothingHeadHatHopcap
 
-- type: loadout
-  id: HoPBeret
-  equipment:
-    head: ClothingHeadHatBeretHop
-
 # Neck
 - type: loadout
   id: HoPCloak

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -153,7 +153,6 @@
   minLimit: 0
   loadouts:
   - HoPHead
-  - HoPBeret
 
 - type: loadoutGroup
   id: HoPJumpsuit

Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml

@@ -33,7 +33,6 @@
   - ClothingUniformJumpskirtCapFormalDress
   # HoP
   - ClothingHeadHatHopcap
-  - ClothingHeadHatBeretHop
   - ClothingUniformJumpsuitHoP
   - ClothingUniformJumpskirtHoP
   # Generic

Resources/Prototypes/Recipes/Lathes/clothing.yml

@@ -810,11 +810,6 @@
   id: ClothingHeadHatHopcap
   result: ClothingHeadHatHopcap
 
-- type: latheRecipe
-  parent: BaseCommandHatRecipe
-  id: ClothingHeadHatBeretHop
-  result: ClothingHeadHatBeretHop
-  
 - type: latheRecipe
   parent: BaseCommandHatRecipe
   id: ClothingHeadHatQMsoft