From cc5300d1ef19edf9dc8cbbee32c9ba8af46c9e06 Mon Sep 17 00:00:00 2001 From: Coryler Date: Tue, 26 May 2026 22:42:03 +0200 Subject: [PATCH] More progress against the linter --- Content.Shared/Body/BodySystem.cs | 38 ++ Content.Shared/Body/OrganComponent.cs | 7 + .../Prototypes/Body/Species/vulpkanin.yml | 4 +- .../Prototypes/Catalog/uplink_catalog.yml | 2 +- .../Mobs/Customization/Markings/gauze.yml | 34 +- .../Customization/Markings/human_noses.yml | 10 +- .../Mobs/Customization/Markings/scars.yml | 24 +- .../Mobs/Customization/Markings/tattoos.yml | 20 +- .../Customization/Markings/undergarments.yml | 14 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 3 - .../Prototypes/Entities/Mobs/Player/clone.yml | 1 - .../Objects/Specific/Service/barber.yml | 4 - .../Mobs/Customization/Markings/Oni_horns.yml | 21 +- .../Mobs/Customization/Markings/felinid.yml | 36 +- .../Mobs/Customization/Markings/moth.yml | 375 ++++++------------ .../Reagents/Consumable/Drink/alcohol.yml | 18 +- .../Reagents/Consumable/Drink/drinks.yml | 6 +- .../Reagents/Consumable/Food/condiments.yml | 8 +- .../Reagents/Consumable/Food/food.yml | 4 +- .../Nyanotrasen/Reagents/psionic.yml | 12 +- Resources/Prototypes/Reagents/narcotics.yml | 2 +- .../Prototypes/Roles/Jobs/Wildcards/boxer.yml | 2 +- .../Prototypes/_CD/Reagents/biological.yml | 2 +- .../Reagents/Consumable/Drink/alcohol.yml | 34 +- .../Prototypes/_DV/Actions/station_ai.yml | 4 +- .../Prototypes/_DV/Body/Species/feroxi.yml | 5 - .../Prototypes/_DV/Body/Species/harpy.yml | 5 - .../Prototypes/_DV/Body/Species/motorkind.yml | 11 - .../Prototypes/_DV/Catalog/Uplink/job.yml | 2 +- .../_DV/CosmicCult/Mobs/colossus.yml | 6 +- .../Prototypes/_DV/CosmicCult/entropy.yml | 4 +- .../Entities/Objects/Specific/Mail/mail.yml | 36 +- .../Objects/Specific/Medical/healing.yml | 2 +- .../Prototypes/_DV/Mail/mailDeliveries.yml | 2 +- .../_DV/Reagents/Consumable/Drink/alcohol.yml | 14 +- .../_DV/Reagents/Consumable/Drink/drinks.yml | 22 +- .../_DV/Reagents/Consumable/Drink/soda.yml | 16 +- .../Prototypes/_DV/Reagents/biological.yml | 4 +- Resources/Prototypes/_DV/Reagents/fun.yml | 2 +- .../Prototypes/_DV/Reagents/medicine.yml | 14 +- .../Prototypes/_DV/Reagents/narcotics.yml | 2 +- .../Reagents/Consumable/Food/ingredients.yml | 2 +- .../_Funkystation/Reagents/exotic.yml | 14 +- .../_Funkystation/Reagents/medicine.yml | 20 +- .../_Funkystation/Reagents/toxins.yml | 8 +- .../_Impstation/reagents/medicine.yml | 2 +- .../_Impstation/reagents/pyrotechnic.yml | 2 +- .../_NF/Reagents/Consumables/Drink/drinks.yml | 2 +- .../_NF/Reagents/Consumables/ingredients.yml | 2 +- .../_RMC14/Entities/Mobs/Markings/avali.yml | 116 ++---- .../Mobs/Customization/Marking/slime.yml | 51 +-- 51 files changed, 427 insertions(+), 624 deletions(-) diff --git a/Content.Shared/Body/BodySystem.cs b/Content.Shared/Body/BodySystem.cs index 4cd5a4e7924..b9c75b1e34b 100644 --- a/Content.Shared/Body/BodySystem.cs +++ b/Content.Shared/Body/BodySystem.cs @@ -33,6 +33,9 @@ public sealed partial class BodySystem : EntitySystem SubscribeLocalEvent(OnBodyEntInserted); SubscribeLocalEvent(OnBodyEntRemoved); + SubscribeLocalEvent(OnOrganInserted); + SubscribeLocalEvent(OnOrganRemoved); + _bodyQuery = GetEntityQuery(); _organQuery = GetEntityQuery(); @@ -97,4 +100,39 @@ public sealed partial class BodySystem : EntitySystem { args.Handled = true; } + + + // Delta V - Organ Functionality Solution + private void OnOrganInserted(Entity ent, ref OrganInsertedIntoEvent args) + { + if (!TryComp(args.Organ, out var organ) || organ.OnAdd == null) + return; + + // Delta V - Begin Organ Functionality Solution + foreach (var (key, comp) in organ.OnAdd) + { + var compType = comp.Component.GetType(); + if (HasComp(ent, compType)) + continue; + + AddComp(ent, comp.Component); + } + } + + private void OnOrganRemoved(Entity ent, ref OrganRemovedFromEvent args) + { + if (!TryComp(args.Organ, out var organ) || organ.OnAdd == null) + return; + + // Delta V - Begin Organ Functionality Solution + foreach (var (key, comp) in organ.OnAdd) + { + var compType = comp.Component.GetType(); + if (!HasComp(ent, compType)) + continue; + + RemComp(ent, comp.Component); + } + } + // Delta V - End } diff --git a/Content.Shared/Body/OrganComponent.cs b/Content.Shared/Body/OrganComponent.cs index cad2ad86da7..4021ca401f1 100644 --- a/Content.Shared/Body/OrganComponent.cs +++ b/Content.Shared/Body/OrganComponent.cs @@ -22,4 +22,11 @@ public sealed partial class OrganComponent : Component /// [DataField] public ProtoId? Category; + + // Delta V - Organ Functionality + /// + /// When attached, the organ ensures that these components are added onto the entity + /// + [DataField] + public ComponentRegistry? OnAdd; } diff --git a/Resources/Prototypes/Body/Species/vulpkanin.yml b/Resources/Prototypes/Body/Species/vulpkanin.yml index b4dfc5d773b..3877b563ede 100644 --- a/Resources/Prototypes/Body/Species/vulpkanin.yml +++ b/Resources/Prototypes/Body/Species/vulpkanin.yml @@ -26,7 +26,7 @@ enum.HumanoidVisualLayers.Tail: limit: 1 required: true - default: [ VulpTailVulp ] + default: [ VulpTail ] enum.HumanoidVisualLayers.LArm: limit: 2 required: false @@ -54,11 +54,9 @@ enum.HumanoidVisualLayers.UndergarmentTop: limit: 1 required: false - nudityDefault: [ UndergarmentTopTanktopVulpkanin ] enum.HumanoidVisualLayers.UndergarmentBottom: limit: 1 required: false - nudityDefault: [ UndergarmentBottomBoxersVulpkanin ] - type: entity parent: BaseSpeciesAppearance diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index b0dfd2e73e9..58074cf78f2 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -2187,7 +2187,7 @@ id: uplinkRiggedBoxingGlovesPassenger name: uplink-rigged-boxing-gloves-name description: uplink-rigged-boxing-gloves-desc - productEntity: ClothingHandsGlovesBoxingRigged + productEntity: ClothingHandsGlovesBoxingRiggedRed discountCategory: usualDiscounts discountDownTo: Telecrystal: 3 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 686a56cdc2b..325adbef0d1 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -1,7 +1,7 @@ - type: marking id: GauzeLefteyePatch bodyPart: Eyes - groupWhitelist: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi + groupWhitelist: [Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi coloring: default: type: @@ -14,7 +14,7 @@ - type: marking id: GauzeLefteyePad bodyPart: Eyes - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi + groupWhitelist: [Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi coloring: default: type: @@ -27,7 +27,7 @@ - type: marking id: GauzeRighteyePatch bodyPart: Eyes - groupWhitelist: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi + groupWhitelist: [Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi coloring: default: type: @@ -40,7 +40,7 @@ - type: marking id: GauzeRighteyePad bodyPart: Eyes - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi + groupWhitelist: [Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi coloring: default: type: @@ -53,7 +53,7 @@ - type: marking id: GauzeBlindfold bodyPart: Eyes - groupWhitelist: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi + groupWhitelist: [Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid-Feroxi coloring: default: type: @@ -66,7 +66,7 @@ - type: marking id: GauzeShoulder bodyPart: Chest - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Avali] # Delta V - Felinid-Avali + groupWhitelist: [Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Avali] # Delta V - Felinid-Avali coloring: default: type: @@ -79,7 +79,7 @@ - type: marking id: GauzeStomach bodyPart: Chest - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Thaven, Feroxi] # Delta V - Felinid-Feroxi + groupWhitelist: [Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Thaven, Feroxi] # Delta V - Felinid-Feroxi coloring: default: type: @@ -92,7 +92,7 @@ - type: marking id: GauzeUpperArmRight bodyPart: RArm - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Slime, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Reptilian, Arachnid, Slime, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -105,7 +105,7 @@ - type: marking id: GauzeLowerArmRight bodyPart: RHand - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Slime, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Reptilian, Arachnid, Slime, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -118,7 +118,7 @@ - type: marking id: GauzeLeftArm bodyPart: LHand - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -131,7 +131,7 @@ - type: marking id: GauzeLowerLegLeft bodyPart: LFoot - groupWhitelist: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -144,7 +144,7 @@ - type: marking id: GauzeUpperLegLeft bodyPart: LLeg - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune, Avali] # DeltaV - Felinid-Avali + groupWhitelist: [Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune, Avali] # DeltaV - Felinid-Avali coloring: default: type: @@ -157,7 +157,7 @@ - type: marking id: GauzeUpperLegRight bodyPart: RLeg - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune, Avali] # DeltaV - Felinid-Avali + groupWhitelist: [Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune, Avali] # DeltaV - Felinid-Avali coloring: default: type: @@ -170,7 +170,7 @@ - type: marking id: GauzeLowerLegRight bodyPart: RFoot - groupWhitelist: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -183,7 +183,7 @@ - type: marking id: GauzeBoxerWrapRight bodyPart: RHand - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Slime, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Reptilian, Arachnid, Slime, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -196,7 +196,7 @@ - type: marking id: GauzeBoxerWrapLeft bodyPart: LHand - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Slime, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Reptilian, Arachnid, Slime, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -209,7 +209,7 @@ - type: marking id: GauzeHead bodyPart: Head - groupWhitelist: [Dwarf, Human, Reptilian, Arachnid, Moth, Chitinid, Thaven, Feroxi] # Delta V - Chitinid-Feroxi + groupWhitelist: [Human, Reptilian, Arachnid, Moth, Chitinid, Thaven, Feroxi] # Delta V - Chitinid-Feroxi coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml index 6d6abe4ca48..72bf4a1becf 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml @@ -2,7 +2,7 @@ id: HumanNoseSchnozz bodyPart: Snout forcedColoring: true - groupWhitelist: [Human, Dwarf, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/human_noses.rsi state: schnozz @@ -11,7 +11,7 @@ id: HumanNoseNubby bodyPart: Snout forcedColoring: true - groupWhitelist: [Human, Dwarf, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/human_noses.rsi state: nubby @@ -20,7 +20,7 @@ id: HumanNoseDroop bodyPart: Snout forcedColoring: true - groupWhitelist: [Human, Dwarf, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/human_noses.rsi state: droop @@ -29,7 +29,7 @@ id: HumanNoseBlob bodyPart: Snout forcedColoring: true - groupWhitelist: [Human, Dwarf, Felinid, Oni, Harpym Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/human_noses.rsi state: blob @@ -38,7 +38,7 @@ id: HumanNoseUppie bodyPart: Snout forcedColoring: true - groupWhitelist: [Human, Dwarf, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Harpy, Kitsune] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/human_noses.rsi state: uppie diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 77820e8b6ca..7244928c764 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -1,7 +1,7 @@ - type: marking id: ScarEyeRight bodyPart: Head - groupWhitelist: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi, Vulpkanin, Kitsune, Slime] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Harpy, Oni, Rodentia, Feroxi, Vulpkanin, Kitsune, Slime] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/scars.rsi state: scar_eye_right @@ -9,7 +9,7 @@ - type: marking id: ScarEyeLeft bodyPart: Head - groupWhitelist: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi, Vulpkanin, Kitsune, Slime] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Harpy, Oni, Rodentia, Feroxi, Vulpkanin, Kitsune, Slime] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/scars.rsi state: scar_eye_left @@ -17,7 +17,7 @@ - type: marking id: ScarTopSurgeryShort bodyPart: Chest - groupWhitelist: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime, Moth, Arachnid, Diona,] # DeltaV - Felinid-Avali + groupWhitelist: [Human, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime, Moth, Arachnid, Diona,] # DeltaV - Felinid-Avali sexRestriction: [Male] sprites: - sprite: Mobs/Customization/scars.rsi @@ -26,7 +26,7 @@ - type: marking id: ScarTopSurgeryLong bodyPart: Chest - groupWhitelist: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime, Moth, Arachnid, Diona] # DeltaV - Felinid-Avali + groupWhitelist: [Human, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime, Moth, Arachnid, Diona] # DeltaV - Felinid-Avali sexRestriction: [Male] sprites: - sprite: Mobs/Customization/scars.rsi @@ -35,7 +35,7 @@ - type: marking id: ScarChest bodyPart: Chest - groupWhitelist: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime, Moth, Arachnid, Diona] # DeltaV - Felinid-Avali + groupWhitelist: [Human, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime, Moth, Arachnid, Diona] # DeltaV - Felinid-Avali sprites: - sprite: Mobs/Customization/scars.rsi state: scar_chest @@ -43,7 +43,7 @@ - type: marking id: ScarNeck bodyPart: Head - groupWhitelist: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime] # DeltaV - Felinid-Avali + groupWhitelist: [Human, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime] # DeltaV - Felinid-Avali sprites: - sprite: Mobs/Customization/scars.rsi state: scar_neck @@ -51,7 +51,7 @@ - type: marking id: ScarChestBullets bodyPart: Chest - groupWhitelist: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime, Moth, Arachnid] # DeltaV - Felinid-Avali + groupWhitelist: [Human, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Avali, Reptilian, Slime, Moth, Arachnid] # DeltaV - Felinid-Avali sprites: - sprite: Mobs/Customization/scars.rsi state: scar_chest_bullets @@ -59,7 +59,7 @@ - type: marking id: ScarStomachBullets bodyPart: Chest - groupWhitelist: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Reptilian, Slime, Moth, Arachnid] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Reptilian, Slime, Moth, Arachnid] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/scars.rsi state: scar_stomach_bullets @@ -67,7 +67,7 @@ - type: marking id: ScarFace1 bodyPart: Head - groupWhitelist: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Reptilian, Slime, Moth] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Reptilian, Slime, Moth] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/scars.rsi state: scar_face_1 @@ -75,7 +75,7 @@ - type: marking id: ScarFace2 bodyPart: Head - groupWhitelist: [Human, Dwarf, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Reptilian, Slime, Moth] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Feroxi, Vulpkanin, Kitsune, Reptilian, Slime, Moth] # DeltaV - Felinid-Kitsune sprites: - sprite: Mobs/Customization/scars.rsi state: scar_face_2 @@ -83,7 +83,7 @@ - type: marking id: ScarEyeRightSmall bodyPart: Head - groupWhitelist: [Human, Dwarf, Reptilian, Slime] + groupWhitelist: [Human, Reptilian, Slime] sprites: - sprite: Mobs/Customization/scars.rsi state: scar_eye_right_small @@ -91,7 +91,7 @@ - type: marking id: ScarEyeLeftSmall bodyPart: Head - groupWhitelist: [Human, Dwarf, Reptilian, Slime] + groupWhitelist: [Human, Reptilian, Slime] sprites: - sprite: Mobs/Customization/scars.rsi state: scar_eye_left_small diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 413470ea6aa..fda96fa2932 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -1,7 +1,7 @@ - type: marking id: TattooHiveChest bodyPart: Chest - groupWhitelist: [Human, Dwarf, SlimePerson, Felinid, Oni, Kitsune, Avali] # DeltaV - SlimePerson-Avali + groupWhitelist: [Human, Slime, Felinid, Oni, Kitsune, Avali] # DeltaV - SlimePerson-Avali sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -15,7 +15,7 @@ - type: marking id: TattooNightlingChest bodyPart: Chest - groupWhitelist: [Human, Dwarf, SlimePerson, Felinid, Oni, Kitsune, Avali] # DeltaV - SlimePerson-Avali + groupWhitelist: [Human, Slime, Felinid, Oni, Kitsune, Avali] # DeltaV - SlimePerson-Avali sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -29,7 +29,7 @@ - type: marking id: TattooSilverburghLeftLeg bodyPart: LLeg - groupWhitelist: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -42,7 +42,7 @@ - type: marking id: TattooSilverburghRightLeg bodyPart: RLeg - groupWhitelist: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -55,7 +55,7 @@ - type: marking id: TattooCampbellLeftArm bodyPart: LArm - groupWhitelist: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -68,7 +68,7 @@ - type: marking id: TattooCampbellRightArm bodyPart: RArm - groupWhitelist: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -81,7 +81,7 @@ - type: marking id: TattooCampbellLeftLeg bodyPart: LLeg - groupWhitelist: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -94,7 +94,7 @@ - type: marking id: TattooCampbellRightLeg bodyPart: RLeg - groupWhitelist: [Human, Dwarf, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Felinid, Oni, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -107,7 +107,7 @@ - type: marking id: TattooEyeRight bodyPart: Eyes - groupWhitelist: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Slime, Reptilian, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: @@ -120,7 +120,7 @@ - type: marking id: TattooEyeLeft bodyPart: Eyes - groupWhitelist: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune + groupWhitelist: [Human, Slime, Reptilian, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi, Kitsune] # DeltaV - Felinid-Kitsune coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml index c793fbaea1e..d42ed1bd429 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml @@ -4,7 +4,7 @@ - type: marking id: UndergarmentBottomBoxers bodyPart: UndergarmentBottom - speciesRestriction: null # DeltaV - removed restrictions + groupWhitelist: null # DeltaV - removed restrictions coloring: default: type: null @@ -16,7 +16,7 @@ - type: marking id: UndergarmentBottomBriefs bodyPart: UndergarmentBottom - speciesRestriction: null # DeltaV - removed restrictions + groupWhitelist: null # DeltaV - removed restrictions coloring: default: type: null @@ -28,7 +28,7 @@ - type: marking id: UndergarmentBottomSatin bodyPart: UndergarmentBottom - speciesRestriction: null # DeltaV - removed restrictions + groupWhitelist: null # DeltaV - removed restrictions coloring: default: type: null @@ -40,7 +40,7 @@ - type: marking id: UndergarmentTopBra bodyPart: UndergarmentTop - speciesRestriction: null # DeltaV - removed restrictions + groupWhitelist: null # DeltaV - removed restrictions coloring: default: type: null @@ -52,7 +52,7 @@ - type: marking id: UndergarmentTopSportsbra bodyPart: UndergarmentTop - speciesRestriction: null # DeltaV - removed restrictions + groupWhitelist: null # DeltaV - removed restrictions coloring: default: type: null @@ -64,7 +64,7 @@ - type: marking id: UndergarmentTopBinder bodyPart: UndergarmentTop - speciesRestriction: null # DeltaV - removed restrictions + groupWhitelist: null # DeltaV - removed restrictions coloring: default: type: null @@ -76,7 +76,7 @@ - type: marking id: UndergarmentTopTanktop bodyPart: UndergarmentTop - speciesRestriction: null # DeltaV - removed restrictions + groupWhitelist: null # DeltaV - removed restrictions coloring: default: type: null diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index a44d09c8b55..3730f183f1b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1394,9 +1394,6 @@ clownedon: True: {visible: true} False: {visible: false} - - type: Body - prototype: Primate - requiredLegs: 1 # TODO: More than 1 leg - type: CreamPied - type: FireVisuals sprite: Mobs/Effects/onfire.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Player/clone.yml b/Resources/Prototypes/Entities/Mobs/Player/clone.yml index 52e12c776e8..545265bdc24 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml @@ -79,7 +79,6 @@ blacklist: components: - AttachedClothing # helmets, which are part of the suit - - HumanoidAppearance # will cause problems for downstream felinids getting cloned as Urists - Implanter # they will spawn full again, but you already get the implant. And we can't do item slot copying yet - VirtualItem eventComponents: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml index 74b88089371..70b99499488 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml @@ -12,10 +12,6 @@ state: storage sprite: Objects/Tools/scissors.rsi - type: MagicMirror - addSlotTime: 20 - removeSlotTime: 20 - selectSlotTime: 20 - changeSlotTime: 20 organs: - Head layers: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml index 39dca5ef9ab..2cfc33aa8d6 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -1,9 +1,8 @@ - type: marking id: OniHornSingleCurved bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + groupWhitelist: [Oni] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_curved @@ -11,9 +10,8 @@ - type: marking id: OniHornSingleLeftCurved bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + groupWhitelist: [Oni] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_left_curved @@ -21,9 +19,8 @@ - type: marking id: OniHornSingleRightCurved bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + groupWhitelist: [Oni] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_right_curved @@ -31,9 +28,8 @@ - type: marking id: OniHornDoubleCurvedOutwards bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + groupWhitelist: [Oni] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_curved_outwards @@ -41,9 +37,8 @@ - type: marking id: OniHornDoubleCurved bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + groupWhitelist: [Oni] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_curved @@ -51,9 +46,8 @@ - type: marking id: OniHornDoubleLeftBrokeCurved bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + groupWhitelist: [Oni] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_left_broke_curved @@ -61,9 +55,8 @@ - type: marking id: OniHornDoubleRightBrokeCurved bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + groupWhitelist: [Oni] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_right_broke_curved diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml index e27a7f8be14..73a9035f2ad 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml @@ -3,8 +3,7 @@ - type: marking id: FelinidEarsBasic bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: basic_outer @@ -14,8 +13,7 @@ - type: marking id: FelinidEarsCurled bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: curled_outer @@ -25,8 +23,7 @@ - type: marking id: FelinidEarsDroopy bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: droopy_outer @@ -36,8 +33,7 @@ - type: marking id: FelinidEarsFuzzy bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: basic_outer @@ -47,8 +43,7 @@ - type: marking id: FelinidEarsStubby bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: stubby_outer @@ -58,8 +53,7 @@ - type: marking id: FelinidEarsTall bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: tall_outer @@ -71,8 +65,7 @@ - type: marking id: FelinidEarsTorn bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: torn_outer @@ -82,8 +75,7 @@ - type: marking id: FelinidEarsWide bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: wide_outer @@ -95,8 +87,7 @@ - type: marking id: FelinidTailBasic bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi state: basic_tail_tip @@ -108,8 +99,7 @@ - type: marking id: FelinidTailBasicWithBow bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi state: basic_tail_tip @@ -123,8 +113,7 @@ - type: marking id: FelinidTailBasicWithBell bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi state: basic_tail_tip @@ -138,8 +127,7 @@ - type: marking id: FelinidTailBasicWithBowAndBell bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Felinid] + groupWhitelist: [Felinid] sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi state: basic_tail_tip diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml index 0bed0b02b44..a8cb709b82e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml @@ -2,9 +2,8 @@ - type: marking id: MothAntennasClassicAspen bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -17,9 +16,8 @@ - type: marking id: MothAntennasClassicBrown bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -32,9 +30,8 @@ - type: marking id: MothAntennasClassicDeathshead bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -47,9 +44,8 @@ - type: marking id: MothAntennasClassicFeathery bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -62,9 +58,8 @@ - type: marking id: MothAntennasClassicFirewatch bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -77,9 +72,8 @@ - type: marking id: MothAntennasClassicGothic bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -92,9 +86,8 @@ - type: marking id: MothAntennasClassicJungle bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -107,9 +100,8 @@ - type: marking id: MothAntennasClassicLovers bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -122,9 +114,8 @@ - type: marking id: MothAntennasClassicMint bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -137,9 +128,8 @@ - type: marking id: MothAntennasClassicMoffra bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -152,9 +142,8 @@ - type: marking id: MothAntennasClassicMoonfly bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -167,9 +156,8 @@ - type: marking id: MothAntennasClassicOakworm bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -182,9 +170,8 @@ - type: marking id: MothAntennasClassicPlain bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -197,9 +184,8 @@ - type: marking id: MothAntennasClassicPlasmafire bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -212,9 +198,8 @@ - type: marking id: MothAntennasClassicPoison bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -227,9 +212,8 @@ - type: marking id: MothAntennasClassicReddish bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -242,9 +226,8 @@ - type: marking id: MothAntennasClassicRegal bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -257,9 +240,8 @@ - type: marking id: MothAntennasClassicRosy bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -272,9 +254,8 @@ - type: marking id: MothAntennasClassicRoyal bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -287,9 +268,8 @@ - type: marking id: MothAntennasClassicSnow bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -302,9 +282,8 @@ - type: marking id: MothAntennasClassicWhitefly bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -317,9 +296,8 @@ - type: marking id: MothAntennasClassicWitchking bodyPart: HeadTop - markingCategory: HeadTop forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -333,9 +311,8 @@ - type: marking id: MothWingsClassicAspen bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -348,9 +325,8 @@ - type: marking id: MothWingsClassicAtlas bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -363,9 +339,8 @@ - type: marking id: MothWingsClassicBrown bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -378,9 +353,8 @@ - type: marking id: MothWingsClassicDeathshead bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -393,9 +367,8 @@ - type: marking id: MothWingsClassicFeathery bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -408,9 +381,8 @@ - type: marking id: MothWingsClassicFirewatch bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -423,9 +395,8 @@ - type: marking id: MothWingsClassicGothic bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -438,9 +409,8 @@ - type: marking id: MothWingsClassicJungle bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -453,9 +423,8 @@ - type: marking id: MothWingsClassicLovers bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -468,9 +437,8 @@ - type: marking id: MothWingsClassicLuna bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -483,9 +451,8 @@ - type: marking id: MothWingsClassicMint bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -498,9 +465,8 @@ - type: marking id: MothWingsClassicMoffra bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -513,9 +479,8 @@ - type: marking id: MothWingsClassicMonarch bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -528,9 +493,8 @@ - type: marking id: MothWingsClassicMoonfly bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -543,9 +507,8 @@ - type: marking id: MothWingsClassicOakworm bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -558,9 +521,8 @@ - type: marking id: MothWingsClassicPlain bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -573,9 +535,8 @@ - type: marking id: MothWingsClassicPlasmafire bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -588,9 +549,8 @@ - type: marking id: MothWingsClassicPoison bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -603,9 +563,8 @@ - type: marking id: MothWingsClassicRagged bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -618,9 +577,8 @@ - type: marking id: MothWingsClassicReddish bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -633,9 +591,8 @@ - type: marking id: MothWingsClassicRosy bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -648,9 +605,8 @@ - type: marking id: MothWingsClassicRoyal bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -663,9 +619,8 @@ - type: marking id: MothWingsClassicSnow bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -678,9 +633,8 @@ - type: marking id: MothWingsClassicWhitefly bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -693,9 +647,8 @@ - type: marking id: MothWingsClassicWitchking bodyPart: Tail - markingCategory: Tail forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -710,9 +663,8 @@ - type: marking id: MothHeadClassicDeathshead bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -725,9 +677,8 @@ - type: marking id: MothChestClassicDeathshead bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -740,9 +691,8 @@ - type: marking id: MothLArmClassicDeathshead bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -755,9 +705,8 @@ - type: marking id: MothRArmClassicDeathshead bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -770,9 +719,8 @@ - type: marking id: MothLLegClassicDeathshead bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -785,9 +733,8 @@ - type: marking id: MothRLegClassicDeathshead bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -802,9 +749,8 @@ - type: marking id: MothHeadClassicFirewatch bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -817,9 +763,8 @@ - type: marking id: MothChestClassicFirewatch bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -832,9 +777,8 @@ - type: marking id: MothLArmClassicFirewatch bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -847,9 +791,8 @@ - type: marking id: MothRArmClassicFirewatch bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -862,9 +805,8 @@ - type: marking id: MothLLegClassicFirewatch bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -877,9 +819,8 @@ - type: marking id: MothRLegClassicFirewatch bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -893,9 +834,8 @@ - type: marking id: MothHeadClassicGothic bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -908,9 +848,8 @@ - type: marking id: MothChestClassicGothic bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -923,9 +862,8 @@ - type: marking id: MothLArmClassicGothic bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -938,9 +876,8 @@ - type: marking id: MothRArmClassicGothic bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -953,9 +890,8 @@ - type: marking id: MothLLegClassicGothicL bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -968,9 +904,8 @@ - type: marking id: MothRLegClassicGothic bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -984,9 +919,8 @@ - type: marking id: MothHeadClassicJungle bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -999,9 +933,8 @@ - type: marking id: MothChestClassicJungle bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1014,9 +947,8 @@ - type: marking id: MothLArmClassicJungle bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1029,9 +961,8 @@ - type: marking id: MothRArmClassicJungle bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1044,9 +975,8 @@ - type: marking id: MothLLegClassicJungle bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1059,9 +989,8 @@ - type: marking id: MothRLegClassicJungle bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1075,9 +1004,8 @@ - type: marking id: MothHeadClassicLovers bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1090,9 +1018,8 @@ - type: marking id: MothChestClassicLovers bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1105,9 +1032,8 @@ - type: marking id: MothLArmClassicLovers bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1120,9 +1046,8 @@ - type: marking id: MothRArmClassicLovers bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1135,9 +1060,8 @@ - type: marking id: MothLLegClassicLovers bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1150,9 +1074,8 @@ - type: marking id: MothRLegClassicLovers bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1166,9 +1089,8 @@ - type: marking id: MothHeadClassicMoonfly bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1181,9 +1103,8 @@ - type: marking id: MothChestClassicMoonfly bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1196,9 +1117,8 @@ - type: marking id: MothLArmClassicMoonfly bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1211,9 +1131,8 @@ - type: marking id: MothRArmClassicMoonfly bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1226,9 +1145,8 @@ - type: marking id: MothLLegClassicMoonfly bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1241,9 +1159,8 @@ - type: marking id: MothRLegClassicMoonfly bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1257,9 +1174,8 @@ - type: marking id: MothHeadClassicOakworm bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1272,9 +1188,8 @@ - type: marking id: MothChestClassicOakworm bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1287,9 +1202,8 @@ - type: marking id: MothLArmClassicOakworm bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1302,9 +1216,8 @@ - type: marking id: MothRArmClassicOakworm bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1317,9 +1230,8 @@ - type: marking id: MothLLegClassicOakworm bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1332,9 +1244,8 @@ - type: marking id: MothRLegClassicOakworm bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1348,9 +1259,8 @@ - type: marking id: MothHeadClassicPoison bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1363,9 +1273,8 @@ - type: marking id: MothChestClassicPoison bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1378,9 +1287,8 @@ - type: marking id: MothLArmClassicPoison bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1393,9 +1301,8 @@ - type: marking id: MothRArmClassicPoison bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1408,9 +1315,8 @@ - type: marking id: MothLLegClassicPoison bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1423,9 +1329,8 @@ - type: marking id: MothRLegClassicPoison bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1439,9 +1344,8 @@ - type: marking id: MothHeadClassicRagged bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1454,9 +1358,8 @@ - type: marking id: MothChestClassicRagged bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1469,9 +1372,8 @@ - type: marking id: MothLArmClassicRagged bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1484,9 +1386,8 @@ - type: marking id: MothRArmClassicRagged bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1499,9 +1400,8 @@ - type: marking id: MothLLegClassicRagged bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1514,9 +1414,8 @@ - type: marking id: MothRLegClassicRagged bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1530,9 +1429,8 @@ - type: marking id: MothHeadClassicReddish bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1545,9 +1443,8 @@ - type: marking id: MothChestClassicReddish bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1560,9 +1457,8 @@ - type: marking id: MothLArmClassicReddish bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1575,9 +1471,8 @@ - type: marking id: MothRArmClassicReddish bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1590,9 +1485,8 @@ - type: marking id: MothLLegClassicReddish bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1605,9 +1499,8 @@ - type: marking id: MothRLegClassicReddish bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1621,9 +1514,8 @@ - type: marking id: MothHeadClassicRoyal bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1636,9 +1528,8 @@ - type: marking id: MothChestClassicRoyal bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1651,9 +1542,8 @@ - type: marking id: MothLArmClassicRoyal bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1666,9 +1556,8 @@ - type: marking id: MothRArmClassicRoyal bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1681,9 +1570,8 @@ - type: marking id: MothLLegClassicRoyal bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1696,9 +1584,8 @@ - type: marking id: MothRLegClassicRoyal bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1712,9 +1599,8 @@ - type: marking id: MothHeadClassicWhitefly bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1727,9 +1613,8 @@ - type: marking id: MothChestClassicWhitefly bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1742,9 +1627,8 @@ - type: marking id: MothLArmClassicWhitefly bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1757,9 +1641,8 @@ - type: marking id: MothRArmClassicWhitefly bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1772,9 +1655,8 @@ - type: marking id: MothLLegClassicWhitefly bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1787,9 +1669,8 @@ - type: marking id: MothRLegClassicWhitefly bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1803,9 +1684,8 @@ - type: marking id: MothHeadClassicWitchking bodyPart: Head - markingCategory: Head forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1818,9 +1698,8 @@ - type: marking id: MothChestClassicWitchking bodyPart: Chest - markingCategory: Chest forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1833,9 +1712,8 @@ - type: marking id: MothLArmClassicWitchking bodyPart: LArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1848,9 +1726,8 @@ - type: marking id: MothRArmClassicWitchking bodyPart: RArm - markingCategory: Arms forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1863,9 +1740,8 @@ - type: marking id: MothLLegClassicWitchking bodyPart: LLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: @@ -1878,9 +1754,8 @@ - type: marking id: MothRLegClassicWitchking bodyPart: RLeg - markingCategory: Legs forcedColoring: true - speciesRestriction: [Moth] + groupWhitelist: [Moth] coloring: default: type: diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml index da8b287e1a8..e514c2ebbb4 100644 --- a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml @@ -13,7 +13,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -36,7 +36,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -59,7 +59,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -82,7 +82,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -105,7 +105,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:HealthChange conditions: @@ -142,7 +142,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -165,7 +165,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -191,7 +191,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -216,7 +216,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml index 51b3dbc6338..9810a801c31 100644 --- a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml @@ -13,7 +13,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 3 @@ -36,7 +36,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 3 @@ -56,7 +56,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 3 diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Food/condiments.yml index a5e859668a0..7f0211a7e85 100644 --- a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Food/condiments.yml +++ b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Food/condiments.yml @@ -8,7 +8,7 @@ color: "#a61600" recognizable: true metabolisms: - Food: + Digestion: effects: - !type:AdjustReagent reagent: Nutriment @@ -27,7 +27,7 @@ color: "#5c8400" recognizable: true metabolisms: - Food: + Digestion: effects: - !type:AdjustReagent reagent: Nutriment @@ -49,7 +49,7 @@ color: "#fffbc7" recognizable: true metabolisms: - Food: + Digestion: effects: - !type:AdjustReagent reagent: Nutriment @@ -71,7 +71,7 @@ color: gold recognizable: true metabolisms: - Food: + Digestion: effects: - !type:AdjustReagent reagent: Nutriment diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Food/food.yml index c54df5f6280..e503145496e 100644 --- a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Food/food.yml @@ -6,7 +6,7 @@ physicalDesc: reagent-physical-desc-sickly color: brown metabolisms: - Food: + Digestion: effects: - !type:Vomit probability: 0.9 @@ -21,4 +21,4 @@ conditions: - !type:ReagentCondition reagent: Nausium - min: 2.5 \ No newline at end of file + min: 2.5 diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml b/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml index 22011a140da..4ba40fb8216 100644 --- a/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml +++ b/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml @@ -7,7 +7,7 @@ color: "#700055" physicalDesc: reagent-physical-desc-viscous metabolisms: - Medicine: + Bloodstream: effects: # These messages would be more appropriate if there was a LoS-based Filter type. TODO # - !type:PopupMessage @@ -60,13 +60,12 @@ - !type:PlantAdjustToxins amount: 40 metabolisms: - Poison: + Bloodstream: effects: - !type:HealthChange probability: 0.4 damage: - groups: - Toxin: 2 + Toxin: 2 - !type:RemovePsionicAbilities conditions: - !type:ReagentCondition @@ -82,10 +81,9 @@ color: "#61a79d" physicalDesc: reagent-physical-desc-ethereal metabolisms: - Poison: + Bloodstream: effects: - !type:HealthChange probability: 0.4 damage: - groups: - Toxin: 2 + Toxin: 2 diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index f3543249b34..ac29cd58798 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -270,7 +270,7 @@ damage: types: Cellular: 0.01 - Food: + Digestion: effects: - !type:SatiateHunger diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index 5c57dc3c150..82b291a8b5c 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -16,7 +16,7 @@ special: - !type:GiveItemOnHolidaySpecial holiday: BoxingDay - prototype: ClothingHandsGlovesBoxingRigged + prototype: ClothingHandsGlovesBoxingRiggedRed - type: startingGear id: BoxerGear diff --git a/Resources/Prototypes/_CD/Reagents/biological.yml b/Resources/Prototypes/_CD/Reagents/biological.yml index 723864a8a19..618e26a04dc 100644 --- a/Resources/Prototypes/_CD/Reagents/biological.yml +++ b/Resources/Prototypes/_CD/Reagents/biological.yml @@ -8,7 +8,7 @@ recognizable: true physicalDesc: reagent-physical-desc-reflective metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 1.5 diff --git a/Resources/Prototypes/_DEN/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_DEN/Reagents/Consumable/Drink/alcohol.yml index ecf94db74ba..e08b67ea098 100644 --- a/Resources/Prototypes/_DEN/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/_DEN/Reagents/Consumable/Drink/alcohol.yml @@ -13,7 +13,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -37,7 +37,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -61,7 +61,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -85,7 +85,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -109,7 +109,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -136,7 +136,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -160,7 +160,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -184,7 +184,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -210,7 +210,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -234,7 +234,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -258,7 +258,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -296,7 +296,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -320,7 +320,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -344,7 +344,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -368,7 +368,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -392,7 +392,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -416,7 +416,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 diff --git a/Resources/Prototypes/_DV/Actions/station_ai.yml b/Resources/Prototypes/_DV/Actions/station_ai.yml index b9aad217ef6..1ab891f02a8 100644 --- a/Resources/Prototypes/_DV/Actions/station_ai.yml +++ b/Resources/Prototypes/_DV/Actions/station_ai.yml @@ -138,9 +138,9 @@ - BorgChassis event: !type:StationAiHealthChangeActionEvent damage: - groups: + types: Burn: -50 - Brute: -50 + Blunt: -50 - type: entity id: ActionStationAiEmergencySealant diff --git a/Resources/Prototypes/_DV/Body/Species/feroxi.yml b/Resources/Prototypes/_DV/Body/Species/feroxi.yml index 7e4bdab80e1..fcc50cd17b8 100644 --- a/Resources/Prototypes/_DV/Body/Species/feroxi.yml +++ b/Resources/Prototypes/_DV/Body/Species/feroxi.yml @@ -228,13 +228,8 @@ description: "A pair of amphibious lungs along with gills, filtering oxygen out of the air continuously." components: - type: Metabolizer - removeEmpty: true solutionOnBody: false - solution: "Lung" metabolizerTypes: [ Feroxi ] - groups: - - id: Gas - rateModifier: 100.0 - type: SolutionContainerManager solutions: organ: diff --git a/Resources/Prototypes/_DV/Body/Species/harpy.yml b/Resources/Prototypes/_DV/Body/Species/harpy.yml index dd5ab424fec..28031bb3990 100644 --- a/Resources/Prototypes/_DV/Body/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Body/Species/harpy.yml @@ -263,13 +263,8 @@ description: "An advanced pair of avian lungs. Filters oxygen by way of moving air constantly through air sacs." components: - type: Metabolizer - removeEmpty: true solutionOnBody: false - solution: "Lung" metabolizerTypes: [ Harpy ] - groups: - - id: Gas - rateModifier: 100.0 - type: SolutionContainerManager solutions: organ: diff --git a/Resources/Prototypes/_DV/Body/Species/motorkind.yml b/Resources/Prototypes/_DV/Body/Species/motorkind.yml index 30ebc9d706b..543110deb18 100644 --- a/Resources/Prototypes/_DV/Body/Species/motorkind.yml +++ b/Resources/Prototypes/_DV/Body/Species/motorkind.yml @@ -218,7 +218,6 @@ speechSounds: Alto - type: EncryptionKeyHolder keySlots: 4 - examineWhileLocked: false keysExtractionMethod: Cutting keysUnlocked: false - type: Lock @@ -367,13 +366,6 @@ - type: Metabolizer maxReagents: 6 metabolizerTypes: [ Fuel ] - groups: - - id: Food - - id: Drink - - id: Medicine - - id: Poison - - id: Narcotic - - id: Alcohol - type: Item size: Small heldPrefix: stomach @@ -406,6 +398,3 @@ - type: Metabolizer removeEmpty: true metabolizerTypes: [ Fuel ] - groups: - - id: Gas - rateModifier: 100.0 diff --git a/Resources/Prototypes/_DV/Catalog/Uplink/job.yml b/Resources/Prototypes/_DV/Catalog/Uplink/job.yml index 440c4ac682e..a58631231d6 100644 --- a/Resources/Prototypes/_DV/Catalog/Uplink/job.yml +++ b/Resources/Prototypes/_DV/Catalog/Uplink/job.yml @@ -19,7 +19,7 @@ id: uplinkRiggedBoxingGlovesBoxer name: uplink-rigged-boxing-gloves-name description: uplink-rigged-boxing-gloves-desc - productEntity: ClothingHandsGlovesBoxingRigged + productEntity: ClothingHandsGlovesBoxingRiggedRed discountCategory: usualDiscounts discountDownTo: Telecrystal: 2 diff --git a/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml b/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml index 13744450819..9b01997dc8e 100644 --- a/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml +++ b/Resources/Prototypes/_DV/CosmicCult/Mobs/colossus.yml @@ -91,8 +91,6 @@ blacklist: tags: - GhostOnlyWarp - - type: Body - requiredLegs: 0 - type: Emoting - type: Speech speechSounds: ColossusSpeech @@ -272,8 +270,8 @@ allowedStates: - Alive damage: - groups: - Brute: -1 + types: + Blunt: -1 Burn: -0.5 - type: MultiplyAttackRateOnSupercritical - type: MultiplyCorruptingSpeedOnSupercritical diff --git a/Resources/Prototypes/_DV/CosmicCult/entropy.yml b/Resources/Prototypes/_DV/CosmicCult/entropy.yml index 6c8941a22c2..90361c0797d 100644 --- a/Resources/Prototypes/_DV/CosmicCult/entropy.yml +++ b/Resources/Prototypes/_DV/CosmicCult/entropy.yml @@ -17,7 +17,7 @@ - !type:PlantAdjustHealth amount: -5 metabolisms: - Poison: + Bloodstream: effects: - !type:HealthChange damage: @@ -39,7 +39,7 @@ color: "#491365" physicalDesc: reagent-physical-desc-malign metabolisms: - Narcotic: + Bloodstream: effects: - !type:MovementSpeedModifier walkSpeedModifier: 1.3 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml index d9eaa91dbfb..a0a547b0aab 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml @@ -264,26 +264,26 @@ orGroup: Horn prob: 0.05 -- type: entity - parent: BaseMailLarge - id: MailNFBuildABuddy - suffix: Build-a-Buddy - components: - - type: Mail - isFragile: true - contents: +#- type: entity +# parent: BaseMailLarge +# id: MailNFBuildABuddy +# suffix: Build-a-Buddy +# components: +# - type: Mail +# isFragile: true +# contents: # - id: BoxBuildABuddyGoblin # DeltaV - Goblins Aren't Real # orGroup: Box - - id: BoxBuildABuddyHuman - orGroup: Box - - id: BoxBuildABuddyReptilian - orGroup: Box - - id: BoxBuildABuddySlime - orGroup: Box - - id: BoxBuildABuddyVulpkanin - orGroup: Box - - id: DrinkSpaceGlue - - id: PaperMailNFBuildABuddy +# - id: BoxBuildABuddyHuman +# orGroup: Box +# - id: BoxBuildABuddyReptilian +# orGroup: Box +# - id: BoxBuildABuddySlime +# orGroup: Box +# - id: BoxBuildABuddyVulpkanin +# orGroup: Box +# - id: DrinkSpaceGlue +# - id: PaperMailNFBuildABuddy - type: entity parent: BaseMailLarge diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml index d2905857822..6f61a4c86cc 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml @@ -310,7 +310,7 @@ - Biological - BiologicalMetaphysical damage: - groups: + types: Metaphysical: -10 healingBeginSound: path: "/Audio/Items/Medical/brutepack_begin.ogg" diff --git a/Resources/Prototypes/_DV/Mail/mailDeliveries.yml b/Resources/Prototypes/_DV/Mail/mailDeliveries.yml index 3547d5f3c69..8f15b3f68d7 100644 --- a/Resources/Prototypes/_DV/Mail/mailDeliveries.yml +++ b/Resources/Prototypes/_DV/Mail/mailDeliveries.yml @@ -7,7 +7,7 @@ MailNFBikeHorn: 0.5 MailBooksAll: 1 MailBlockGameDIY: 0.5 - MailNFBuildABuddy: 0.6 +# MailNFBuildABuddy: 0.6 # Delta V - Nubody commented out for now MailCrayon: 1 MailNFCake: 1 MailNFCheese: 1 diff --git a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml index de8315f540d..1b79d48aaa5 100644 --- a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml @@ -8,7 +8,7 @@ color: "#331002" recognizable: true metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 1 @@ -31,7 +31,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -54,7 +54,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -78,7 +78,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -101,7 +101,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -124,7 +124,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 1 @@ -147,7 +147,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: true metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 diff --git a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml index 09b4538fe90..5f33c8405fa 100644 --- a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml @@ -9,14 +9,12 @@ sprite: Objects/Consumable/Drinks/lean.rsi state: icon metabolisms: - Narcotic: + Bloodstream: effects: - !type:GenericStatusEffect key: Stutter component: StutteringAccent - !type:Jitter - Poison: - effects: - !type:HealthChange conditions: - !type:ReagentCondition @@ -31,8 +29,6 @@ reagent: Lean min: 35 probability: 0.1 - Medicine: - effects: - !type:Vomit conditions: - !type:ReagentCondition @@ -56,7 +52,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -94,7 +90,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -122,7 +118,7 @@ metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -144,7 +140,7 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -167,7 +163,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -217,7 +213,7 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -260,7 +256,7 @@ metamorphicChangeColor: false fizziness: 0.2 metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 @@ -275,7 +271,7 @@ color: "#664300" recognizable: false metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 diff --git a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/soda.yml index 0f4ab74c308..840c8cdcd10 100644 --- a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/soda.yml @@ -7,16 +7,14 @@ flavor: drgibbbloodred color: "#570303" metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2.0 conditions: - - !type:MetabolizerTypeCondition - type: [ Human ] - inverted: true - Food: - effects: - - !type:AdjustReagent - reagent: UncookedAnimalProteins - amount: 0.05 + - !type:MetabolizerTypeCondition + type: [ Human ] + inverted: true + - !type:AdjustReagent + reagent: UncookedAnimalProteins + amount: 0.05 diff --git a/Resources/Prototypes/_DV/Reagents/biological.yml b/Resources/Prototypes/_DV/Reagents/biological.yml index a693a9804d3..7773dbd9bc6 100644 --- a/Resources/Prototypes/_DV/Reagents/biological.yml +++ b/Resources/Prototypes/_DV/Reagents/biological.yml @@ -13,7 +13,7 @@ color: "#FFBF00" physicalDesc: reagent-physical-desc-refreshing metabolisms: - Drink: + Digestion: effects: - !type:ModifyStatusEffect effectProto: StatusEffectShieldedFromPsionics @@ -31,7 +31,7 @@ color: "#FFBF00" physicalDesc: reagent-physical-desc-thick metabolisms: - Narcotic: + Bloodstream: effects: - !type:Jitter - !type:MovementSpeedModifier diff --git a/Resources/Prototypes/_DV/Reagents/fun.yml b/Resources/Prototypes/_DV/Reagents/fun.yml index 64650637a66..6197854b77b 100644 --- a/Resources/Prototypes/_DV/Reagents/fun.yml +++ b/Resources/Prototypes/_DV/Reagents/fun.yml @@ -21,7 +21,7 @@ emote: Scream probability: 0.7 metabolisms: - Poison: + Bloodstream: metabolismRate : 3.00 effects: - !type:HealthChange diff --git a/Resources/Prototypes/_DV/Reagents/medicine.yml b/Resources/Prototypes/_DV/Reagents/medicine.yml index b5577114ffd..cccc9ad8ed8 100644 --- a/Resources/Prototypes/_DV/Reagents/medicine.yml +++ b/Resources/Prototypes/_DV/Reagents/medicine.yml @@ -8,7 +8,7 @@ color: "#e3d56d" worksOnTheDead: true metabolisms: - Medicine: + Bloodstream: effects: - !type:ReduceRotting seconds: 10 @@ -33,7 +33,7 @@ flavor: medicine color: "#211f3d" metabolisms: - Medicine: + Bloodstream: effects: - !type:HealthChange damage: @@ -53,7 +53,7 @@ flavor: UnholyWater color: "#c4c4c4" metabolisms: - Medicine: + Bloodstream: effects: - !type:HealthChange damage: @@ -69,7 +69,7 @@ physicalDesc: reagent-physical-desc-sticky group: Medicine metabolisms: - Medicine: + Bloodstream: effects: - !type:GenericStatusEffect key: Anesthesia @@ -95,7 +95,7 @@ group: Medicine worksOnTheDead: true metabolisms: - Medicine: + Bloodstream: effects: - !type:EvenHealthChange conditions: @@ -113,7 +113,7 @@ flavor: medicine color: "#ff7db5" metabolisms: - Medicine: + Bloodstream: effects: - !type:AdjustTemperature conditions: @@ -140,7 +140,7 @@ flavor: medicine color: "#91C3F7" metabolisms: - Medicine: + Bloodstream: metabolismRate: 0.5 effects: - !type:ModifyStatusEffect diff --git a/Resources/Prototypes/_DV/Reagents/narcotics.yml b/Resources/Prototypes/_DV/Reagents/narcotics.yml index 4f88ab9f3ce..d0c21be07c9 100644 --- a/Resources/Prototypes/_DV/Reagents/narcotics.yml +++ b/Resources/Prototypes/_DV/Reagents/narcotics.yml @@ -7,7 +7,7 @@ color: "#FFBF00" physicalDesc: reagent-physical-desc-overpowering metabolisms: - Narcotic: + Bloodstream: metabolismRate: 0.2 effects: - !type:ModifyStatusEffect diff --git a/Resources/Prototypes/_Funkystation/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/_Funkystation/Reagents/Consumable/Food/ingredients.yml index 3db72e40858..1cfc700796d 100644 --- a/Resources/Prototypes/_Funkystation/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/_Funkystation/Reagents/Consumable/Food/ingredients.yml @@ -7,7 +7,7 @@ flavor: sweet color: "#c4ae70" metabolisms: - Food: + Digestion: effects: - !type:AdjustReagent reagent: Sugar diff --git a/Resources/Prototypes/_Funkystation/Reagents/exotic.yml b/Resources/Prototypes/_Funkystation/Reagents/exotic.yml index 8f326f57327..1dcdc0d548c 100644 --- a/Resources/Prototypes/_Funkystation/Reagents/exotic.yml +++ b/Resources/Prototypes/_Funkystation/Reagents/exotic.yml @@ -19,7 +19,7 @@ flavor: medicine color: "#5c11fc" metabolisms: - Medicine: + Bloodstream: metabolismRate: 0.2 effects: - !type:HealthChange @@ -51,7 +51,7 @@ flavor: medicine color: "#d34b26" metabolisms: - Medicine: + Bloodstream: metabolismRate: 0.2 effects: - !type:HealthChange @@ -61,7 +61,7 @@ damage: groups: Airloss: -2 - Brute: -1.2 + Blunt: -1.2 Burn: -1.6 Toxin: -2 @@ -74,7 +74,7 @@ flavor: bitter color: "#e1e1e1" metabolisms: - Narcotic: + Bloodstream: metabolismRate: 0.2 effects: - !type:MovementSpeedModifier @@ -106,7 +106,7 @@ flavor: medicine color: "#04ea9a" metabolisms: - Medicine: + Bloodstream: metabolismRate: 2.0 effects: - !type:HealthChange @@ -128,7 +128,7 @@ flavor: medicine color: "#ffaa00" metabolisms: - Poison: + Bloodstream: effects: - !type:SpawnEntity # DeltaV - was polymorph, just have a chance to spawn a corgi instead entity: MobCorgiPuppy @@ -136,4 +136,4 @@ conditions: - !type:ReagentCondition reagent: Corgium - min: 25 # DeltaV - need more corgium for that to happen, was 20 \ No newline at end of file + min: 25 # DeltaV - need more corgium for that to happen, was 20 diff --git a/Resources/Prototypes/_Funkystation/Reagents/medicine.yml b/Resources/Prototypes/_Funkystation/Reagents/medicine.yml index 444b413f26f..39bfefb9c51 100644 --- a/Resources/Prototypes/_Funkystation/Reagents/medicine.yml +++ b/Resources/Prototypes/_Funkystation/Reagents/medicine.yml @@ -8,11 +8,11 @@ flavor: medicine color: "#e6e600" metabolisms: - Medicine: + Bloodstream: metabolismRate: 0.2 effects: - !type:HealthChange - conditio: + condition: - !type:TotalDamageCondition max: 30 damage: @@ -57,7 +57,7 @@ flavor: medicine color: "#f9e0e9" metabolisms: - Medicine: + Bloodstream: metabolismRate: 0.2 effects: - !type:HealthChange @@ -99,7 +99,7 @@ flavor: medicine color: "#639cc7" # DeltaV - was #99ffff metabolisms: - Medicine: + Bloodstream: metabolismRate: 0.2 effects: - !type:HealthChange @@ -136,7 +136,7 @@ flavor: medicine color: "#e80d7e" metabolisms: - Medicine: + Bloodstream: metabolismRate: 1.0 effects: - !type:HealthChange @@ -156,7 +156,7 @@ flavor: medicine color: "#c7e4e8" metabolisms: - Medicine: + Bloodstream: metabolismRate: 0.05 effects: - !type:HealthChange @@ -164,7 +164,7 @@ groups: Brute: -0.3 types: - Poison: -0.1 + Blunt: -0.1 Heat: -0.1 Shock: -0.1 Cold: -0.1 @@ -179,7 +179,7 @@ flavor: spicy color: "#f8c8ba" metabolisms: - Medicine: + Bloodstream: effects: # Begin DeltaV additions - !type:EvenHealthChange @@ -210,7 +210,7 @@ color: "#894379" worksOnTheDead: true metabolisms: - Medicine: + Bloodstream: effects: # Begin DeltaV additions - !type:EvenHealthChange @@ -239,7 +239,7 @@ color: "#acbb27" worksOnTheDead: true metabolisms: - Medicine: + Bloodstream: effects: - !type:HealthChange conditions: diff --git a/Resources/Prototypes/_Funkystation/Reagents/toxins.yml b/Resources/Prototypes/_Funkystation/Reagents/toxins.yml index 33dc73a0707..719449d2d86 100644 --- a/Resources/Prototypes/_Funkystation/Reagents/toxins.yml +++ b/Resources/Prototypes/_Funkystation/Reagents/toxins.yml @@ -8,7 +8,7 @@ color: "#f9cab3" reactiveEffects: metabolisms: - Poison: + Bloodstream: metabolismRate: 2.0 effects: - !type:HealthChange @@ -27,7 +27,7 @@ flavor: antifreeze # warm color: "#34b3c9" metabolisms: - Poison: + Bloodstream: effects: - !type:HealthChange damage: @@ -45,7 +45,7 @@ flavor: horrible color: "#2e4404" metabolisms: - Poison: + Bloodstream: effects: - !type:Vomit probability: 0.5 @@ -59,7 +59,7 @@ color: "#cf3600" physicalDesc: reagent-physical-desc-sickly metabolisms: - Poison: + Bloodstream: metabolismRate: 0.02 # 20 damage after 50 seconds effects: - !type:HealthChange diff --git a/Resources/Prototypes/_Impstation/reagents/medicine.yml b/Resources/Prototypes/_Impstation/reagents/medicine.yml index 662c309bb46..9e08d579b72 100644 --- a/Resources/Prototypes/_Impstation/reagents/medicine.yml +++ b/Resources/Prototypes/_Impstation/reagents/medicine.yml @@ -7,7 +7,7 @@ color: "#bdfff3" recognizable: true metabolisms: - Medicine: + Bloodstream: metabolismRate: 0.1 #this should metabolise in the same amount of time as a drink in a 5:1 mix effects: - !type:AdjustReagent diff --git a/Resources/Prototypes/_Impstation/reagents/pyrotechnic.yml b/Resources/Prototypes/_Impstation/reagents/pyrotechnic.yml index 6e381969cfd..6b052c935cd 100644 --- a/Resources/Prototypes/_Impstation/reagents/pyrotechnic.yml +++ b/Resources/Prototypes/_Impstation/reagents/pyrotechnic.yml @@ -13,7 +13,7 @@ tileReactions: - !type:FlammableTileReaction {} metabolisms: - Poison: + Bloodstream: effects: - !type:HealthChange damage: diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml index 6317a70b26e..45f4b5b4161 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml @@ -7,7 +7,7 @@ flavor: basic color: "#a45c08" metabolisms: - Drink: + Digestion: effects: - !type:SatiateThirst factor: 2 diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml b/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml index eceab32b5d4..7efecebce8f 100644 --- a/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml +++ b/Resources/Prototypes/_NF/Reagents/Consumables/ingredients.yml @@ -8,7 +8,7 @@ physicalDesc: reagent-physical-desc-powdery recognizable: true # "Waiter, there seems to be grounds in my coffee." metabolisms: - Drink: + Digestion: effects: - !type:SatiateHunger factor: 0.1 diff --git a/Resources/Prototypes/_RMC14/Entities/Mobs/Markings/avali.yml b/Resources/Prototypes/_RMC14/Entities/Mobs/Markings/avali.yml index d921916d135..d216e6d4e3f 100644 --- a/Resources/Prototypes/_RMC14/Entities/Mobs/Markings/avali.yml +++ b/Resources/Prototypes/_RMC14/Entities/Mobs/Markings/avali.yml @@ -1,8 +1,7 @@ - type: marking id: AvaliHairBigPonytail bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_crests.rsi # DeltaV - Using Starlight Avali sprites state: avali_crest_bigponytail_primary @@ -14,8 +13,7 @@ - type: marking id: AvaliHairCockatiel bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_crests.rsi # DeltaV - Using Starlight Avali sprites state: avali_crest_cockatiel_primary @@ -25,8 +23,7 @@ - type: marking id: AvaliHairCockatoo bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_crests.rsi # DeltaV - Using Starlight Avali sprites state: avali_crest_cockatoo_primary @@ -36,8 +33,7 @@ - type: marking id: AvaliHairDuelFeather bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_crests.rsi # DeltaV - Using Starlight Avali sprites state: avali_crest_dualfeather_primary @@ -47,8 +43,7 @@ - type: marking id: AvaliHairHooked bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_crests.rsi # DeltaV - Using Starlight Avali sprites state: avali_crest_hooked_primary @@ -58,8 +53,7 @@ - type: marking id: AvaliHairJay bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_crests.rsi # DeltaV - Using Starlight Avali sprites state: avali_crest_jay_primary @@ -69,8 +63,7 @@ - type: marking id: AvaliHairLongFeather bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_crests.rsi # DeltaV - Using Starlight Avali sprites state: avali_crest_longfeather_primary @@ -80,8 +73,7 @@ - type: marking id: AvaliHairPunk bodyPart: HeadTop - markingCategory: HeadTop - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_crests.rsi # DeltaV - Using Starlight Avali sprites state: avali_crest_punk_primary @@ -93,10 +85,8 @@ - type: marking id: AvaliEarsBase bodyPart: HeadSide - markingCategory: HeadSide - followSkinColor: true forcedColoring: true - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_parts.rsi # DeltaV - Using Starlight Avali sprites state: ears_avalibase_primary @@ -106,10 +96,8 @@ - type: marking id: AvaliTailBase bodyPart: Tail - markingCategory: Tail - followSkinColor: true forcedColoring: true - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_parts.rsi # DeltaV - Using Starlight Avali sprites state: tail_avalibase @@ -119,8 +107,7 @@ - type: marking id: AvaliEarsStripeOne bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_parts.rsi # DeltaV - Using Starlight Avali sprites state: ears_avalibase_primary @@ -138,8 +125,7 @@ - type: marking id: AvaliHeadStripeOne bodyPart: Head - markingCategory: Head - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_stripes_one.rsi # DeltaV - Using Starlight Avali sprites state: head_primary @@ -149,8 +135,7 @@ - type: marking id: AvaliTorsoStripeOne bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_stripes_one.rsi # DeltaV - Using Starlight Avali sprites state: torso_primary @@ -160,8 +145,7 @@ - type: marking id: AvaliLArmStripeOne bodyPart: LArm - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_stripes_one.rsi # DeltaV - Using Starlight Avali sprites state: larm_primary @@ -171,8 +155,7 @@ - type: marking id: AvaliRArmStripeOne bodyPart: RArm - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_stripes_one.rsi # DeltaV - Using Starlight Avali sprites state: rarm_primary @@ -182,8 +165,7 @@ - type: marking id: AvaliLHandStripeOne bodyPart: LHand - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_stripes_one.rsi # DeltaV - Using Starlight Avali sprites state: lhand_primary @@ -193,8 +175,7 @@ - type: marking id: AvaliRHandStripeOne bodyPart: RHand - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_stripes_one.rsi # DeltaV - Using Starlight Avali sprites state: rhand_primary @@ -204,8 +185,7 @@ - type: marking id: AvaliLLegStripeOne bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_stripes_one.rsi # DeltaV - Using Starlight Avali sprites state: lleg @@ -213,8 +193,7 @@ - type: marking id: AvaliRLegStripeOne bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_stripes_one.rsi # DeltaV - Using Starlight Avali sprites state: rleg @@ -222,8 +201,7 @@ - type: marking id: AvaliTailStripeOne bodyPart: Tail - markingCategory: Tail - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_parts.rsi # DeltaV - Using Starlight Avali sprites state: tail_avalibase @@ -237,8 +215,7 @@ - type: marking id: AvaliEarsTrimOne bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_parts.rsi # DeltaV - Using Starlight Avali sprites state: ears_avalibase_primary @@ -256,8 +233,7 @@ - type: marking id: AvaliHeadTrimOne bodyPart: Head - markingCategory: Head - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_one.rsi # DeltaV - Using Starlight Avali sprites state: head_primary @@ -267,8 +243,7 @@ - type: marking id: AvaliTorsoTrimOne bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_one.rsi # DeltaV - Using Starlight Avali sprites state: torso_primary @@ -278,8 +253,7 @@ - type: marking id: AvaliLArmTrimOne bodyPart: LArm - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_one.rsi # DeltaV - Using Starlight Avali sprites state: larm_primary @@ -289,8 +263,7 @@ - type: marking id: AvaliRArmTrimOne bodyPart: RArm - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_one.rsi # DeltaV - Using Starlight Avali sprites state: rarm_primary @@ -300,8 +273,7 @@ - type: marking id: AvaliRHandTrimOne bodyPart: RHand - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_one.rsi # DeltaV - Using Starlight Avali sprites state: rhand_primary @@ -311,8 +283,7 @@ - type: marking id: AvaliLHandTrimOne bodyPart: LHand - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_one.rsi # DeltaV - Using Starlight Avali sprites state: lhand_primary @@ -322,8 +293,7 @@ - type: marking id: AvaliLLegTrimOne bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_one.rsi # DeltaV - Using Starlight Avali sprites state: lleg_primary @@ -333,8 +303,7 @@ - type: marking id: AvaliRLegTrimOne bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_one.rsi # DeltaV - Using Starlight Avali sprites state: rleg_primary @@ -344,8 +313,7 @@ - type: marking id: AvaliTailTrimOne bodyPart: Tail - markingCategory: Tail - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_parts.rsi # DeltaV - Using Starlight Avali sprites state: tail_avalibase @@ -359,8 +327,7 @@ - type: marking id: AvaliEarsTrimTwo bodyPart: HeadSide - markingCategory: HeadSide - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_parts.rsi # DeltaV - Using Starlight Avali sprites state: ears_avalibase_primary @@ -378,8 +345,7 @@ - type: marking id: AvaliHeadTrimTwo bodyPart: Head - markingCategory: Head - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_two.rsi # DeltaV - Using Starlight Avali sprites state: head_primary @@ -389,8 +355,7 @@ - type: marking id: AvaliTorsoTrimTwo bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_two.rsi # DeltaV - Using Starlight Avali sprites state: torso_primary @@ -400,8 +365,7 @@ - type: marking id: AvaliLArmTrimTwo bodyPart: LArm - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_two.rsi # DeltaV - Using Starlight Avali sprites state: larm_primary @@ -411,8 +375,7 @@ - type: marking id: AvaliRArmTrimTwo bodyPart: RArm - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_two.rsi # DeltaV - Using Starlight Avali sprites state: rarm_primary @@ -422,8 +385,7 @@ - type: marking id: AvaliLHandTrimTwo bodyPart: LHand - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_two.rsi # DeltaV - Using Starlight Avali sprites state: lhand_primary @@ -433,8 +395,7 @@ - type: marking id: AvaliRHandTrimTwo bodyPart: RHand - markingCategory: Arms - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_trim_two.rsi # DeltaV - Using Starlight Avali sprites state: rhand_primary @@ -444,8 +405,7 @@ - type: marking id: AvaliTailTrimTwo bodyPart: Tail - markingCategory: Tail - speciesRestriction: [ Avali ] + groupWhitelist: [ Avali ] sprites: - sprite: _Starlight/Mobs/Customization/Avali/avali_parts.rsi # DeltaV - Using Starlight Avali sprites state: tail_avalibase diff --git a/Resources/Prototypes/_Starlight/Entities/Mobs/Customization/Marking/slime.yml b/Resources/Prototypes/_Starlight/Entities/Mobs/Customization/Marking/slime.yml index 17b6e59c63a..c5e9469f49e 100644 --- a/Resources/Prototypes/_Starlight/Entities/Mobs/Customization/Marking/slime.yml +++ b/Resources/Prototypes/_Starlight/Entities/Mobs/Customization/Marking/slime.yml @@ -3,8 +3,7 @@ - type: marking id: bubble bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] sprites: - sprite: _Starlight/Mobs/Customization/SlimePerson/chest.rsi state: bubble @@ -12,8 +11,7 @@ - type: marking id: fishbowl bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] sprites: - sprite: _Starlight/Mobs/Customization/SlimePerson/chest.rsi state: fishbowl1 @@ -23,8 +21,7 @@ - type: marking id: SlimeBonechest bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: @@ -37,8 +34,7 @@ - type: marking id: SlimeCore bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] followSkinColor: false coloring: default: @@ -51,8 +47,7 @@ - type: marking id: SlimeLungs bodyPart: Chest - markingCategory: Chest - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] followSkinColor: true sprites: - sprite: _Starlight/Mobs/Customization/SlimePerson/chest.rsi @@ -63,8 +58,7 @@ - type: marking id: FadingStars bodyPart: Head - markingCategory: Head - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] sprites: - sprite: _Starlight/Mobs/Customization/SlimePerson/head.rsi state: fadingstars1 @@ -76,8 +70,7 @@ - type: marking id: fizz bodyPart: Head - markingCategory: Head - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] sprites: - sprite: _Starlight/Mobs/Customization/SlimePerson/head.rsi state: fizz @@ -85,8 +78,7 @@ - type: marking id: SlimeBonehead bodyPart: Head - markingCategory: Head - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: @@ -99,8 +91,7 @@ - type: marking id: SlimeBrain bodyPart: Head - markingCategory: Head - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] followSkinColor: true sprites: - sprite: _Starlight/Mobs/Customization/SlimePerson/head.rsi @@ -115,8 +106,7 @@ - type: marking id: SlimeBonearmright bodyPart: RArm - markingCategory: Arms - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: @@ -131,8 +121,7 @@ - type: marking id: SlimeBonearmleft bodyPart: LArm - markingCategory: Arms - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: @@ -147,8 +136,7 @@ - type: marking id: SlimeBonelegright bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: @@ -163,8 +151,7 @@ - type: marking id: SlimeBonelegleft bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: @@ -183,8 +170,7 @@ - type: marking id: SlimeBonefootleft bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: @@ -199,8 +185,7 @@ - type: marking id: SlimeBonefootright bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: @@ -215,8 +200,7 @@ - type: marking id: SlimeBonehandleft bodyPart: LHand - markingCategory: Arms - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: @@ -231,8 +215,7 @@ - type: marking id: SlimeBonehandright bodyPart: RHand - markingCategory: Arms - speciesRestriction: [ SlimePerson ] + groupWhitelist: [ SlimePerson ] coloring: default: type: