diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs index 3fa70c8a98b..a36e1564497 100644 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs @@ -111,7 +111,7 @@ private void OnHairball(EntityUid uid, FelinidComponent component, HairballActio } _popupSystem.PopupEntity(Loc.GetString("hairball-cough", ("name", Identity.Entity(uid, EntityManager))), uid); - SoundSystem.Play("/Audio/Effects/Species/hairball.ogg", Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.15f)); + SoundSystem.Play("/Audio/Nyanotrasen/Voice/Felinid/hairball.ogg", Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.15f)); EnsureComp(uid); args.Handled = true; diff --git a/Resources/Audio/Voice/Felinid/attributions.yml b/Resources/Audio/Nyanotrasen/Voice/Felinid/attributions.yml similarity index 100% rename from Resources/Audio/Voice/Felinid/attributions.yml rename to Resources/Audio/Nyanotrasen/Voice/Felinid/attributions.yml diff --git a/Resources/Audio/Voice/Felinid/cat_growl1.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_growl1.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_hiss1.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_hiss1.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_hiss2.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_hiss2.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_hiss2.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_hiss2.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_meow1.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_meow1.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_meow2.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_meow2.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_meow2.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_meow2.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_meow3.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_meow3.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_meow3.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_meow3.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_mew1.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_mew1.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_mew1.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_mew1.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_mew2.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_mew2.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_mew2.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_mew2.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_purr1.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_purr1.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_scream1.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_scream1.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_scream1.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_scream1.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_scream2.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_scream2.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_scream2.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_scream2.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_scream3.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_scream3.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_scream3.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_scream3.ogg diff --git a/Resources/Audio/Voice/Felinid/cat_wilhelm.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/cat_wilhelm.ogg similarity index 100% rename from Resources/Audio/Voice/Felinid/cat_wilhelm.ogg rename to Resources/Audio/Nyanotrasen/Voice/Felinid/cat_wilhelm.ogg diff --git a/Resources/Audio/Nyanotrasen/Voice/Felinid/hairball.ogg b/Resources/Audio/Nyanotrasen/Voice/Felinid/hairball.ogg new file mode 100644 index 00000000000..f7fb40de608 Binary files /dev/null and b/Resources/Audio/Nyanotrasen/Voice/Felinid/hairball.ogg differ diff --git a/Resources/Audio/Voice/Felinid/license.txt b/Resources/Audio/Nyanotrasen/Voice/Felinid/license.txt similarity index 79% rename from Resources/Audio/Voice/Felinid/license.txt rename to Resources/Audio/Nyanotrasen/Voice/Felinid/license.txt index 89905a5d65b..5c2880930c9 100644 --- a/Resources/Audio/Voice/Felinid/license.txt +++ b/Resources/Audio/Nyanotrasen/Voice/Felinid/license.txt @@ -2,3 +2,4 @@ cat_scream1.ogg licensed under CC0 1.0 taken from Queen_Westeros at https://free cat_scream2.ogg licensed under CC4.0 taken from InspectorJ at https://freesound.org/people/InspectorJ/sounds/415209/ cat_scream3.ogg licensed under CC sampling plus 1.0 taken from Hamface at https://freesound.org/people/Hamface/sounds/98669/ cat_wilhelm.ogg used with apologies to type moon +hairball.ogg taken from https://en.wikipedia.org/wiki/File:Common_house_cat_coughing_hairball.ogv CC-BY-SA-3.0 \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/species/species.ftl b/Resources/Locale/en-US/_NF/species/species.ftl index 04c6f6f302d..d0343e3239c 100644 --- a/Resources/Locale/en-US/_NF/species/species.ftl +++ b/Resources/Locale/en-US/_NF/species/species.ftl @@ -1 +1,3 @@ +## Species Names + species-name-vulpkanin = Vulpkanin diff --git a/Resources/Locale/en-US/_Nyano/species/species.ftl b/Resources/Locale/en-US/_Nyano/species/species.ftl index c461f659c61..9ed72fd0ee0 100644 --- a/Resources/Locale/en-US/_Nyano/species/species.ftl +++ b/Resources/Locale/en-US/_Nyano/species/species.ftl @@ -1,11 +1,4 @@ ## Species Names -species-name-human = Unmutated Human -species-name-dwarf = Dwarf species-name-felinid = Felinid -species-name-reptilian = Reptilian -species-name-slime = Slime Person species-name-oni = Oni -species-name-arachne = Arachne -species-name-diona = Diona -species-name-moth = Moth diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml index 63c196b95d6..048b835fe04 100644 --- a/Resources/Prototypes/Species/species_weights.yml +++ b/Resources/Prototypes/Species/species_weights.yml @@ -5,4 +5,10 @@ Human: 5 Reptilian: 4 SlimePerson: 4 + Moth: 3 + Felinid: 3 + Vulpkanin: 3 + Arachnid: 3 + Oni: 2 + Dwarf: 2 Diona: 2 diff --git a/Resources/Prototypes/_Nyano/Body/Organs/moth.yml b/Resources/Prototypes/_Nyano/Body/Organs/moth.yml deleted file mode 100644 index b2b10e184a4..00000000000 --- a/Resources/Prototypes/_Nyano/Body/Organs/moth.yml +++ /dev/null @@ -1,30 +0,0 @@ -# - type: entity - # id: BaseMothOrgan - # parent: BaseItem - # abstract: true - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/organs.rsi - # - type: Organ - # - type: Food - # - type: Extractable - # grindableSolutionName: organ - # - type: SolutionContainerManager - # solutions: - # organ: - # reagents: - # - ReagentId: Nutriment - # Quantity: 10 - -# - type: entity - # id: OrganMothEyes - # parent: BaseMothOrgan - # name: moth eyes - # description: "I see you!" - # components: - # - type: Sprite - # layers: - # - state: eyeball-l - # - state: eyeball-r - # - type: Organ \ No newline at end of file diff --git a/Resources/Prototypes/_Nyano/Entities/Body/Prototypes/felinid.yml b/Resources/Prototypes/_Nyano/Body/Prototypes/felinid.yml similarity index 100% rename from Resources/Prototypes/_Nyano/Entities/Body/Prototypes/felinid.yml rename to Resources/Prototypes/_Nyano/Body/Prototypes/felinid.yml diff --git a/Resources/Prototypes/_Nyano/Damage/modifier_sets.yml b/Resources/Prototypes/_Nyano/Damage/modifier_sets.yml index 12418ac4091..ee67b085f28 100644 --- a/Resources/Prototypes/_Nyano/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_Nyano/Damage/modifier_sets.yml @@ -1,10 +1,3 @@ -- type: damageModifierSet - id: SizeChanged - coefficients: - Blunt: 3.33 - Slash: 3.33 - Piercing: 3.33 - - type: damageModifierSet id: Felinid coefficients: @@ -26,27 +19,3 @@ Cold: 0.85 Heat: 1.25 Poison: 0.9 - -- type: damageModifierSet - id: ShockAbsorber - coefficients: - Blunt: 0.7 - Slash: 0.5 - Piercing: 0.7 - Shock: 0 - flatReductions: - Blunt: 5 - Heat: 5 - -- type: damageModifierSet - id: Carp - coefficients: - Blunt: 0.65 - Slash: 1.35 - -- type: damageModifierSet - id: Bear - coefficients: - Slash: 0.75 - flatReductions: - Piercing: 7 diff --git a/Resources/Prototypes/_Nyano/Entities/Body/Parts/moth.yml b/Resources/Prototypes/_Nyano/Entities/Body/Parts/moth.yml deleted file mode 100644 index 1048576bde4..00000000000 --- a/Resources/Prototypes/_Nyano/Entities/Body/Parts/moth.yml +++ /dev/null @@ -1,180 +0,0 @@ -# - type: entity - # id: PartMoth - # parent: BaseItem - # name: "moth body part" - # abstract: true - # components: - # - type: Damageable - # damageContainer: Biological - # - type: BodyPart - # - type: ContainerContainer - # containers: - # bodypart: !type:Container - # ents: [] - -# - type: entity - # id: TorsoMoth - # name: "moth torso" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "torso_m" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "torso_m" - # - type: BodyPart - # partType: Torso - -# - type: entity - # id: HeadMoth - # name: "moth head" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "head_m" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "head_m" - # - type: BodyPart - # partType: Head - # - type: Input - # context: "ghost" - # - type: MovementSpeedModifier - # baseWalkSpeed: 0 - # baseSprintSpeed: 0 - # - type: InputMover - # - type: GhostOnMove - -# - type: entity - # id: LeftArmMoth - # name: "left moth arm" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "l_arm" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "l_arm" - # - type: BodyPart - # partType: Arm - # symmetry: Left - -# - type: entity - # id: RightArmMoth - # name: "right moth arm" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "r_arm" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "r_arm" - # - type: BodyPart - # partType: Arm - # symmetry: Right - -# - type: entity - # id: LeftHandMoth - # name: "left moth hand" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "l_hand" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "l_hand" - # - type: BodyPart - # partType: Hand - # symmetry: Left - -# - type: entity - # id: RightHandMoth - # name: "right moth hand" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "r_hand" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "r_hand" - # - type: BodyPart - # partType: Hand - # symmetry: Right - -# - type: entity - # id: LeftLegMoth - # name: "left moth leg" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "l_leg" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "l_leg" - # - type: BodyPart - # partType: Leg - # symmetry: Left - # - type: MovementBodyPart - -# - type: entity - # id: RightLegMoth - # name: "right moth leg" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "r_leg" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "r_leg" - # - type: BodyPart - # partType: Leg - # symmetry: Right - # - type: MovementBodyPart - -# - type: entity - # id: LeftFootMoth - # name: "left moth foot" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "l_foot" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "l_foot" - # - type: BodyPart - # partType: Foot - # symmetry: Left - -# - type: entity - # id: RightFootMoth - # name: "right moth foot" - # parent: PartMoth - # components: - # - type: Sprite - # netsync: false - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "r_foot" - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: "r_foot" - # - type: BodyPart - # partType: Foot - # symmetry: Right diff --git a/Resources/Prototypes/_Nyano/Entities/Body/Prototypes/moth.yml b/Resources/Prototypes/_Nyano/Entities/Body/Prototypes/moth.yml deleted file mode 100644 index 09beae7d9a1..00000000000 --- a/Resources/Prototypes/_Nyano/Entities/Body/Prototypes/moth.yml +++ /dev/null @@ -1,49 +0,0 @@ -# - type: body - # id: Moth - # name: "moth" - # root: torso - # slots: - # head: - # part: HeadMoth - # connections: - # - torso - # organs: - # brain: OrganHumanBrain - # eyes: OrganMothEyes - # torso: - # part: TorsoMoth - # connections: - # - left arm - # - right arm - # - left leg - # - right leg - # organs: - # heart: OrganAnimalHeart - # lungs: OrganHumanLungs - # stomach: OrganReptilianStomach - # liver: OrganAnimalLiver - # kidneys: OrganHumanKidneys - # right arm: - # part: RightArmMoth - # connections: - # - right hand - # left arm: - # part: LeftArmMoth - # connections: - # - left hand - # right hand: - # part: RightHandMoth - # left hand: - # part: LeftHandMoth - # right leg: - # part: RightLegMoth - # connections: - # - right foot - # left leg: - # part: LeftLegMoth - # connections: - # - left foot - # right foot: - # part: RightFootMoth - # left foot: - # part: LeftFootMoth diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/Customization/Markings/moth.yml deleted file mode 100644 index 8bf7f18be04..00000000000 --- a/Resources/Prototypes/_Nyano/Entities/Mobs/Customization/Markings/moth.yml +++ /dev/null @@ -1,1277 +0,0 @@ -# All the moth customization - -# -# Antennas -# -# - type: marking - # id: MothAntennasPlain - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: plain - -# - type: marking - # id: MothAntennasReddish - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: reddish - -# - type: marking - # id: MothAntennasRoyal - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: royal - -# - type: marking - # id: MothAntennasGothic - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: gothic - -# - type: marking - # id: MothAntennasLovers - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: lovers - -# - type: marking - # id: MothAntennasWhitefly - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: whitefly - -# - type: marking - # id: MothAntennasFirewatch - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: firewatch - -# - type: marking - # id: MothAntennasDeathshead - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: deathshead - -# - type: marking - # id: MothAntennasPoison - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: poison - -# - type: marking - # id: MothAntennasMoonfly - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: moonfly - -# - type: marking - # id: MothAntennasSnow - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: snow - -# - type: marking - # id: MothAntennasOakworm - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: oakworm - -# - type: marking - # id: MothAntennasWitchking - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: witchking - -# - type: marking - # id: MothAntennasJungle - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: jungle - -# - type: marking - # id: MothAntennasRegal - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: regal - -# - type: marking - # id: MothAntennasRosy - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: rosy - -# - type: marking - # id: MothAntennasFeathery - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: feathery - -# - type: marking - # id: MothAntennasBrown - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: brown - -# - type: marking - # id: MothAntennasPlasmafire - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: plasmafire - -# - type: marking - # id: MothAntennasMoffra - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: moffra - -# - type: marking - # id: MothAntennasAspen - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: aspen - -# - type: marking - # id: MothAntennasMint - # bodyPart: HeadTop - # markingCategory: HeadTop - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_antennas.rsi - # state: mint - -# -# Wings -# - -# - type: marking - # id: MothWingsPlain - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: plain - -# - type: marking - # id: MothWingsAtlas - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: atlas - -# - type: marking - # id: MothWingsLuna - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: luna - -# - type: marking - # id: MothWingsMonarch - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: monarch - -# - type: marking - # id: MothWingsReddish - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: reddish - -# - type: marking - # id: MothWingsRoyal - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: royal - -# - type: marking - # id: MothWingsGothic - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: gothic - -# - type: marking - # id: MothWingsLovers - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: lovers - -# - type: marking - # id: MothWingsWhitefly - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: whitefly - -# - type: marking - # id: MothWingsFirewatch - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: firewatch - -# - type: marking - # id: MothWingsDeathshead - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: deathshead - -# - type: marking - # id: MothWingsPoison - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: poison - -# - type: marking - # id: MothWingsRagged - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: ragged - -# - type: marking - # id: MothWingsMoonfly - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: moonfly - -# - type: marking - # id: MothWingsSnow - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: snow - -# - type: marking - # id: MothWingsOakworm - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: oakworm - -# - type: marking - # id: MothWingsWitchking - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: witchking - -# - type: marking - # id: MothWingsJungle - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: jungle - -# - type: marking - # id: MothWingsRosy - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: rosy - -# - type: marking - # id: MothWingsFeathery - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: feathery - -# - type: marking - # id: MothWingsBrown - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: brown - -# - type: marking - # id: MothWingsPlasmafire - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: plasmafire - -# - type: marking - # id: MothWingsMoffra - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: moffra - -# - type: marking - # id: MothWingsAspen - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: aspen - -# - type: marking - # id: MothWingsMint - # bodyPart: Tail - # markingCategory: Tail - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_wings.rsi - # state: mint - -# -# Markings -# -# Temp fix of arm markings goes on hand and leg markings on foot to avoid the marking being hidden behind hand/foot. -# All markings need to be selected individually but it would be nice if eventually we get a one button applies all. - -# Reddish -# - type: marking - # id: MothMarkingsReddishHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/reddish.rsi - # state: head - -# - type: marking - # id: MothMarkingsReddishChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/reddish.rsi - # state: chest - -# - type: marking - # id: MothMarkingsReddishLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/reddish.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsReddishRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/reddish.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsReddishLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/reddish.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsReddishRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/reddish.rsi - # state: rightleg - -# Royal -# - type: marking - # id: MothMarkingsRoyalHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/royal.rsi - # state: head - -# - type: marking - # id: MothMarkingsRoyalChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/royal.rsi - # state: chest - -# - type: marking - # id: MothMarkingsRoyalLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/royal.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsRoyalRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/royal.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsRoyalLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/royal.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsRoyalRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/royal.rsi - # state: rightleg - -# Gothic -# - type: marking - # id: MothMarkingsGothicHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/gothic.rsi - # state: head - -# - type: marking - # id: MothMarkingsGothicChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/gothic.rsi - # state: chest - -# - type: marking - # id: MothMarkingsGothicLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/gothic.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsGothicRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/gothic.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsGothicLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/gothic.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsGothicRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/gothic.rsi - # state: rightleg - -# Lovers -# - type: marking - # id: MothMarkingsLoversHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/lovers.rsi - # state: head - -# - type: marking - # id: MothMarkingsLoversChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/lovers.rsi - # state: chest - -# - type: marking - # id: MothMarkingsLoversLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/lovers.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsLoversRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/lovers.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsLoversLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/lovers.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsLoversRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/lovers.rsi - # state: rightleg - -# Whitefly -# - type: marking - # id: MothMarkingsWhiteflyHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/whitefly.rsi - # state: head - -# - type: marking - # id: MothMarkingsWhiteflyChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/whitefly.rsi - # state: chest - -# - type: marking - # id: MothMarkingsWhiteflyLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/whitefly.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsWhiteflyRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/whitefly.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsWhiteflyLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/whitefly.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsWhiteflyRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/whitefly.rsi - # state: rightleg - -# Firewatch -# - type: marking - # id: MothMarkingsFirewatchHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/firewatch.rsi - # state: head - -# - type: marking - # id: MothMarkingsFirewatchChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/firewatch.rsi - # state: chest - -# - type: marking - # id: MothMarkingsFirewatchLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/firewatch.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsFirewatchRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/firewatch.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsFirewatchLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/firewatch.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsFirewatchRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/firewatch.rsi - # state: rightleg - -# Deathshead -# - type: marking - # id: MothMarkingsDeathsheadHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/deathshead.rsi - # state: head - -# - type: marking - # id: MothMarkingsDeathsheadChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/deathshead.rsi - # state: chest - -# - type: marking - # id: MothMarkingsDeathsheadLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/deathshead.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsDeathsheadRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/deathshead.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsDeathsheadLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/deathshead.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsDeathsheadRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/deathshead.rsi - # state: rightleg - -# Poison -# - type: marking - # id: MothMarkingsPoisonHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/poison.rsi - # state: head - -# - type: marking - # id: MothMarkingsPoisonChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/poison.rsi - # state: chest - -# - type: marking - # id: MothMarkingsPoisonLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/poison.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsPoisonRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/poison.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsPoisonLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/poison.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsPoisonRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/poison.rsi - # state: rightleg - -# Ragged -# - type: marking - # id: MothMarkingsRaggedHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/ragged.rsi - # state: head - -# - type: marking - # id: MothMarkingsRaggedChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/ragged.rsi - # state: chest - -# - type: marking - # id: MothMarkingsRaggedLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/ragged.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsRaggedRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/ragged.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsRaggedLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/ragged.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsRaggedRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/ragged.rsi - # state: rightleg - -# Moonfly -# - type: marking - # id: MothMarkingsMoonflyHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/moonfly.rsi - # state: head - -# - type: marking - # id: MothMarkingsMoonflyChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/moonfly.rsi - # state: chest - -# - type: marking - # id: MothMarkingsMoonflyLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/moonfly.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsMoonflyRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/moonfly.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsMoonflyLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/moonfly.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsMoonflyRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/moonfly.rsi - # state: rightleg - -# Oakworm -# - type: marking - # id: MothMarkingsOakwormHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/oakworm.rsi - # state: head - -# - type: marking - # id: MothMarkingsOakwormChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/oakworm.rsi - # state: chest - -# - type: marking - # id: MothMarkingsOakwormLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/oakworm.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsOakwormRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/oakworm.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsOakwormLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/oakworm.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsOakwormRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/oakworm.rsi - # state: rightleg - -# Jungle -# - type: marking - # id: MothMarkingsJungleHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/jungle.rsi - # state: head - -# - type: marking - # id: MothMarkingsJungleChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/jungle.rsi - # state: chest - -# - type: marking - # id: MothMarkingsJungleLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/jungle.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsJungleRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/jungle.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsJungleLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/jungle.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsJungleRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/jungle.rsi - # state: rightleg - -# Witchking -# - type: marking - # id: MothMarkingsWitchkingHead - # bodyPart: Head - # markingCategory: Head - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/witchking.rsi - # state: head - -# - type: marking - # id: MothMarkingsWitchkingChest - # bodyPart: Chest - # markingCategory: Chest - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/witchking.rsi - # state: chest - -# - type: marking - # id: MothMarkingsWitchkingLeftArm - # bodyPart: LHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/witchking.rsi - # state: leftarm - -# - type: marking - # id: MothMarkingsWitchkingRightArm - # bodyPart: RHand - # markingCategory: Arms - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/witchking.rsi - # state: rightarm - -# - type: marking - # id: MothMarkingsWitchkingLeftLeg - # bodyPart: LFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/witchking.rsi - # state: leftleg - -# - type: marking - # id: MothMarkingsWitchkingRightLeg - # bodyPart: RFoot - # markingCategory: Legs - # forcedColoring: true - # speciesRestriction: [Moth] - # sprites: - # - sprite: Nyanotrasen/Mobs/Customization/moth_markings/witchking.rsi - # state: rightleg diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/Player/felinid.yml index 6583be8eb70..37c3fb47557 100644 --- a/Resources/Prototypes/_Nyano/Entities/Mobs/Player/felinid.yml +++ b/Resources/Prototypes/_Nyano/Entities/Mobs/Player/felinid.yml @@ -1,40 +1,14 @@ - type: entity save: false - name: Player felinid - parent: MobFelinidBase + name: Urist McFelinid + parent: [MobFelinidBase, BaseMob] id: MobFelinid components: - - type: CombatMode - canDisarm: true - - type: MindContainer - showExamineInfo: true - - type: Input - context: "human" - - type: MobMover - - type: InputMover - type: Respirator damage: types: - Asphyxiation: 1.5 + Asphyxiation: 1.0 damageRecovery: types: - Asphyxiation: -1.5 - - type: Alerts - - type: Vocal - wilhelm: "/Audio/Voice/Felinid/cat_wilhelm.ogg" - sounds: - Male: MaleFelinid - Female: FemaleFelinid - Unsexed: MaleFelinid - - type: Actions - - type: Eye - - type: CameraRecoil - - type: Examiner - - type: CanHostGuardian - - type: Felinid #since this just adds an action... + Asphyxiation: -1.0 - type: MailReceiver - - type: InteractionPopup - successChance: 1 - interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/Player/moth.yml deleted file mode 100644 index 3a84b2f0f6a..00000000000 --- a/Resources/Prototypes/_Nyano/Entities/Mobs/Player/moth.yml +++ /dev/null @@ -1,42 +0,0 @@ -# - type: entity - # save: false - # name: Player moth - # parent: BaseMobMoth - # id: MobMoth - # components: - # - type: CombatMode - # canDisarm: true - # - type: InteractionPopup - # successChance: 1 - # interactSuccessString: hugging-success-generic - # interactSuccessSound: /Audio/Effects/thudswoosh.ogg - # messagePerceivedByOthers: hugging-success-generic-others - # - type: MindContainer - # showExamineInfo: true - # - type: Input - # context: "human" - # - type: MobMover - # - type: InputMover - # - type: Respirator - # damage: - # types: - # Asphyxiation: 1.0 - # damageRecovery: - # types: - # Asphyxiation: -1.0 - # - type: Vocal # these are all the same - # wilhelm: "/Audio/Voice/Moth/scream_moth.ogg" - # sounds: - # Male: MaleMoth - # Female: FemaleMoth - # Unsexed: MaleMoth - # - type: Alerts - # - type: Actions - # - type: Eye - # - type: CameraRecoil - # - type: Examiner - # - type: CanHostGuardian - # - type: NpcFactionMember - # factions: - # - NanoTrasen - # - type: MailReceiver diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/Player/oni.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/Player/oni.yml index cca685e9ff1..0c46ac07411 100644 --- a/Resources/Prototypes/_Nyano/Entities/Mobs/Player/oni.yml +++ b/Resources/Prototypes/_Nyano/Entities/Mobs/Player/oni.yml @@ -1,37 +1,14 @@ - type: entity save: false - name: Player oni - parent: MobOniBase + name: Urist McOni + parent: [MobOniBase, BaseMob] id: MobOni components: - - type: CombatMode - canDisarm: true - - type: MindContainer - showExamineInfo: true - - type: Input - context: "human" - - type: MobMover - - type: InputMover - type: Respirator damage: types: - Asphyxiation: 1.5 + Asphyxiation: 1.0 damageRecovery: types: - Asphyxiation: -1.5 - - type: Alerts - - type: Actions - - type: Eye - zoom: "1.125, 1.125" - - type: CameraRecoil - - type: Examiner - - type: CanHostGuardian - - type: NpcFactionMember - factions: - - NanoTrasen + Asphyxiation: -1.0 - type: MailReceiver - - type: InteractionPopup - successChance: 1 - interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/Species/felinid.yml index 5f42a13c106..a11169e7d2f 100644 --- a/Resources/Prototypes/_Nyano/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/_Nyano/Entities/Mobs/Species/felinid.yml @@ -1,108 +1,28 @@ - type: entity - save: false - name: Base felinid + name: Urist McFelinid parent: BaseMobHuman id: MobFelinidBase abstract: true components: - type: Sprite - netsync: false - noRot: true - drawdepth: Mobs scale: 0.8, 0.8 - layers: - - map: [ "enum.HumanoidVisualLayers.Chest" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: torso_m - - map: [ "enum.HumanoidVisualLayers.Head" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: head_m - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - color: "#008800" - sprite: Mobs/Customization/eyes.rsi - state: eyes - - map: [ "enum.HumanoidVisualLayers.RArm" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_arm - - map: [ "enum.HumanoidVisualLayers.LArm" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_arm - - map: [ "enum.HumanoidVisualLayers.RLeg" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_leg - - map: [ "enum.HumanoidVisualLayers.LLeg" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilMask - map: [ "enum.HumanoidVisualLayers.StencilMask" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: female_full - visible: false - - map: [ "jumpsuit" ] - shader: StencilDraw - - map: [ "enum.HumanoidVisualLayers.LHand" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_hand - - map: [ "enum.HumanoidVisualLayers.RHand" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_hand - - map: [ "enum.HumanoidVisualLayers.LFoot" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_foot - - map: [ "enum.HumanoidVisualLayers.RFoot" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_foot - - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: [ "id" ] - - map: [ "gloves" ] - - map: [ "shoes" ] - - map: [ "ears" ] - - map: [ "outerClothing" ] - - map: [ "eyes" ] - - map: [ "belt" ] - - map: [ "neck" ] - - map: [ "back" ] - - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - state: shaved - sprite: Mobs/Customization/human_facial_hair.rsi - - map: [ "enum.HumanoidVisualLayers.Hair" ] - state: bald - sprite: Mobs/Customization/human_hair.rsi - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: none - visible: false - - map: [ "mask" ] - - map: [ "head" ] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: [ "enum.HumanoidVisualLayers.Tail" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: none - visible: false - type: HumanoidAppearance species: Felinid + - type: Fixtures + fixtures: # TODO: This needs a second fixture just for mob collisions. + fix1: + shape: + !type:PhysShapeCircle + radius: 0.28 + density: 140 + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer - type: Body prototype: Felinid - type: Damageable - damageContainer: Biological damageModifierSet: Felinid - type: MeleeWeapon soundHit: @@ -121,11 +41,15 @@ damage: types: Blunt: 1 - soundHit: - path: /Audio/Effects/hit_kick.ogg - type: Stamina - type: PseudoItem - - type: Perishable + - type: Vocal + wilhelm: "/Audio/Nyanotrasen/Voice/Felinid/cat_wilhelm.ogg" + sounds: + Male: MaleFelinid + Female: FemaleFelinid + Unsexed: MaleFelinid + - type: Felinid - type: NpcFactionMember factions: - NanoTrasen @@ -133,103 +57,13 @@ - type: entity save: false - name: Felinid Dummy + name: Urist McFelinid parent: MobHumanDummy id: MobFelinidDummy noSpawn: true description: A dummy felinid meant to be used in character setup. components: - - type: Sprite - netsync: false - noRot: true - drawdepth: Mobs - scale: 1, 1 - layers: - - map: ["enum.HumanoidVisualLayers.Chest"] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: torso_m - - map: ["enum.HumanoidVisualLayers.Head"] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: head_m - - map: ["enum.HumanoidVisualLayers.Eyes"] - color: "#008800" - sprite: Mobs/Customization/eyes.rsi - state: eyes - - map: ["enum.HumanoidVisualLayers.RArm"] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_arm - - map: ["enum.HumanoidVisualLayers.LArm"] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_arm - - map: ["enum.HumanoidVisualLayers.RLeg"] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_leg - - map: ["enum.HumanoidVisualLayers.LLeg"] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - map: [ "enum.HumanoidVisualLayers.LFoot" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_foot - - map: [ "enum.HumanoidVisualLayers.RFoot" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_foot - - shader: StencilClear - - shader: StencilMask - map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mobs/Customization/masking_helpers.rsi - state: female_full - visible: false - - map: ["jumpsuit"] - shader: StencilDraw - - map: ["enum.HumanoidVisualLayers.LHand"] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_hand - - map: ["enum.HumanoidVisualLayers.RHand"] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_hand - - map: ["enum.HumanoidVisualLayers.Handcuffs"] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: ["id"] - - map: ["gloves"] - - map: ["shoes"] - - map: ["ears"] - - map: ["outerClothing"] - - map: ["eyes"] - - map: ["belt"] - - map: ["neck"] - - map: ["back"] - - map: ["enum.HumanoidVisualLayers.FacialHair"] - state: shaved - sprite: Mobs/Customization/human_facial_hair.rsi - - map: ["enum.HumanoidVisualLayers.Hair"] - state: bald - sprite: Mobs/Customization/human_hair.rsi - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: none - visible: false - - map: ["mask"] - - map: ["head"] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: ["hand-left"] - - map: ["hand-right"] - - map: [ "enum.HumanoidVisualLayers.Tail" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: none - visible: false + - type: HumanoidAppearance + species: Felinid #Nya~~ diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/Species/moth.yml deleted file mode 100644 index ba9299b8562..00000000000 --- a/Resources/Prototypes/_Nyano/Entities/Mobs/Species/moth.yml +++ /dev/null @@ -1,106 +0,0 @@ -# - type: entity - # save: false - # name: Base Moth - # parent: BaseMobHuman - # id: BaseMobMoth - # abstract: true - # components: - # - type: HumanoidAppearance - # species: Moth - # - type: Hunger - # - type: Thirst - # - type: Icon - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: full - # - type: Body - # prototype: Moth - # requiredLegs: 2 - # - type: Flammable - # damage: - # types: - # Heat: 2 # moths should burn more easily - # - type: MobState - # - type: MobThresholds - # thresholds: - # 0: Alive - # 100: Critical - # 200: Dead - # - type: Damageable - # damageContainer: Biological - # damageModifierSet: Moff # moff - # - type: Temperature - # heatDamageThreshold: 330 - # coldDamageThreshold: 195 - # currentTemperature: 310.15 - # specificHeat: 46 - # coldDamage: - # types: - # Cold : 0.05 #per second, scales with temperature & other constants - # heatDamage: - # types: - # Heat : 0.25 #per second, scales with temperature & other constants - # - type: MovementAlwaysTouching - # - type: Sprite # sprite again because we want different layer ordering - # netsync: false - # noRot: true - # drawdepth: Mobs - # layers: - # - map: [ "enum.HumanoidVisualLayers.Chest" ] - # - map: [ "enum.HumanoidVisualLayers.Head" ] - # - map: [ "enum.HumanoidVisualLayers.Eyes" ] - # - map: [ "enum.HumanoidVisualLayers.Snout" ] - # - map: [ "enum.HumanoidVisualLayers.RArm" ] - # - map: [ "enum.HumanoidVisualLayers.LArm" ] - # - map: [ "enum.HumanoidVisualLayers.RLeg" ] - # - map: [ "enum.HumanoidVisualLayers.LLeg" ] - # - shader: StencilClear - # sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 - # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. - # sprite refactor when - # state: l_leg - # - shader: StencilMask - # map: [ "enum.HumanoidVisualLayers.StencilMask" ] - # sprite: Mobs/Customization/masking_helpers.rsi - # state: female_full - # visible: false - # - map: [ "enum.HumanoidVisualLayers.LHand" ] - # - map: [ "enum.HumanoidVisualLayers.RHand" ] - # - map: [ "enum.HumanoidVisualLayers.LFoot" ] - # - map: [ "enum.HumanoidVisualLayers.RFoot" ] - # - map: [ "jumpsuit" ] - # - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] - # color: "#ffffff" - # sprite: Objects/Misc/handcuffs.rsi - # state: body-overlay-2 - # visible: false - # - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everything doesn't break - # - map: [ "id" ] - # - map: [ "gloves" ] - # - map: [ "shoes" ] - # - map: [ "ears" ] - # - map: [ "outerClothing" ] - # - map: [ "eyes" ] - # - map: [ "belt" ] - # - map: [ "neck" ] - # - map: [ "back" ] - # - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - # - map: [ "enum.HumanoidVisualLayers.Hair" ] - # - map: [ "enum.HumanoidVisualLayers.HeadSide" ] - # - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - # - map: [ "mask" ] - # - map: [ "head" ] - # - map: [ "pocket1" ] - # - map: [ "pocket2" ] - -# - type: entity - # save: false - # name: Moth Dummy - # parent: MobHumanDummy - # id: MobMothDummy - # noSpawn: true - # description: A dummy moth meant to be used in character setup. - # components: - # - type: HumanoidAppearance - # species: Moth - -#Weh diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/Species/oni.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/Species/oni.yml index 60c51cb91c9..9a74fd95fe5 100644 --- a/Resources/Prototypes/_Nyano/Entities/Mobs/Species/oni.yml +++ b/Resources/Prototypes/_Nyano/Entities/Mobs/Species/oni.yml @@ -1,106 +1,15 @@ - type: entity + name: Urist McOni parent: BaseMobHuman - name: Base oni id: MobOniBase abstract: true components: - - type: Tag - tags: - - CanPilot - - FootstepSound - - DoorBumpOpener - type: Speech speechSounds: Baritone - type: HumanoidAppearance species: Oni - type: Sprite - netsync: false - noRot: true - drawdepth: Mobs scale: 1.2, 1.2 - layers: - - map: [ "enum.HumanoidVisualLayers.Chest" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: torso_m - - map: [ "enum.HumanoidVisualLayers.Head" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: head_m - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - color: "#008800" - sprite: Mobs/Customization/eyes.rsi - state: eyes - - map: [ "enum.HumanoidVisualLayers.RArm" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_arm - - map: [ "enum.HumanoidVisualLayers.LArm" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_arm - - map: [ "enum.HumanoidVisualLayers.RLeg" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_leg - - map: [ "enum.HumanoidVisualLayers.LLeg" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilMask - map: [ "enum.HumanoidVisualLayers.StencilMask" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: female_full - visible: false - - map: [ "jumpsuit" ] - shader: StencilDraw - - map: [ "enum.HumanoidVisualLayers.LHand" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_hand - - map: [ "enum.HumanoidVisualLayers.RHand" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_hand - - map: [ "enum.HumanoidVisualLayers.LFoot" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_foot - - map: [ "enum.HumanoidVisualLayers.RFoot" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_foot - - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: [ "id" ] - - map: [ "gloves" ] - - map: [ "shoes" ] - - map: [ "ears" ] - - map: [ "outerClothing" ] - - map: [ "eyes" ] - - map: [ "belt" ] - - map: [ "neck" ] - - map: [ "back" ] - - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - state: shaved - sprite: Mobs/Customization/human_facial_hair.rsi - - map: [ "enum.HumanoidVisualLayers.Hair" ] - state: bald - sprite: Mobs/Customization/human_hair.rsi - - map: [ "mask" ] - - map: [ "head" ] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: none - visible: false - type: Oni modifiers: coefficients: @@ -109,105 +18,30 @@ Piercing: 1.2 Asphyxiation: 1.35 - type: Damageable - damageContainer: Biological damageModifierSet: Oni - type: Body prototype: Human + - type: Fixtures + fixtures: # TODO: This needs a second fixture just for mob collisions. + fix1: + shape: + !type:PhysShapeCircle + radius: 0.42 + density: 220 + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer - type: Stamina - - type: Perishable + - type: NpcFactionMember + factions: + - NanoTrasen - type: entity save: false - name: Oni Dummy + name: Urist McOni parent: MobHumanDummy id: MobOniDummy + noSpawn: true description: A dummy oni meant to be used in character setup. - components: - - type: Sprite - netsync: false - noRot: true - drawdepth: Mobs - scale: 1.0, 1.0 - layers: - - map: [ "enum.HumanoidVisualLayers.Chest" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: torso_m - - map: [ "enum.HumanoidVisualLayers.Head" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: head_m - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - color: "#008800" - sprite: Mobs/Customization/eyes.rsi - state: eyes - - map: [ "enum.HumanoidVisualLayers.RArm" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_arm - - map: [ "enum.HumanoidVisualLayers.LArm" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_arm - - map: [ "enum.HumanoidVisualLayers.RLeg" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_leg - - map: [ "enum.HumanoidVisualLayers.LLeg" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilMask - map: [ "enum.HumanoidVisualLayers.StencilMask" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: female_full - visible: false - - map: [ "jumpsuit" ] - shader: StencilDraw - - map: [ "enum.HumanoidVisualLayers.LHand" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_hand - - map: [ "enum.HumanoidVisualLayers.RHand" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_hand - - map: [ "enum.HumanoidVisualLayers.LFoot" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: l_foot - - map: [ "enum.HumanoidVisualLayers.RFoot" ] - color: "#e8b59b" - sprite: Mobs/Species/Human/parts.rsi - state: r_foot - - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: [ "id" ] - - map: [ "gloves" ] - - map: [ "shoes" ] - - map: [ "ears" ] - - map: [ "outerClothing" ] - - map: [ "eyes" ] - - map: [ "belt" ] - - map: [ "neck" ] - - map: [ "back" ] - - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - state: shaved - sprite: Mobs/Customization/human_facial_hair.rsi - - map: [ "enum.HumanoidVisualLayers.Hair" ] - state: bald - sprite: Mobs/Customization/human_hair.rsi - - map: [ "mask" ] - - map: [ "head" ] - - map: [ "pocket1" ] - - map: [ "pocket2" ] - - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - sprite: Mobs/Customization/masking_helpers.rsi - state: none - visible: false diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/mail.yml index 64e1b33c447..52dd468c219 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/mail.yml @@ -252,7 +252,7 @@ suffix: cosplay-arc components: - type: Mail - openSound: /Audio/Voice/Felinid/cat_wilhelm.ogg + openSound: /Audio/Nyanotrasen/Voice/Felinid/cat_wilhelm.ogg contents: - id: ClothingCostumeArcDress diff --git a/Resources/Prototypes/_Nyano/SoundCollections/felinid.yml b/Resources/Prototypes/_Nyano/SoundCollections/felinid.yml index 6d44b05a7f4..c0aaa6c1b70 100644 --- a/Resources/Prototypes/_Nyano/SoundCollections/felinid.yml +++ b/Resources/Prototypes/_Nyano/SoundCollections/felinid.yml @@ -1,35 +1,35 @@ - type: soundCollection id: FelinidScreams files: - - /Audio/Voice/Felinid/cat_scream1.ogg - - /Audio/Voice/Felinid/cat_scream2.ogg - - /Audio/Voice/Felinid/cat_scream3.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_scream1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_scream2.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_scream3.ogg - type: soundCollection id: FelinidHisses files: - - /Audio/Voice/Felinid/cat_hiss1.ogg - - /Audio/Voice/Felinid/cat_hiss2.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_hiss2.ogg - type: soundCollection id: FelinidMeows files: - - /Audio/Voice/Felinid/cat_meow1.ogg - - /Audio/Voice/Felinid/cat_meow2.ogg - - /Audio/Voice/Felinid/cat_meow3.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_meow1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_meow2.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_meow3.ogg - type: soundCollection id: FelinidMews files: - - /Audio/Voice/Felinid/cat_mew1.ogg - - /Audio/Voice/Felinid/cat_mew2.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_mew1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_mew2.ogg - type: soundCollection id: FelinidGrowls files: - - /Audio/Voice/Felinid/cat_growl1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg - type: soundCollection id: FelinidPurrs files: - - /Audio/Voice/Felinid/cat_purr1.ogg + - /Audio/Nyanotrasen/Voice/Felinid/cat_purr1.ogg diff --git a/Resources/Prototypes/_Nyano/Species/moth.yml b/Resources/Prototypes/_Nyano/Species/moth.yml deleted file mode 100644 index 82a392fc9cd..00000000000 --- a/Resources/Prototypes/_Nyano/Species/moth.yml +++ /dev/null @@ -1,155 +0,0 @@ -# - type: species - # id: Moth - # name: species-name-moth - # roundStart: true - # prototype: MobMoth - # sprites: MobMothSprites - # defaultSkinTone: "#ffda93" - # markingLimits: MobMothMarkingLimits - # dollPrototype: MobMothDummy - # skinColoration: Hues - # maleFirstNames: names_moth_male - # femaleFirstNames: names_moth_female - # lastNames: names_moth_last - -# - type: speciesBaseSprites - # id: MobMothSprites - # sprites: - # Head: MobMothHead - # Snout: MobHumanoidAnyMarking - # Chest: MobMothTorso - # HeadTop: MobHumanoidAnyMarking - # HeadSide: MobHumanoidAnyMarking - # Tail: MobHumanoidAnyMarking - # Eyes: MobMothEyes - # LArm: MobMothLArm - # RArm: MobMothRArm - # LHand: MobMothLHand - # RHand: MobMothRHand - # LLeg: MobMothLLeg - # RLeg: MobMothRLeg - # LFoot: MobMothLFoot - # RFoot: MobMothRFoot - -# - type: humanoidBaseSprite - # id: MobMothEyes - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/moth_eyes.rsi - # state: eyes - -# - type: markingPoints - # id: MobMothMarkingLimits - # points: - # Hair: - # points: 0 - # required: false - # FacialHair: - # points: 0 - # required: false - # Tail: - # points: 1 - # required: true - # defaultMarkings: [ MothWingsPlain ] - # Snout: - # points: 0 - # required: false - # HeadTop: - # points: 1 - # required: true - # defaultMarkings: [ MothAntennasPlain ] - # Head: - # points: 1 - # required: false - # Chest: - # points: 1 - # required: false - # Legs: - # points: 2 - # required: false - # Arms: - # points: 2 - # required: false - -# - type: humanoidBaseSprite - # id: MobMothHead - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: head_m - -# - type: humanoidBaseSprite - # id: MobMothHeadMale - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: head_m - -# - type: humanoidBaseSprite - # id: MobMothHeadFemale - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: head_f - -# - type: humanoidBaseSprite - # id: MobMothTorso - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: torso_m - -# - type: humanoidBaseSprite - # id: MobMothTorsoMale - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: torso_m - -# - type: humanoidBaseSprite - # id: MobMothTorsoFemale - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: torso_f - -# - type: humanoidBaseSprite - # id: MobMothLLeg - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: l_leg - -# - type: humanoidBaseSprite - # id: MobMothLHand - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: l_hand - -# - type: humanoidBaseSprite - # id: MobMothLArm - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: l_arm - -# - type: humanoidBaseSprite - # id: MobMothLFoot - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: l_foot - -# - type: humanoidBaseSprite - # id: MobMothRLeg - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: r_leg - -# - type: humanoidBaseSprite - # id: MobMothRHand - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: r_hand - -# - type: humanoidBaseSprite - # id: MobMothRArm - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: r_arm - -# - type: humanoidBaseSprite - # id: MobMothRFoot - # baseSprite: - # sprite: Nyanotrasen/Mobs/Species/Moth/parts.rsi - # state: r_foot