From d7e04b63143fe37beba5e9af6569ddb3bb00ab3a Mon Sep 17 00:00:00 2001 From: Farrellka-dev Date: Thu, 19 Dec 2024 12:34:31 +0300 Subject: [PATCH] tail & carrible fix --- .../Clothing/EntitySystems/ClothingSystem.cs | 9 +++++-- .../Entities/Mobs/Species/vulpkanin.yml | 2 +- .../Entities/Clothing/OuterClothing/suits.yml | 4 +++ .../Prototypes/Entities/Mobs/Player/dwarf.yml | 2 +- .../Entities/Mobs/Player/familiars.yml | 11 +++++--- .../Entities/Mobs/Player/guardian.yml | 1 + .../Prototypes/Entities/Mobs/Player/ipc.yml | 26 ++++++++++--------- .../Prototypes/Entities/Mobs/Player/moth.yml | 2 +- .../Entities/Mobs/Player/ratvar.yml | 2 +- .../Entities/Mobs/Player/shadowkin.yml | 2 +- .../Entities/Mobs/Player/silicon_base.yml | 2 +- .../Prototypes/Entities/Mobs/Player/slime.yml | 2 +- .../Prototypes/Entities/Mobs/Player/vox.yml | 2 +- .../Entities/Mobs/Species/arachne.yml | 8 +++++- .../Entities/Mobs/Species/arachnid.yml | 9 +++---- .../Entities/Mobs/Species/diona.yml | 2 +- .../Entities/Mobs/Species/dwarf.yml | 4 ++- .../Entities/Mobs/Species/harpy.yml | 2 +- .../Entities/Mobs/Species/human.yml | 2 +- .../Prototypes/Entities/Mobs/Species/moth.yml | 2 +- .../Entities/Mobs/Species/reptilian.yml | 2 +- .../Entities/Mobs/Species/skeleton.yml | 5 ++-- .../Entities/Mobs/Species/slime.yml | 2 +- .../Prototypes/Entities/Mobs/Species/vox.yml | 1 - .../Shark/Entities/Mobs/Species/Shark.yml | 2 +- 25 files changed, 66 insertions(+), 42 deletions(-) diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index e6f52caf5c4..cb58c1d203e 100644 --- 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 index 73bafd46313..62a9dcb0e96 100644 --- 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 index 6215fb3b45a..a9aaab8b2e9 100644 --- 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 index f8f0ddd2b9d..d1de65df012 100644 --- 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 \ No newline at end of file + id: MobDwarf diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml index 0804ba82584..95c87fcb635 100644 --- 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 index 6d90ac3ffee..b29e55e271d 100644 --- 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 index 6398895a156..bc865fce74f 100644 --- 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 index e79ba1a454f..ea01677626d 100644 --- 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 \ No newline at end of file + id: MobMoth diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml index 5a45bff2950..958c98f483e 100644 --- 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 \ No newline at end of file + location: Ratvar diff --git a/Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Player/shadowkin.yml index 2a58fe5c1fe..7b34aa41a3b 100644 --- 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 \ No newline at end of file + id: MobShadowkin diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml index 5292bc38971..ea96a1c6a19 100644 --- 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 index d748ff8f3cb..4e5974b3084 100644 --- 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 \ No newline at end of file + id: MobSlimePerson diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml index e7ad39d7316..d88732bafa6 100644 --- 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 \ No newline at end of file + id: MobVox diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml index d315b0cbf39..d3785827104 100644 --- 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 index 192f3b2b4ae..2195ca447ef 100644 --- 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 index 66153af5c95..113151ad083 100644 --- 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 index c5744daafa6..455d6dd6a2f 100644 --- 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 index ce87e105497..1d0d60b2da8 100644 --- 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 \ No newline at end of file + event: !type:ToggleFlightEvent diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 9ac27204e00..013789cd2be 100644 --- 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 index 2f851cc71bc..5474b559111 100644 --- 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 index f95594b1b3c..1c757458c9f 100644 --- 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 index 4ce5b7e78cf..55d599f46c4 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index b69dc243938..7faade46f84 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -6,7 +6,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 state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index ec8035563b7..7dcfcb29bdd 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -112,4 +112,3 @@ species: Vox - type: Body prototype: Vox - diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml index 5bb83e60d35..b2d8630f329 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml @@ -66,7 +66,7 @@ - TauCetiBasic # # - type: EmotePanel # race: Shark - #- type: Carriable + - type: Carriable - type: entity save: false