From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Mon, 10 Apr 2023 04:33:22 +0000 (+0300)
Subject: Predatory pet for HoS (#15237)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b9e71237c4c0b1ac43ec21d5a8e6b715ebc6c68d;p=space-station-14.git

Predatory pet for HoS (#15237)
---

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index c2db58ce14..fbf4d3ace9 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -287,3 +287,16 @@
   - type: ConditionalSpawner
     prototypes:
       - MobAlexander
+
+- type: entity
+  name: Shiva Spawner
+  id: SpawnMobShiva
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobSpiderShiva
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 947a7d059f..83f4c5963a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -462,3 +462,69 @@
     tags:
     - CannotSuicide
 
+- type: entity
+  name: Shiva
+  parent: MobGiantSpider
+  id: MobSpiderShiva
+  description: The first defender of the station.
+  components:
+  - type: Faction
+    factions:
+      - PetsNT
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: shiva
+      sprite: Mobs/Pets/shiva.rsi
+  - type: HTN
+    rootTask: SimpleHostileCompound
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.35
+      density: 130
+      mask:
+      - MobMask
+      layer:
+      - MobLayer
+  - type: Appearance
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: shiva
+      Critical:
+        Base: shiva_dead
+      Dead:
+        Base: shiva_dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatSpider
+      amount: 2
+  - type: CombatMode
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      90: Critical
+      150: Dead
+  - type: MeleeWeapon
+    hidden: true
+    angle: 0
+    animation: WeaponArcBite
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    damage:
+      types:
+        Piercing: 8
+        Poison: 8
+  - type: ReplacementAccent
+    accent: xeno
+  - type: NoSlip
+  - type: Spider
+  - type: IgnoreSpiderWeb
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: female
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
index 84c15c2e16..40bb8a5455 100644
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -12,6 +12,12 @@
   - Syndicate
   - Xeno
 
+- type: faction
+  id: PetsNT
+  hostile:
+  - SimpleHostile
+  - Xeno
+
 - type: faction
   id: SimpleHostile
   hostile:
diff --git a/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json b/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json
new file mode 100644
index 0000000000..dbf2bccbef
--- /dev/null
+++ b/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Redid the original tarantulas. Made by Nimfar11 (github) for SS14",
+  "states": [
+    {
+      "name": "shiva",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "shiva_dead",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png
new file mode 100644
index 0000000000..bcaef60343
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png differ
diff --git a/Resources/Textures/Mobs/Pets/shiva.rsi/shiva_dead.png b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva_dead.png
new file mode 100644
index 0000000000..f85faf2294
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva_dead.png differ