diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 9e6addf3b0a..4bc1f1671ac 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -97,6 +97,7 @@ Dead: Base: dead - type: Puller + needsHands: false - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xeno.yml b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xeno.yml deleted file mode 100644 index 79b6a047f66..00000000000 --- a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xeno.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: entity - name: Friendshaped - parent: MobXenoRounyNPC - id: MobFriendshapedNPC - components: - - type: NpcFactionMember - factions: - - PetsNT diff --git a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml new file mode 100644 index 00000000000..25fc5dc0a57 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml @@ -0,0 +1,282 @@ +- type: entity + name: Neutral Rouny + id: MobXenoNeutralRouny + parent: MobXenoRounyNPC + description: They mostly come at night. Mostly. + components: + - type: NpcFactionMember + factions: + - Passive + - type: PointLight + radius: 2 + energy: .5 + color: "#B85E5E" + - type: MovementAlwaysTouching + - type: GhostTakeoverAvailable + - type: LanguageKnowledge + speaks: + - Xeno + understands: + - Xeno + - GalacticCommon + +- type: entity + name: Neutral Praetorian + id: MobXenoNeutralPraetorian + parent: MobXenoPraetorianNPC + description: They mostly come at night. Mostly. + components: + - type: NpcFactionMember + factions: + - Passive + - type: PointLight + radius: 2 + energy: .5 + color: "#62B85E" + - type: LanguageKnowledge + speaks: + - Xeno + understands: + - Xeno + - GalacticCommon + +- type: entity + name: Neutral Drone + id: MobXenoNeutralDrone + parent: MobXenoDroneNPC + description: They mostly come at night. Mostly. + components: + - type: NpcFactionMember + factions: + - Passive + - type: PointLight + radius: 2 + energy: .5 + color: "#8B5EB8" + - type: LanguageKnowledge + speaks: + - Xeno + understands: + - Xeno + - GalacticCommon + +- type: entity + name: Neutral Ravager + id: MobXenoNeutralRavager + parent: MobXenoRavagerNPC + description: They mostly come at night. Mostly. + components: + - type: NpcFactionMember + factions: + - Passive + - type: PointLight + radius: 2 + energy: .5 + color: "#E3954D" + - type: LanguageKnowledge + speaks: + - Xeno + understands: + - Xeno + - GalacticCommon + +- type: inventoryTemplate + id: friendxeno + slots: + - name: id + slotTexture: id + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + displayName: ID + +- type: entity + name: Friend-Shaped + parent: MobXenoNeutralRouny + id: MobXenoFriendShaped + description: A very clearly friend-shaped Xeno. + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/rouny.rsi + scale: 0.7, 0.7 + - type: Inventory + templateId: friendxeno + - type: IdExaminable + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Grammar + attributes: + proper: true + gender: male + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-reptile + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg + +- type: entity + name: Patriach + parent: MobXenoNeutralPraetorian + id: MobXenoPatriarch + description: A not entirely clearly friend-shaped Xeno. + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: Sprite + drawdepth: Mobs + sprite: Floof/Mobs/Animals/patriarch.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: patriarch + - type: DamageStateVisuals + states: + Alive: + Base: patriarch + Critical: + Base: patriarch_crit + Dead: + Base: patriarch_dead + - type: Inventory + templateId: friendxeno + - type: IdExaminable + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Grammar + attributes: + proper: true + gender: male + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-reptile + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg + +- type: entity + name: FXES + parent: MobXenoNeutralDrone + id: MobXenoFXES + description: A very clearly friend-shaped Xeno. + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: Inventory + templateId: friendxeno + - type: IdExaminable + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Grammar + attributes: + proper: true + gender: male + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-reptile + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg + +- type: entity + name: Hell-Shaped + parent: MobXenoNeutralRavager + id: MobXenoHellShaped + description: A very clearly friend-shaped Xeno. + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: Inventory + templateId: friendxeno + - type: IdExaminable + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Grammar + attributes: + proper: true + gender: male + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-reptile + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg + +- type: entity + name: FXE Subject 7355 + parent: MobXenoNeutralRavager + id: MobXenoSubjectTess + description: An extremely oddly coloured xeno, with glowing stripes. An odd mutation. + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: Sprite + drawdepth: Mobs + sprite: Floof/Mobs/Animals/subject7355.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: subject7355 + - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] + state: glow + shader: unshaded + - type: PointLight + radius: 2 + energy: .5 + color: "#639fff" + - type: DamageStateVisuals + states: + Alive: + Base: subject7355 + Critical: + Base: subject7355_crit + Dead: + Base: subject7355_dead + - type: Inventory + templateId: friendxeno + - type: IdExaminable + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Grammar + attributes: + proper: true + gender: male + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-reptile + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg diff --git a/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/meta.json b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/meta.json new file mode 100644 index 00000000000..9eaca141c97 --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/blob/dev/icons/mob/xenonids/praetorian.dmi edited by Fenndragon", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "patriarch", + "directions": 4 + }, + { + "name": "patriarch_sleeping" + }, + { + "name": "patriarch_crit" + }, + { + "name": "patriarch_dead" + } + ] +} diff --git a/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch.png b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch.png new file mode 100644 index 00000000000..34cb16d5552 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch.png differ diff --git a/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch_crit.png b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch_crit.png new file mode 100644 index 00000000000..add264b5b5c Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch_crit.png differ diff --git a/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch_dead.png b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch_dead.png new file mode 100644 index 00000000000..f190202dcc3 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch_dead.png differ diff --git a/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch_sleeping.png b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch_sleeping.png new file mode 100644 index 00000000000..2cf18ada647 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/patriarch_sleeping.png differ diff --git a/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/glow.png b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/glow.png new file mode 100644 index 00000000000..9fc359cf0c2 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/glow.png differ diff --git a/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/meta.json b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/meta.json new file mode 100644 index 00000000000..6201f4c97a4 --- /dev/null +++ b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "subject7355", + "directions": 4 + }, + { + "name": "glow", + "directions": 4 + }, + { + "name": "subject7355_sleeping" + }, + { + "name": "subject7355_crit" + }, + { + "name": "subject7355_dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355.png b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355.png new file mode 100644 index 00000000000..9b51c993259 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355.png differ diff --git a/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355_crit.png b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355_crit.png new file mode 100644 index 00000000000..d400295959f Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355_crit.png differ diff --git a/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355_dead.png b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355_dead.png new file mode 100644 index 00000000000..6b28c7da7a9 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355_dead.png differ diff --git a/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355_sleeping.png b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355_sleeping.png new file mode 100644 index 00000000000..10600583256 Binary files /dev/null and b/Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/subject7355_sleeping.png differ