From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Wed, 26 Apr 2023 06:51:40 +0000 (+0300)
Subject: [mob] Space Spider (#15744)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0eec1d8441637eb0f960fc6ce39a75f1eedc9010;p=space-station-14.git

[mob] Space Spider (#15744)

* Space Spider

* git name
---

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
index 8ba42ef982..21e7c0223c 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
@@ -183,3 +183,15 @@
   - type: ConditionalSpawner
     prototypes:
     - MobKangarooSpaceSalvage
+
+- type: entity
+  name: Salvage Space Spider Spawner
+  id: SpawnMobSpiderSalvage
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSpiderSpaceSalvage
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index c3ec6edb3e..53e1aa0fcc 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -344,3 +344,16 @@
   - type: ConditionalSpawner
     prototypes:
     - MobBoxingKangaroo
+
+- type: entity
+  name: Space Spider Spawner
+  id: SpawnMobSpaceSpider
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSpiderSpace
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 2968b53ce0..f5c264ebab 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -204,3 +204,104 @@
     description: |
       Defend the loot inside the salvage wreck!
   - type: SalvageMobRestrictions
+
+- type: entity
+  name: space spider
+  id: MobSpiderSpace
+  parent: MobSpaceBasic
+  description: It's so glowing, it looks dangerous.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    netsync: false
+    sprite: Mobs/Animals/spacespider.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: spacespider
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: glow
+      shader: unshaded
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      90: Critical
+      130: Dead
+  - type: Stamina
+    excess: 150
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: spacespider
+        BaseUnshaded: glow
+      Critical:
+        Base: spacespider_dead
+      Dead:
+        Base: spacespider_dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatSpider
+      amount: 2
+    - id: EggSpider
+      amount: 1
+      prob: 0.5
+  - type: Bloodstream
+    bloodMaxVolume: 250
+    bloodReagent: Cryoxadone
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.35
+      density: 120
+      mask:
+      - MobMask
+      layer:
+      - MobLayer
+  - type: MeleeWeapon
+    hidden: true
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Piercing: 6
+        Poison: 2
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        reagents:
+        - ReagentId: ChloralHydrate
+          Quantity: 60
+  - type: MeleeChemicalInjector
+    solution: melee
+    transferAmount: 3
+  - type: ReplacementAccent
+    accent: xeno
+  - type: InteractionPopup
+    successChance: 0.20
+    interactSuccessString: petting-success-tarantula
+    interactFailureString: petting-failure-generic
+  - type: PointLight
+    radius: 1.2
+    energy: 2
+    color: "#4faffb"
+  - type: NoSlip
+  - type: IgnoreSpiderWeb
+  - type: GhostRole
+    prob: 0.30
+    name: space spider
+    description: |
+      Space spiders are just as aggressive as regular spiders, feed.
+
+- type: entity
+  id: MobSpiderSpaceSalvage
+  parent: MobSpiderSpace
+  suffix: "Salvage Ruleset"
+  components:
+  - type: GhostRole
+    prob: 0.30
+    name: space spider on salvage wreck
+    description: |
+      Space spiders are just as aggressive as regular spiders, feed.
+  - type: SalvageMobRestrictions
diff --git a/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml b/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml
new file mode 100644
index 0000000000..f53e39e364
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/eggspider.yml
@@ -0,0 +1,23 @@
+- type: entity
+  parent: BaseItem
+  id: EggSpider
+  name: egg spider
+  description: Is it a gemstone? Is it an egg? It looks expensive.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/eggspider.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 6
+        Structural: 2
+    animation: WeaponArcPunch
+  - type: Item
+    size: 5
+  - type: PointLight
+    radius: 1.5
+    energy: 3
+    color: "#4faffb"
+  - type: StaticPrice
+    price: 500
diff --git a/Resources/Textures/Mobs/Animals/spacespider.rsi/glow.png b/Resources/Textures/Mobs/Animals/spacespider.rsi/glow.png
new file mode 100644
index 0000000000..ee4357964d
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/spacespider.rsi/glow.png differ
diff --git a/Resources/Textures/Mobs/Animals/spacespider.rsi/meta.json b/Resources/Textures/Mobs/Animals/spacespider.rsi/meta.json
new file mode 100644
index 0000000000..910780d7d1
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/spacespider.rsi/meta.json
@@ -0,0 +1,66 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, redone by Nimfar11",
+  "states": [
+    {
+      "name": "spacespider",
+      "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": "glow",
+      "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": "spacespider_dead"
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Animals/spacespider.rsi/spacespider.png b/Resources/Textures/Mobs/Animals/spacespider.rsi/spacespider.png
new file mode 100644
index 0000000000..c2ccd76d07
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/spacespider.rsi/spacespider.png differ
diff --git a/Resources/Textures/Mobs/Animals/spacespider.rsi/spacespider_dead.png b/Resources/Textures/Mobs/Animals/spacespider.rsi/spacespider_dead.png
new file mode 100644
index 0000000000..2d0c4cc9bb
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/spacespider.rsi/spacespider_dead.png differ
diff --git a/Resources/Textures/Objects/Misc/eggspider.rsi/icon.png b/Resources/Textures/Objects/Misc/eggspider.rsi/icon.png
new file mode 100644
index 0000000000..c1d18ba315
Binary files /dev/null and b/Resources/Textures/Objects/Misc/eggspider.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/eggspider.rsi/meta.json b/Resources/Textures/Objects/Misc/eggspider.rsi/meta.json
new file mode 100644
index 0000000000..3cc94c8ccf
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/eggspider.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Nimfar11 (github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}