Merge branch 'Fansana:master' into kiss-your-captain

Resources/Changelog/Floof.yml

@@ -866,3 +866,21 @@ Entries:
   id: 118
   time: '2024-09-08T15:57:40.0000000+00:00'
   url: https://github.com/Fansana/floofstation1/pull/178
+- author: fenndragon
+  changes:
+    - type: Add
+      message: a collection of Passive Xenos
+    - type: Add
+      message: >-
+        several New friendly Xeno experimental subjects much like
+        Friend-shaped. 
+  id: 119
+  time: '2024-09-09T02:04:05.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/145
+- author: ShatteredSwords
+  changes:
+    - type: Add
+      message: Added admin-spawnable-only map with ghost roles.
+  id: 120
+  time: '2024-09-09T05:30:39.0000000+00:00'
+  url: https://github.com/Fansana/floofstation1/pull/155

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -97,6 +97,7 @@
       Dead:
         Base: dead
   - type: Puller
+    needsHands: false
   - type: Butcherable
     butcheringType: Spike
     spawned:

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

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"
+    }
+  ]
+}

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"
+    }
+  ]
+}