Merge branch 'master' into frontier-guns

Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs

@@ -21,7 +21,7 @@ private void NfInitialize()
     private void OnSetInertiaDampening(EntityUid uid, ShuttleConsoleComponent component, SetInertiaDampeningRequest args)
     {
         // Ensure that the entity requested is a valid shuttle (stations should not be togglable)
-        if (!EntityManager.TryGetComponent(uid, out TransformComponent? transform) ||
+        if (!EntityManager.TryGetComponent(GetEntity(args.ShuttleEntityUid), out TransformComponent? transform) ||
             !transform.GridUid.HasValue ||
             !EntityManager.TryGetComponent(transform.GridUid, out PhysicsComponent? physicsComponent) ||
             !EntityManager.TryGetComponent(transform.GridUid, out ShuttleComponent? shuttleComponent))

Resources/Changelog/Den.yml

@@ -734,3 +734,13 @@ Entries:
   id: 67
   time: '2025-01-05T00:24:49.0000000+00:00'
   url: https://github.com/TheDenSS14/TheDen/pull/124
+- author: Rosycup
+  changes:
+    - type: Tweak
+      message: >-
+        Changed Striking Calluses to be usable by other species, requiring
+        having blunt unarmed attacks (Whether by default or by having the
+        Natural Weapons Removal trait). Fisticuffs for everyone!
+  id: 68
+  time: '2025-01-05T05:06:52.0000000+00:00'
+  url: https://github.com/TheDenSS14/TheDen/pull/129

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -20,7 +20,7 @@
     ClothingEyesGlasses: 6
     ClothingHandsGlovesColorBlack: 4
     ClothingEyesGlassesCheapSunglasses: 2
-    ClothingUniformLoinCloth: 5 # FloofStation
+    ClothingUniformNudityPermit: 5 # FloofStation
     ClothingNeckCollarBlue: 1 # Floofstation - Collar addition
     ClothingNeckCollarBlack: 1 # Floofstation - Collar addition
     ClothingNeckCollarPink: 1 # Floofstation - Collar addition

Resources/Prototypes/Floof/CharacterItemGroups/uniformGroup.yml

@@ -191,7 +191,7 @@
     - type: loadout
       id: LoadoutClothingJumpsuitSuitWhiteMob
     - type: loadout
-      id: LoadoutUniformLoinCloth
+      id: ClothingUniformNudityPermit
     - type: loadout
       id: LoadoutUniformJumpskirtTacticalMaid
     - type: loadout

Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml

@@ -1,15 +1,15 @@
 - type: entity
   parent: ClothingUniformBase
-  id: ClothingUniformLoinCloth
-  name: loin cloth
-  description: A piece of cloth wrapped around the waist.
+  id: ClothingUniformNudityPermit
+  name: public nudity permit
+  description: This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide.
   components:
   - type: Item
     size: Small
   - type: Sprite
-    sprite: Floof/Clothing/Uniforms/loincloth.rsi
+    sprite: Floof/Clothing/Uniforms/nuditypermit.rsi
   - type: Clothing
-    sprite: Floof/Clothing/Uniforms/loincloth.rsi
+    sprite: Floof/Clothing/Uniforms/nuditypermit.rsi
     equipDelay: 0
     unequipDelay: 0
   - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts

Resources/Prototypes/Floof/Loadouts/uniform.yml

@@ -1,10 +1,10 @@
 - type: loadout
-  id: LoadoutUniformLoinCloth
+  id: ClothingUniformNudityPermit
   category: Uniform
   cost: 0
   exclusive: true
   items:
-    - ClothingUniformLoinCloth
+    - ClothingUniformNudityPermit
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutUniformsCivilian2

Resources/Prototypes/Traits/physical.yml

@@ -391,9 +391,9 @@
       inverted: true
       jobs:
         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
-    - !type:CharacterSpeciesRequirement
-      species:
-        - Human # Entirely arbitrary, I've decided I want a trait unique to humans. Since they don't normally get anything exciting.
+    #- !type:CharacterSpeciesRequirement
+    #  species:
+    #    - Human # Entirely arbitrary, I've decided I want a trait unique to humans. Since they don't normally get anything exciting.
                 # When we get the Character Records system in, I also want to make this require certain Backgrounds.
     - !type:CharacterTraitRequirement
       inverted: true
@@ -408,6 +408,21 @@
         - !type:CharacterJobRequirement
           jobs:
             - Boxer
+    - !type:CharacterLogicOrRequirement
+      requirements:
+        - !type:CharacterSpeciesRequirement
+          inverted: true
+          species:
+            - Arachne
+            - Harpy
+            - Felinid
+            - Reptilian
+            - Shadowkin
+            - Rodentia
+        - !type:CharacterTraitRequirement
+          traits:
+            - NaturalWeaponRemoval
+            - MartialArtist
   functions:
     - !type:TraitReplaceComponent
       components: