tail & carrible fix

Lost-Paradise-Project · Dec 19, 2024 · d7e04b6 · d7e04b6
1 parent 4a4cff1
commit d7e04b6
Show file tree

Hide file tree

Showing 25 changed files with 66 additions and 42 deletions.
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -137,6 +137,11 @@ protected virtual void OnGotEquipped(EntityUid uid, ClothingComponent component,
         component.InSlot = args.Slot;
         CheckEquipmentForLayerHide(args.Equipment, args.Equipee);
 
+        if (_tagSystem.HasTag(args.Equipment, TailTag))
+        {
+            _humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Tail, false);
+        }
+
         if ((component.Slots & args.SlotFlags) != SlotFlags.NONE)
         {
             var gotEquippedEvent = new ClothingGotEquippedEvent(args.Equipee, component);
@@ -160,10 +165,10 @@ protected virtual void OnGotUnequipped(EntityUid uid, ClothingComponent componen
 
         component.InSlot = null;
         CheckEquipmentForLayerHide(args.Equipment, args.Equipee);
-        if ((new string[] { "outerClothing" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipee, TailTag) && _tagSystem.HasTag(args.Equipment, TailTag))
+
+        if (_tagSystem.HasTag(args.Equipment, TailTag))
         {
             _humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Tail, true);
-            TryComp(args.Equipee, out AppearanceComponent? appearance);
         }
     }
 

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -9,7 +9,7 @@
     species: Vulpkanin
   - type: Hunger
     baseDecayRate: 0.02083333332 # 25% more than default
-  #- type: Carriable # Carrying system from nyanotrasen.
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Inventory # Allows vulps to wear properly shaped helmets
     speciesId: vulpkanin
   - type: Thirst

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -27,6 +27,7 @@
     - WhitelistChameleon
     - FullBodyOuter
     - HidesHarpyWings
+    - HidesTail
   - type: ClothingRequiredStepTriggerImmune
     slots: WITHOUT_POCKET
 
@@ -86,6 +87,7 @@
     tags:
       - WhitelistChameleon
       - HidesHarpyWings
+      - HidesTail
 
 - type: entity
   parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]
@@ -122,6 +124,7 @@
         - FullBodyOuter
         - WhitelistChameleon
         - HidesHarpyWings
+        - HidesTail
 
 - type: entity
   parent: [ClothingOuterBaseLarge, GeigerCounterClothing, AllowSuitStorageClothing]
@@ -152,6 +155,7 @@
       - FullBodyOuter
       - WhitelistChameleon
       - HidesHarpyWings
+      - HidesTail
 
 - type: entity
   parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing]

diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -2,4 +2,4 @@
   save: false
   name: Urist McHands The Dwarf
   parent: BaseMobDwarf
-  id: MobDwarf
+  id: MobDwarf
diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -28,7 +28,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Dead
+      50: Dead
   - type: Damageable
     damageContainer: CorporealSpirit
     damageModifierSet: CorporealSpirit
@@ -61,12 +61,11 @@
     attackMemoryLength: 10
     retaliateFriendlies: true
   - type: PsionicFamiliar
+  - type: Dispellable
   - type: DamageOnDispel
     damage:
       types:
         Heat: 100
-  - type: RandomMetadata
-    nameSegments: [names_golem]
 
 - type: entity
   name: Remilia
@@ -130,6 +129,10 @@
     damage:
       types:
         Piercing: 5
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      30: Dead
 
 - type: entity
   name: Cerberus
@@ -239,3 +242,5 @@
         - Opaque
         layer:
         - MobLayer
+  - type: RandomMetadata
+    nameSegments: [names_golem]
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -104,6 +104,7 @@
     - type: Tag
       tags:
         - CannotSuicide
+        - NoPaint
 
 # From the uplink injector
 - type: entity

diff --git a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
@@ -30,13 +30,13 @@
     unlockTime: 5
   - type: NpcFactionMember
     factions:
-    - NanoTrasen
+      - NanoTrasen
   - type: StandingState
   - type: MobState
     allowedStates:
-    - Alive
-    - Critical
-    - Dead
+      - Alive
+      - Critical
+      - Dead
   - type: MobThresholds
     thresholds:
       0: Alive
@@ -50,12 +50,12 @@
     proto: robot
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 400
-      behaviors:
-      - !type:GibBehavior { }
+      - trigger:
+          !type:DamageTypeTrigger
+          damageType: Blunt
+          damage: 400
+        behaviors:
+          - !type:GibBehavior { }
   - type: SlowOnDamage
     speedModifierThresholds:
       60: 0.7
@@ -66,7 +66,7 @@
     templateId: ipc
   - type: GuideHelp
     guides:
-    - IPCs
+      - IPCs
   - type: Silicon
     entityType: enum.SiliconType.Player
     batteryPowered: true
@@ -105,7 +105,9 @@
   - type: PsionicInsulation
   - type: OfferItem
   - type: LayingDown
-#  - type: Carriable
+  - type: Carriable
+  - type: StatusIcon
+    bounds: -0.5,-0.5,0.5,0.5
   - type: StepTriggerImmune
     whitelist:
       types:

diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
@@ -2,4 +2,4 @@
   save: false
   name: Urist McFluff
   parent: BaseMobMoth
-  id: MobMoth
+  id: MobMoth
diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
@@ -91,4 +91,4 @@
     maxRange: 8
   - type: WarpPoint
     follow: true
-    location: Ratvar
+    location: Ratvar
diff --git a/Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml
@@ -2,4 +2,4 @@
   save: false
   name: Urist McShadow
   parent: MobShadowkinBase
-  id: MobShadowkin
+  id: MobShadowkin
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml
@@ -79,7 +79,7 @@
         - trigger: !type:DamageTrigger
             damage: 500
           behaviors:
-            - !type:GibBehavior {}
+            - !type:GibBehavior { }
     - type: Icon
       sprite: Mobs/Species/IPC/parts.rsi
       state: full

diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -1,4 +1,4 @@
 - type: entity
   save: false
   parent: BaseMobSlimePerson
-  id: MobSlimePerson
+  id: MobSlimePerson
diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -2,4 +2,4 @@
   save: false
   name: Urist McVox
   parent: BaseMobVox
-  id: MobVox
+  id: MobVox
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
@@ -22,6 +22,7 @@
       color: "#e8b59b"
       sprite: Mobs/Species/Human/parts.rsi
       state: head_m
+    - map: [ "enum.HumanoidVisualLayers.Snout" ]
     - map: [ "enum.HumanoidVisualLayers.Eyes" ]
       color: "#008800"
       sprite: Mobs/Species/eyes.rsi
@@ -42,7 +43,6 @@
       sprite: Mobs/Customization/anytaur_masking_helpers.rsi
       state: unisex_full
       visible: false
-    - map: [ "breast" ]
     - map: [ "jumpsuit" ]
     - map: [ "enum.HumanoidVisualLayers.LHand" ]
       color: "#e8b59b"
@@ -66,10 +66,12 @@
     - map: [ "belt" ]
     - map: [ "neck" ]
     - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
       state: bald
       sprite: Mobs/Customization/human_hair.rsi
     - map: [ "mask" ]
+    - map: [ "enum.HumanoidVisualLayers.HeadSide" ] # This is not in the default order so earrings are rendered above masks
     - map: [ "head" ]
     - map: [ "pocket1" ]
     - map: [ "pocket2" ]
@@ -105,6 +107,7 @@
   - type: Tag
     tags:
     - CanPilot
+    - FootstepSound
     - DoorBumpOpener
   - type: StepTriggerImmune
   - type: Bloodstream
@@ -161,6 +164,7 @@
       color: "#e8b59b"
       sprite: Mobs/Species/Human/parts.rsi
       state: head_m
+    - map: [ "enum.HumanoidVisualLayers.Snout" ]
     - map: [ "enum.HumanoidVisualLayers.Eyes" ]
       color: "#008800"
       sprite: Mobs/Species/eyes.rsi
@@ -204,10 +208,12 @@
     - map: [ "belt" ]
     - map: [ "neck" ]
     - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
       state: bald
       sprite: Mobs/Customization/human_hair.rsi
     - map: [ "mask" ]
+    - map: [ "enum.HumanoidVisualLayers.HeadSide" ] # This is not in the default order so earrings are rendered above masks
     - map: [ "head" ]
     - map: [ "pocket1" ]
     - map: [ "pocket2" ]

diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -12,7 +12,7 @@
     species: Arachnid
   - type: Hunger
     baseDecayRate: 0.0125 # Spiders have slow metabolisms all things considered, so I decided to just make their hunger drain slower.
-  #- type: Carriable # Carrying system from nyanotrasen.
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Thirst
   - type: Sericulture
     action: ActionSericulture
@@ -95,12 +95,9 @@
         sprite: Mobs/Customization/masking_helpers.rsi
         state: unisex_full
         visible: false
-      - map: [ "breast" ]
-      - map: [ "underwear" ]
+      - map: ["jumpsuit"]
       - map: ["enum.HumanoidVisualLayers.LFoot"]
       - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: [ "socks" ]
-      - map: ["jumpsuit"]
       - map: ["enum.HumanoidVisualLayers.LHand"]
       - map: ["enum.HumanoidVisualLayers.RHand"]
       - map: [ "gloves" ]
@@ -130,6 +127,8 @@
         sprite: "Effects/creampie.rsi"
         state: "creampie_arachnid"
         visible: false
+  - type: Spider
+  - type: IgnoreSpiderWeb
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -11,7 +11,7 @@
     baseDecayRate: 0.0083
   - type: Thirst
     baseDecayRate: 0.0083
-  #- type: Carriable # Carrying system from nyanotrasen.
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon
     sprite: Mobs/Species/Diona/parts.rsi
     state: full

diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -7,7 +7,7 @@
   components:
   - type: Hunger
   - type: Thirst
-  #- type: Carriable # Carrying system from nyanotrasen.
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon
     sprite: Mobs/Species/Slime/parts.rsi # It was like this beforehand, no idea why.
     state: full
@@ -65,6 +65,8 @@
     - SolCommon
   - type: LightweightDrunk
     boozeStrengthMultiplier: 0.5
+  - type: Stamina
+    critThreshold: 115
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
@@ -218,4 +218,4 @@
     checkCanInteract: false
     icon: { sprite: Interface/Actions/flight.rsi, state: flight_off }
     iconOn: { sprite : Interface/Actions/flight.rsi, state: flight_on }
-    event: !type:ToggleFlightEvent
+    event: !type:ToggleFlightEvent
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -10,7 +10,7 @@
     sprite: Mobs/Species/Human/parts.rsi
     state: full
   - type: Thirst
-  #- type: Carriable # Carrying system from nyanotrasen.
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Butcherable
     butcheringType: Spike
     spawned:

diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -9,7 +9,7 @@
     species: Moth
   - type: Hunger
   - type: Thirst
-  #- type: Carriable # Carrying system from nyanotrasen.
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon
     sprite: Mobs/Species/Moth/parts.rsi
     state: full

diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -11,7 +11,7 @@
   - type: Puller
     needsHands: false
   - type: Thirst
-  #- type: Carriable # Carrying system from nyanotrasen.
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon
     sprite: Mobs/Species/Reptilian/parts.rsi
     state: full

diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -9,7 +9,7 @@
   components:
   - type: HumanoidAppearance
     species: Skeleton
-  #- type: Carriable # Carrying system from nyanotrasen.
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon
     sprite: Mobs/Species/Skeleton/parts.rsi
     state: full
@@ -40,7 +40,8 @@
         !type:DamageTrigger
         damage: 150
       behaviors:
-      - !type:GibBehavior { }
+      - !type:GibBehavior
+        gibContents: Skip
   - type: SlowOnDamage #modified speeds because they're so weak
     speedModifierThresholds:
       60: 0.9