Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls

# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs

Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

@@ -607,6 +607,8 @@
 - type: randomHumanoidSettings
   id: LostCargoTechnician
   parent: EventHumanoid
+  speciesBlacklist:
+  - Vox
   components:
     - type: GhostRole
       name: ghost-role-information-lost-cargo-technical-name
@@ -658,6 +660,8 @@
   id: ClownTroupe
   parent: EventHumanoid
   randomizeName: false
+  speciesBlacklist:
+  - Vox
   components:
     - type: GhostRole
       name: ghost-role-information-clown-troupe-name
@@ -708,6 +712,8 @@
 - type: randomHumanoidSettings
   id: TravelingChef
   parent: EventHumanoid
+  speciesBlacklist:
+  - Vox
   components:
     - type: GhostRole
       name: ghost-role-information-traveling-chef-name
@@ -768,6 +774,8 @@
 - type: randomHumanoidSettings
   id: DisasterVictimHead
   parent: EventHumanoidMindShielded
+  speciesBlacklist:
+  - Vox
   components:
     - type: GhostRole
       name: ghost-role-information-disaster-victim-name
@@ -826,6 +834,8 @@
 - type: randomHumanoidSettings
   id: SyndieDisasterVictim
   parent: EventHumanoid
+  speciesBlacklist:
+  - Vox
   components:
     - type: NpcFactionMember
       factions:

Resources/Prototypes/Entities/Mobs/Species/reptilian.yml

@@ -71,5 +71,11 @@
   components:
   - type: HumanoidAppearance
     species: Reptilian
+    hideLayersOnEquip:
+    - Snout
+    - HeadTop
+    - HeadSide
+  - type: Inventory
+    speciesId: reptilian
 
 #Weh

Resources/Prototypes/Entities/Structures/Walls/walls.yml

@@ -1109,6 +1109,11 @@
   - type: IconSmooth
     key: walls
     base: mining
+  - type: RandomIconSmooth
+    randomStates:
+    - mining
+    - miningB
+  - type: Appearance
 
 - type: entity
   parent: WallShuttleDiagonal

Resources/Prototypes/GameRules/events.yml

@@ -151,6 +151,10 @@
     minimumPlayers: 30
   - type: SpaceSpawnRule
   - type: AntagLoadProfileRule
+    # Vox disabled until loadouts work on AntagSelection-based spawns
+    speciesOverride: Human
+    speciesOverrideBlacklist:
+    - Vox
   - type: AntagObjectives
     objectives:
     - StealResearchObjective