diff --git a/Resources/Prototypes/_Sunrise/Body/Organs/humanoid_xeno.yml b/Resources/Prototypes/_Sunrise/Body/Organs/humanoid_xeno.yml index 4f815997306..8ddf7076fe4 100644 --- a/Resources/Prototypes/_Sunrise/Body/Organs/humanoid_xeno.yml +++ b/Resources/Prototypes/_Sunrise/Body/Organs/humanoid_xeno.yml @@ -37,7 +37,7 @@ - type: entity id: OrganHumanoidXenoBrain - parent: BaseHumanoidXenoOrgan + parent: [BaseHumanoidXenoOrgan, BaseOrganBrain] name: brain description: The nexus of the alien mind. Thoughts you don't want to know. components: @@ -71,7 +71,7 @@ - type: entity id: OrganHumanoidXenoTongue - parent: BaseHumanoidXenoOrgan + parent: [BaseHumanoidXenoOrgan, BaseOrganTongue] name: tongue description: Long and flexible. components: @@ -80,7 +80,7 @@ - type: entity id: OrganHumanoidXenoAppendix - parent: BaseHumanoidXenoOrgan + parent: [BaseHumanoidXenoOrgan, BaseOrganAppendix] name: appendix description: An evolutionary greeting from the past. components: @@ -92,7 +92,7 @@ - type: entity id: OrganHumanoidXenoEars - parent: BaseHumanoidXenoOrgan + parent: [BaseHumanoidXenoOrgan, BaseOrganEars] name: ears description: Ultra-sensitive locators. Hear your fears. components: @@ -101,7 +101,7 @@ - type: entity id: OrganHumanoidXenoLungs - parent: BaseHumanoidXenoOrgan + parent: [BaseHumanoidXenoOrgan, BaseOrganLungs] name: lungs description: They filter oxygen from the atmosphere and channel it into the bloodstream, where it is used as an electron carrier. components: @@ -135,7 +135,7 @@ - type: entity id: OrganHumanoidXenoHeart - parent: BaseHumanoidXenoOrgan + parent: [BaseHumanoidXenoOrgan, BaseOrganHeart] name: xenomorph heart description: A powerful organ that pumps acidic blood through tough tissues and provides incredible stamina and strength to every xenomorph. components: @@ -151,7 +151,7 @@ - type: entity id: OrganHumanoidXenoStomach - parent: BaseHumanoidXenoOrgan + parent: [BaseHumanoidXenoOrgan, BaseOrganStomach] name: stomach description: A voracious pit. components: @@ -176,7 +176,7 @@ - type: entity id: OrganHumanoidXenoLiver - parent: BaseHumanoidXenoOrgan + parent: [BaseHumanoidXenoOrgan, BaseOrganLiver] name: liver description: A powerful detoxifier that neutralizes dangerous substances with ease. components: @@ -191,7 +191,7 @@ - type: entity id: OrganHumanoidXenoKidneys - parent: BaseHumanoidXenoOrgan + parent: [BaseHumanoidXenoOrgan, BaseOrganKidneys] name: kidneys description: Paired filters, ruthlessly taking out anything superfluous. components: @@ -203,3 +203,12 @@ maxReagents: 5 metabolizerTypes: [Human] removeEmpty: true + +- type: entity + id: OrganHumanoidXenoEyes + parent: [BaseHumanoidXenoOrgan, BaseOrganEyes] + name: eyes + description: Eyes. They see + components: + - type: Sprite + state: eyes diff --git a/Resources/Prototypes/_Sunrise/Body/Organs/predator.yml b/Resources/Prototypes/_Sunrise/Body/Organs/predator.yml index d21a54b6138..19508dbd372 100644 --- a/Resources/Prototypes/_Sunrise/Body/Organs/predator.yml +++ b/Resources/Prototypes/_Sunrise/Body/Organs/predator.yml @@ -37,7 +37,7 @@ - type: entity id: OrganPredatorBrain - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganBrain] name: brain description: The nexus of the alien mind. Thoughts you don't want to know. components: @@ -71,7 +71,7 @@ - type: entity id: OrganPredatorTongue - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganTongue] name: tongue description: Long and flexible. components: @@ -80,7 +80,7 @@ - type: entity id: OrganPredatorAppendix - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganAppendix] name: appendix description: An evolutionary greeting from the past. components: @@ -92,7 +92,7 @@ - type: entity id: OrganPredatorEars - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganEars] name: ears description: Ultra-sensitive locators. Hear your fears. components: @@ -101,7 +101,7 @@ - type: entity id: OrganPredatorLungs - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganLungs] name: lungs description: They filter oxygen from the atmosphere and channel it into the bloodstream, where it is used as an electron carrier. components: @@ -135,7 +135,7 @@ - type: entity id: OrganPredatorHeart - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganHeart] name: predator heart description: A powerful organ that pumps acidic blood through tough tissues and provides incredible stamina and strength to every predator. components: @@ -151,7 +151,7 @@ - type: entity id: OrganPredatorStomach - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganStomach] name: stomach description: A voracious pit. components: @@ -176,7 +176,7 @@ - type: entity id: OrganPredatorLiver - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganLiver] name: liver description: A powerful detoxifier that neutralizes dangerous substances with ease. components: @@ -191,7 +191,7 @@ - type: entity id: OrganPredatorKidneys - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganKidneys] name: kidneys description: Paired filters, ruthlessly taking out anything superfluous. components: @@ -206,7 +206,7 @@ - type: entity id: OrganPredatorEyes - parent: BasePredatorOrgan + parent: [BasePredatorOrgan, BaseOrganEyes] name: eyes description: I see YOU! components: diff --git a/Resources/Prototypes/_Sunrise/Body/Prototypes/humanoid_xeno.yml b/Resources/Prototypes/_Sunrise/Body/Prototypes/humanoid_xeno.yml index 729014631e4..4b67d6689bc 100644 --- a/Resources/Prototypes/_Sunrise/Body/Prototypes/humanoid_xeno.yml +++ b/Resources/Prototypes/_Sunrise/Body/Prototypes/humanoid_xeno.yml @@ -10,6 +10,7 @@ - torso organs: brain: OrganHumanoidXenoBrain + eyes: OrganHumanoidXenoEyes torso: part: TorsoHumanoidXeno organs: diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml index 6dcb9bb8168..5f68697f94c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml @@ -130,6 +130,7 @@ - type: CollectiveMind minds: - Xeno + - type: FootprintEmitter - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml index b012e5bb6b0..52795af6279 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml @@ -53,6 +53,7 @@ color: "#008000" - type: Body prototype: Predator + - type: FootprintEmitter - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Textures/_Sunrise/Mobs/Species/HumanoidXeno/organs.rsi/eyes.png b/Resources/Textures/_Sunrise/Mobs/Species/HumanoidXeno/organs.rsi/eyes.png new file mode 100644 index 00000000000..d3e6596cc9b Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Species/HumanoidXeno/organs.rsi/eyes.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Species/HumanoidXeno/organs.rsi/meta.json b/Resources/Textures/_Sunrise/Mobs/Species/HumanoidXeno/organs.rsi/meta.json index aaae653c2ef..fb42f6537d1 100644 --- a/Resources/Textures/_Sunrise/Mobs/Species/HumanoidXeno/organs.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Mobs/Species/HumanoidXeno/organs.rsi/meta.json @@ -16,6 +16,9 @@ { "name": "brain" }, + { + "name": "eyes" + }, { "name": "brain-inhand-left", "directions": 4