diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs index d19667898a..bf19aeb57b 100644 --- a/Content.Shared/Humanoid/NamingSystem.cs +++ b/Content.Shared/Humanoid/NamingSystem.cs @@ -26,11 +26,16 @@ namespace Content.Shared.Humanoid switch (speciesProto.Naming) { + case SpeciesNaming.TheFirstofLast: + return Loc.GetString("namepreset-thefirstoflast", + ("first", GetFirstName(speciesProto, gender)), ("last", GetLastName(speciesProto))); case SpeciesNaming.FirstDashFirst: - return $"{GetFirstName(speciesProto, gender)}-{GetFirstName(speciesProto, gender)}"; + return Loc.GetString("namepreset-firstdashfirst", + ("first1", GetFirstName(speciesProto, gender)), ("first2", GetFirstName(speciesProto, gender))); case SpeciesNaming.FirstLast: default: - return $"{GetFirstName(speciesProto, gender)} {GetLastName(speciesProto)}"; + return Loc.GetString("namepreset-firstlast", + ("first", GetFirstName(speciesProto, gender)), ("last", GetLastName(speciesProto))); } } diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs index fe6fe5b3fd..5c10f4a4e9 100644 --- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs +++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs @@ -126,4 +126,5 @@ public enum SpeciesNaming : byte { FirstLast, FirstDashFirst, + TheFirstofLast } diff --git a/Resources/Locale/en-US/markings/diona.ftl b/Resources/Locale/en-US/markings/diona.ftl new file mode 100644 index 0000000000..3cf51c6dd8 --- /dev/null +++ b/Resources/Locale/en-US/markings/diona.ftl @@ -0,0 +1,14 @@ +marking-DionaThornsHead-thorns_head = Diona Head (Thorns) +marking-DionaThornsHead = Diona Head (Thorns) + +marking-DionaThornsBody-thorns_body = Diona Chest (Thorns) +marking-DionaThornsBody = Diona Chest (Thorns) + +marking-DionaFlowersHead-flowers_head = Diona Head (Flowers) +marking-DionaFlowersHead = Diona Head (Flowers) + +marking-DionaFlowersBody-flowers_body = Diona Chest (Flowers) +marking-DionaFlowersBody = Diona Chest (Flowers) + +marking-DionaLeafCover-leaf_cover = Diona Chest (Leaf) +marking-DionaLeafCover = Diona Chest (Leaf) \ No newline at end of file diff --git a/Resources/Locale/en-US/species/namepreset.ftl b/Resources/Locale/en-US/species/namepreset.ftl new file mode 100644 index 0000000000..2d43b5f00d --- /dev/null +++ b/Resources/Locale/en-US/species/namepreset.ftl @@ -0,0 +1,3 @@ +namepreset-firstlast = {$first} {$last} +namepreset-firstdashfirst = {$first1}-{$first2} +namepreset-thefirstoflast = The {$first} of {$last} \ No newline at end of file diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl index 1f03d909c4..42bc2260fa 100644 --- a/Resources/Locale/en-US/species/species.ftl +++ b/Resources/Locale/en-US/species/species.ftl @@ -4,3 +4,4 @@ species-name-human = Human species-name-dwarf = Dwarf species-name-reptilian = Reptilian species-name-slime = Slime Person +species-name-diona = Diona diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml new file mode 100644 index 0000000000..9015d1799e --- /dev/null +++ b/Resources/Prototypes/Body/Organs/diona.yml @@ -0,0 +1,90 @@ +- type: entity + id: BaseDionaOrgan + parent: BaseItem + abstract: true + components: + - type: Sprite + netsync: false + sprite: Mobs/Species/Diona/organs.rsi + - type: Organ + - type: Food + - type: Extractable + grindableSolutionName: organ + - type: SolutionContainerManager + solutions: + organ: + reagents: + - ReagentId: Nutriment + Quantity: 10 + +- type: entity + id: OrganDionaBrain + parent: BaseDionaOrgan + name: brain + description: "The source of incredible, unending intelligence. Honk." + components: + - type: Sprite + state: brain + - type: Organ + - type: Input + context: "ghost" + - type: InputMover + - type: SolutionContainerManager + solutions: + organ: + reagents: + - ReagentId: Nutriment + Quantity: 10 + Lung: + canReact: False + - type: MovementSpeedModifier + baseWalkSpeed: 0 + baseSprintSpeed: 0 + - type: GhostOnMove + - type: Brain + - type: Lung #lungs in they head. why they there tho? + - type: Metabolizer + removeEmpty: true + solutionOnBody: false + solution: "Lung" + metabolizerTypes: [ Plant ] + groups: + - id: Gas + rateModifier: 100.0 + +- type: entity + id: OrganDionaEyes + parent: BaseDionaOrgan + name: eyes + description: "I see you!" + components: + - type: Sprite + layers: + - state: eyeball-l + - state: eyeball-r + - type: Organ + +- type: entity + id: OrganDionaStomach + parent: BaseDionaOrgan + name: stomach + description: "Gross. This is hard to stomach." + components: + - type: Sprite + state: stomach + - type: Organ + - type: SolutionContainerManager + solutions: + stomach: + maxVol: 250 + - type: Stomach + - type: Metabolizer + maxReagents: 6 + metabolizerTypes: [ Plant ] + removeEmpty: true + groups: + - id: Food + - id: Drink + - id: Medicine + - id: Poison + - id: Narcotic \ No newline at end of file diff --git a/Resources/Prototypes/Body/Parts/diona.yml b/Resources/Prototypes/Body/Parts/diona.yml new file mode 100644 index 0000000000..2a1d33fc4e --- /dev/null +++ b/Resources/Prototypes/Body/Parts/diona.yml @@ -0,0 +1,159 @@ +- type: entity + id: PartDiona + parent: BaseItem + name: "diona body part" + abstract: true + components: + - type: Damageable + damageContainer: Biological + - type: BodyPart + - type: ContainerContainer + containers: + bodypart: !type:Container + ents: [] + - type: Sprite + netsync: false + sprite: Mobs/Species/Diona/parts.rsi + - type: Icon + sprite: Mobs/Species/Diona/parts.rsi + - type: StaticPrice + price: 100 + +- type: entity + id: TorsoDiona + name: "diona torso" + parent: PartDiona + components: + - type: Sprite + state: "torso_m" + - type: Icon + state: "torso_m" + - type: BodyPart + partType: Torso + +- type: entity + id: HeadDiona + name: "diona head" + parent: PartDiona + components: + - type: Sprite + state: "head_m" + - type: Icon + state: "head_m" + - type: BodyPart + partType: Head + vital: true + - type: Input + context: "ghost" + - type: MovementSpeedModifier + baseWalkSpeed: 0 + baseSprintSpeed: 0 + - type: InputMover + - type: GhostOnMove + - type: Tag + tags: + - Head + +- type: entity + id: LeftArmDiona + name: "left diona arm" + parent: PartDiona + components: + - type: Sprite + state: "l_arm" + - type: Icon + state: "l_arm" + - type: BodyPart + partType: Arm + symmetry: Left + +- type: entity + id: RightArmDiona + name: "right diona arm" + parent: PartDiona + components: + - type: Sprite + state: "r_arm" + - type: Icon + state: "r_arm" + - type: BodyPart + partType: Arm + symmetry: Right + +- type: entity + id: LeftHandDiona + name: "left diona hand" + parent: PartDiona + components: + - type: Sprite + state: "l_hand" + - type: Icon + state: "l_hand" + - type: BodyPart + partType: Hand + symmetry: Left + +- type: entity + id: RightHandDiona + name: "right diona hand" + parent: PartDiona + components: + - type: Sprite + state: "r_hand" + - type: Icon + state: "r_hand" + - type: BodyPart + partType: Hand + symmetry: Right + +- type: entity + id: LeftLegDiona + name: "left diona leg" + parent: PartDiona + components: + - type: Sprite + state: "l_leg" + - type: Icon + state: "l_leg" + - type: BodyPart + partType: Leg + symmetry: Left + +- type: entity + id: RightLegDiona + name: "right diona leg" + parent: PartDiona + components: + - type: Sprite + state: "r_leg" + - type: Icon + state: "r_leg" + - type: BodyPart + partType: Leg + symmetry: Right + +- type: entity + id: LeftFootDiona + name: "left diona foot" + parent: PartDiona + components: + - type: Sprite + state: "l_foot" + - type: Icon + state: "l_foot" + - type: BodyPart + partType: Foot + symmetry: Left + +- type: entity + id: RightFootDiona + name: "right diona foot" + parent: PartDiona + components: + - type: Sprite + state: "r_foot" + - type: Icon + state: "r_foot" + - type: BodyPart + partType: Foot + symmetry: Right diff --git a/Resources/Prototypes/Body/Prototypes/diona.yml b/Resources/Prototypes/Body/Prototypes/diona.yml new file mode 100644 index 0000000000..4be2138a99 --- /dev/null +++ b/Resources/Prototypes/Body/Prototypes/diona.yml @@ -0,0 +1,45 @@ +- type: body + id: Diona + name: diona + root: torso + slots: + head: + part: HeadDiona + connections: + - torso + organs: + brain: OrganDionaBrain + eyes: OrganDionaEyes + torso: + part: TorsoDiona + connections: + - left arm + - right arm + - left leg + - right leg + organs: + stomach: OrganDionaStomach + right arm: + part: RightArmDiona + connections: + - right hand + left arm: + part: LeftArmDiona + connections: + - left hand + right hand: + part: RightHandDiona + left hand: + part: LeftHandDiona + right leg: + part: RightLegDiona + connections: + - right foot + left leg: + part: LeftLegDiona + connections: + - left foot + right foot: + part: RightFootDiona + left foot: + part: LeftFootDiona diff --git a/Resources/Prototypes/Chemistry/metabolizer_types.yml b/Resources/Prototypes/Chemistry/metabolizer_types.yml index 2e13f9daff..262cd6711a 100644 --- a/Resources/Prototypes/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/Chemistry/metabolizer_types.yml @@ -18,3 +18,6 @@ - type: metabolizerType id: Rat + +- type: metabolizerType + id: Plant \ No newline at end of file diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 54ffa352fe..422c801266 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -109,6 +109,14 @@ Heat: 0.9 Poison: 0.9 +- type: damageModifierSet + id: Diona + coefficients: + Blunt: 0.7 + Slash: 0.8 + Heat: 1.5 + Shock: 1.2 + - type: damageModifierSet id: Zombie #Blunt resistent and immune to biological threats, but can be hacked apart and burned coefficients: diff --git a/Resources/Prototypes/Datasets/Names/diona.yml b/Resources/Prototypes/Datasets/Names/diona.yml new file mode 100644 index 0000000000..a4808d8c5d --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/diona.yml @@ -0,0 +1,50 @@ +- type: dataset + id: DionaFirst + values: + - Moss + - Mushroom + - Herb + - Ivy + - Stalk + - Petal + - Thorn + - Rose + - Dandelion + - Birch + - Willow + - Bay + - Lake + - River + - Creek + - Meadow + - Canyon + - Mountain + - Peak + - Garden + - Soil + - Flower + +- type: dataset + id: DionaLast + values: + - Peace + - Harmony + - Relaxation + - Serendipity + - Calmness + - Introspection + - Union + - Comfort + - Dreams + - Quietude + - Balance + - Gentleness + - Placidity + - Repose + - Serenity + - Stillness + - Tranquility + - Ease + - Equilibrium + - Composure + - Control \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml new file mode 100644 index 0000000000..f81dc13426 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml @@ -0,0 +1,44 @@ +- type: marking + id: DionaThornsHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: thorns_head + +- type: marking + id: DionaThornsBody + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: thorns_body + +- type: marking + id: DionaFlowersHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: flowers_head + +- type: marking + id: DionaFlowersBody + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: flowers_body + +- type: marking + id: DionaLeafCover + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Diona] + sprites: + - sprite: Mobs/Customization/diona.rsi + state: leaf_cover \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml new file mode 100644 index 0000000000..79dfcdcf4b --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml @@ -0,0 +1,34 @@ +- type: entity + save: false + name: Urist McPlants + parent: BaseMobDiona + id: MobDiona + components: + - type: CombatMode + canDisarm: true + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others + - type: Mind + showExamineInfo: true + - type: Input + context: "human" + - type: Respirator + damage: + types: + Asphyxiation: 0.5 + damageRecovery: + types: + Asphyxiation: -1.0 + - type: MobMover + - type: InputMover + - type: Alerts + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + - type: Faction + factions: + - NanoTrasen diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml new file mode 100644 index 0000000000..5bbd02ae05 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -0,0 +1,64 @@ +- type: entity + save: false + name: Urist McPlants + parent: BaseMobOrganic + id: BaseMobDiona + abstract: true + components: + - type: Humanoid + species: Diona + - type: Hunger + - type: Thirst + baseDecayRate: 0.3 + - type: Icon + sprite: Mobs/Species/Diona/parts.rsi + state: full + - type: Body + prototype: Diona + - type: Damageable + damageContainer: Biological + damageModifierSet: Diona + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatPlant + amount: 5 + - type: Bloodstream + bloodReagent: Water + bloodlossDamage: + types: + Bloodloss: + 1 + bloodlossHealDamage: + types: + Bloodloss: + -0.25 + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.35 + density: 300 #weighs more than humans because wood + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer + - type: Inventory + templateId: diona + - type: MovementSpeedModifier + baseWalkSpeed : 1.5 + baseSprintSpeed : 3.5 + +- type: entity + save: false + name: Urist McHands + parent: MobHumanDummy + id: MobDionaDummy + noSpawn: true + description: A dummy diona meant to be used in character setup. + components: + - type: Inventory + templateId: diona + - type: Humanoid + species: Diona diff --git a/Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml new file mode 100644 index 0000000000..e7ce6ccfa1 --- /dev/null +++ b/Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml @@ -0,0 +1,110 @@ +#human but no shoes +- type: inventoryTemplate + id: diona + slots: + - name: jumpsuit + slotTexture: uniform + slotFlags: INNERCLOTHING + stripTime: 6 + uiWindowPos: 0,2 + strippingWindowPos: 0,2 + displayName: Jumpsuit + - name: outerClothing + slotTexture: suit + slotFlags: OUTERCLOTHING + slotGroup: MainHotbar + stripTime: 6 + uiWindowPos: 1,2 + strippingWindowPos: 1,2 + displayName: Suit + - name: gloves + slotTexture: gloves + slotFlags: GLOVES + uiWindowPos: 2,2 + strippingWindowPos: 2,2 + displayName: Gloves + - name: neck + slotTexture: neck + slotFlags: NECK + uiWindowPos: 0,1 + strippingWindowPos: 0,1 + displayName: Neck + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + - name: eyes + slotTexture: glasses + slotFlags: EYES + stripTime: 3 + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + displayName: Eyes + - name: ears + slotTexture: ears + slotFlags: EARS + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,0 + displayName: Ears + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,0 + strippingWindowPos: 1,0 + displayName: Head + - name: pocket1 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 0,3 + strippingWindowPos: 0,4 + dependsOn: jumpsuit + displayName: Pocket 1 + stripHidden: true + - name: pocket2 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 2,3 + strippingWindowPos: 1,4 + dependsOn: jumpsuit + displayName: Pocket 2 + stripHidden: true + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + dependsOn: outerClothing + displayName: Suit Storage + - name: id + slotTexture: id + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + dependsOn: jumpsuit + displayName: ID + - name: belt + slotTexture: belt + slotFlags: BELT + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,1 + strippingWindowPos: 1,5 + displayName: Belt + - name: back + slotTexture: back + slotFlags: BACK + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,0 + strippingWindowPos: 0,5 + displayName: Back diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml index 7ea551102b..09b285dada 100644 --- a/Resources/Prototypes/Reagents/botany.yml +++ b/Resources/Prototypes/Reagents/botany.yml @@ -9,6 +9,13 @@ plantMetabolism: - !type:PlantAdjustNutrition amount: 1 + metabolisms: + Food: + effects: + - !type:SatiateHunger + conditions: + - !type:OrganType + type: Plant - type: reagent id: Left4Zed @@ -26,6 +33,20 @@ - !type:PlantAdjustMutationMod prob: 0.3 amount: 0.2 + metabolisms: + Medicine: + effects: + - !type:SatiateHunger + conditions: + - !type:OrganType + type: Plant + - !type:HealthChange + damage: + types: + Poison: 1 + conditions: + - !type:OrganType + type: Plant - type: reagent id: PestKiller @@ -40,6 +61,16 @@ amount: 4 - !type:PlantAdjustPests amount: -6 + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Poison: 3 + conditions: + - !type:OrganType + type: Plant - type: reagent id: PlantBGone @@ -58,6 +89,19 @@ amount: -20 - !type:PlantAdjustMutationMod amount: 0.1 + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Poison: -4 + Blunt: 2 + Slash: 1 + Piercing: 1 + conditions: + - !type:OrganType + type: Plant - type: reagent id: RobustHarvest @@ -77,6 +121,19 @@ prob: 0.025 amount: 1 - !type:RobustHarvest {} + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: -2 + Blunt: -3 + Slash: -3 + Piercing: -3 + conditions: + - !type:OrganType + type: Plant - type: reagent id: WeedKiller @@ -91,6 +148,16 @@ amount: 4 - !type:PlantAdjustWeeds amount: -6 + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 4 + conditions: + - !type:OrganType + type: Plant - type: reagent id: Ammonia diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 1dcd66af94..f0883eb3ba 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -22,6 +22,10 @@ conditions: - !type:OrganType type: Rat + - !type:Oxygenate + conditions: + - !type:OrganType + type: Plant # Convert Oxygen into CO2. - !type:ModifyLungGas conditions: diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml new file mode 100644 index 0000000000..a44e06982a --- /dev/null +++ b/Resources/Prototypes/Species/diona.yml @@ -0,0 +1,122 @@ +- type: species + id: Diona + name: species-name-diona + roundStart: true + prototype: MobDiona + sprites: MobDionaSprites + markingLimits: MobDionaMarkingLimits + dollPrototype: MobDionaDummy + skinColoration: TintedHues + maleFirstNames: DionaFirst + femaleFirstNames: DionaFirst + lastNames: DionaLast + naming: TheFirstofLast + +- type: speciesBaseSprites + id: MobDionaSprites + sprites: + Head: MobDionaHead + Chest: MobDionaTorso + LArm: MobDionaLArm + RArm: MobDionaRArm + LHand: MobDionaLHand + RHand: MobDionaRHand + LLeg: MobDionaLLeg + RLeg: MobDionaRLeg + LFoot: MobDionaLFoot + RFoot: MobDionaRFoot + +- type: markingPoints + id: MobDionaMarkingLimits + onlyWhitelisted: true + points: + HeadTop: + points: 1 + required: false + Chest: + points: 1 + required: false + +- type: humanoidBaseSprite + id: MobDionaHead + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobDionaHeadMale + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobDionaHeadFemale + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobDionaTorso + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobDionaTorsoMale + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobDionaTorsoFemale + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobDionaLLeg + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobDionaLHand + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobDionaLArm + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobDionaLFoot + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobDionaRLeg + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobDionaRHand + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobDionaRArm + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobDionaRFoot + baseSprite: + sprite: Mobs/Species/Diona/parts.rsi + state: r_foot diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/flowers_body.png b/Resources/Textures/Mobs/Customization/diona.rsi/flowers_body.png new file mode 100644 index 0000000000..e531b3ac3c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/flowers_body.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/flowers_head.png b/Resources/Textures/Mobs/Customization/diona.rsi/flowers_head.png new file mode 100644 index 0000000000..cb3bd6cc37 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/flowers_head.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover.png b/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover.png new file mode 100644 index 0000000000..c0d779a730 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/meta.json b/Resources/Textures/Mobs/Customization/diona.rsi/meta.json new file mode 100644 index 0000000000..f26dafca19 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/diona.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe, modified by EmoGarbage", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "flowers_body", + "directions": 4 + }, + { + "name": "flowers_head", + "directions": 4 + }, + { + "name": "leaf_cover", + "directions": 4 + }, + { + "name": "thorns_body", + "directions": 4 + }, + { + "name": "thorns_head", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/thorns_body.png b/Resources/Textures/Mobs/Customization/diona.rsi/thorns_body.png new file mode 100644 index 0000000000..3f0061059b Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/thorns_body.png differ diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/thorns_head.png b/Resources/Textures/Mobs/Customization/diona.rsi/thorns_head.png new file mode 100644 index 0000000000..717a3dc3ac Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/thorns_head.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/brain.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/brain.png new file mode 100644 index 0000000000..96a56318e6 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/brain.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/ears.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/ears.png new file mode 100644 index 0000000000..c46361661a Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/ears.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/eyeball-l.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/eyeball-l.png new file mode 100644 index 0000000000..a44b5a1656 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/eyeball-l.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/eyeball-r.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/eyeball-r.png new file mode 100644 index 0000000000..bcde38b543 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/eyeball-r.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Diona/organs.rsi/meta.json new file mode 100644 index 0000000000..1c1697efc7 --- /dev/null +++ b/Resources/Textures/Mobs/Species/Diona/organs.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brain" + }, + { + "name": "ears" + }, + { + "name": "eyeball-l" + }, + { + "name": "eyeball-r" + }, + { + "name": "stomach" + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach.png new file mode 100644 index 0000000000..3afd7ec503 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/organs.rsi/stomach.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/full.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/full.png new file mode 100644 index 0000000000..46d002054b Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/full.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_f.png new file mode 100644 index 0000000000..4fa2350ab5 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_f.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_m.png new file mode 100644 index 0000000000..4fa2350ab5 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_m.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_arm.png new file mode 100644 index 0000000000..b6c4da9d41 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_foot.png new file mode 100644 index 0000000000..928804dc80 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_hand.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_hand.png new file mode 100644 index 0000000000..f251e8d3f9 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_leg.png new file mode 100644 index 0000000000..9a60a770d9 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Diona/parts.rsi/meta.json new file mode 100644 index 0000000000..bc90b509a1 --- /dev/null +++ b/Resources/Textures/Mobs/Species/Diona/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise/commit/924e8cc949a40ea64a978656dbbc0b43b4a8f33a and modified by EmoGarbage", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_arm.png new file mode 100644 index 0000000000..36c2665adf Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_foot.png new file mode 100644 index 0000000000..9eab9cd52b Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_hand.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_hand.png new file mode 100644 index 0000000000..03652891a0 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_leg.png new file mode 100644 index 0000000000..03389a2282 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png new file mode 100644 index 0000000000..afba89a1d5 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png new file mode 100644 index 0000000000..afba89a1d5 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png differ