blue blood now requires copper instead of iron to cure bloodloss (#20863)

* blue blood now requires copper instead of iron to cure bloodloss

* arachnid species now needs copper to cure bloodloss and copper pills added to medkits.

* fix puddlesystem proto

* remove the cool

* no longer uses hastag, instead uses custom heart organ and hasorgan.

* fix

diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index 9785fd83651b53a5f6bdf5cc55c88b0dc61f6e2b..b56e1f93081b60c1b2cce8d593b78552c1ed174d 100644 (file)
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -63,9 +63,9 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
     private const string Slime = "Slime";
 
     [ValidatePrototypeId<ReagentPrototype>]
-    private const string SpiderBlood = "SpiderBlood";
+    private const string CopperBlood = "CopperBlood";
 
-    private static string[] _standoutReagents = new[] { Blood, Slime, SpiderBlood };
+    private static string[] _standoutReagents = new[] { Blood, Slime, CopperBlood };
 
     public static float PuddleVolume = 1000;
 

diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl
index 48f6604ef16e7eecaef61ae7e05de875f5da7e65..bcf3502c6bfa9d7525f55f5ec8193799a427fc45 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/biological.ftl
+++ b/Resources/Locale/en-US/reagents/meta/biological.ftl
@@ -4,8 +4,8 @@ reagent-desc-blood = I hope this is ketchup.
 reagent-name-slime = slime
 reagent-desc-slime = You thought this was gradient blood at first, but you were mistaken.
 
-reagent-name-spider-blood = blue blood
-reagent-desc-spider-blood = Doesn't taste like blueberry juice.
+reagent-name-hemocyanin-blood = blue blood
+reagent-desc-hemocyanin-blood = Contains copper as opposed to iron which gives it a distinct blue color.
 
 reagent-name-zombie-blood = zombie blood
 reagent-desc-zombie-blood = Would not advise eating. Can be used to create an inoculation against the infection.

diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index b4eb11b623be6c5cc617385d400ba43b79e4a73d..ee2f16bfeae7fcf06f4a611a218d4c28fa8432d5 100644 (file)
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -94,7 +94,7 @@
   - type: Metabolizer
     updateFrequency: 1.5
     maxReagents: 2
-    metabolizerTypes: [Animal]
+    metabolizerTypes: [Arachnid]
     groups:
     - id: Medicine
     - id: Poison

diff --git a/Resources/Prototypes/Body/Parts/arachnid.yml b/Resources/Prototypes/Body/Parts/arachnid.yml
index 9c95d1d15aae0c087c6e93c4e5a87815d04d833d..d275bd91c63b53a6ff1671eddfcb89786e9b6621 100644 (file)
--- a/Resources/Prototypes/Body/Parts/arachnid.yml
+++ b/Resources/Prototypes/Body/Parts/arachnid.yml
@@ -11,7 +11,7 @@
       reagents:
       - ReagentId: Fat
         Quantity: 3
-      - ReagentId: SpiderBlood
+      - ReagentId: CopperBlood
         Quantity: 10
 
 - type: entity
@@ -27,7 +27,7 @@
       reagents:
       - ReagentId: Fat
         Quantity: 10
-      - ReagentId: SpiderBlood
+      - ReagentId: CopperBlood
         Quantity: 20
 
 - type: entity
@@ -43,7 +43,7 @@
       reagents:
       - ReagentId: Fat
         Quantity: 5
-      - ReagentId: SpiderBlood
+      - ReagentId: CopperBlood
         Quantity: 10
 
 - type: entity

diff --git a/Resources/Prototypes/Body/Prototypes/Animal/hemocyanin.yml b/Resources/Prototypes/Body/Prototypes/Animal/hemocyanin.yml
new file mode 100644 (file)
index 0000000..b29edad
--- /dev/null
+++ b/Resources/Prototypes/Body/Prototypes/Animal/hemocyanin.yml
@@ -0,0 +1,21 @@
+- type: body
+  id: AnimalHemocyanin
+  name: "hemocyanin"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        lungs: OrganAnimalLungs
+        stomach: OrganAnimalStomach
+        liver: OrganAnimalLiver
+        heart: OrganArachnidHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal

diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
index 832d357d83def3517824658d6d3d90ae0aa8f6be..faa8535ab45a31332cddc306814049f46ba6ebbf 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -43,6 +43,7 @@
       - id: Bloodpack
       - id: SyringeTranexamicAcid
       - id: PillCanisterIron
+      - id: PillCanisterCopper
       - id: PillCanisterBicaridine
 
 - type: entity

diff --git a/Resources/Prototypes/Chemistry/metabolizer_types.yml b/Resources/Prototypes/Chemistry/metabolizer_types.yml
index a3507977ad24ec884f45f2cba76555cedb9cb20c..568958601431daf223ae53a9844323ab16794268 100644 (file)
--- a/Resources/Prototypes/Chemistry/metabolizer_types.yml
+++ b/Resources/Prototypes/Chemistry/metabolizer_types.yml
@@ -36,3 +36,7 @@
 - type: metabolizerType
   id: Moth
   name: moth
+
+- type: metabolizerType
+  id: Arachnid
+  name: arachnid

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 262f63b1d62a2fbf865f0106db5a8589550e00d4..b52c22a3941735fef8c8deeee9f19e31b6c72a55 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -726,12 +726,15 @@
     interactSuccessSpawn: EffectHearts
   - type: Bloodstream
     bloodMaxVolume: 50
+    bloodReagent: CopperBlood
   - type: Tag
     tags:
     - VimPilot
   - type: HTN
     rootTask:
       task: RuminantCompound
+  - type: Body
+    prototype: AnimalHemocyanin
 
 - type: entity
   name: goat
@@ -1832,6 +1835,8 @@
     - id: FoodMeatSpider
       amount: 2
   - type: CombatMode
+  - type: Body
+    prototype: AnimalHemocyanin
   - type: MobThresholds
     thresholds:
       0: Alive
@@ -1869,9 +1874,13 @@
   - type: IgnoreSpiderWeb
   - type: Bloodstream
     bloodMaxVolume: 150
-    bloodReagent: SpiderBlood
+    bloodReagent: CopperBlood
   - type: Speech
     speechVerb: Arachnid
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
 
 - type: entity
   name: tarantula
@@ -1921,10 +1930,6 @@
         180: Dead
     - type: Spider
       webPrototype: SpiderWebClown
-    - type: Tag
-      tags:
-      - DoorBumpOpener
-      - FootstepSound
     - type: MeleeWeapon
       angle: 0
       animation: WeaponArcBite

diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index fa78f426ce80bc3a63be861a83f477bb8fd08291..633d8a72823dea754eec0c31e20742644c094e07 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -20,7 +20,7 @@
     baseDecayRate: 0.0125 # Read comment in hunger
   # Damage (Self)
   - type: Bloodstream
-    bloodReagent: SpiderBlood # would be cool if they had to drink copper instead of iron but that might just be more bloat to deal with.
+    bloodReagent: CopperBlood
   # Damage (Others)
   - type: MeleeWeapon
     animation: WeaponArcClaw
@@ -109,6 +109,11 @@
         sprite: "Effects/creampie.rsi"
         state: "creampie_arachnid"
         visible: false
+  - type: Tag
+    tags:
+    - CanPilot
+    - FootstepSound
+    - DoorBumpOpener
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 88b7401f74915daa278296c976ead808eee746f8..4670f5fea3145679430eb9f35d71825a176bd651 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -397,6 +397,19 @@
         - ReagentId: Iron
           Quantity: 10
 
+- type: entity
+  name: copper pill (10u)
+  parent: Pill
+  id: PillCopper
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Copper
+          Quantity: 10
+
 - type: entity
   parent: PillCanister
   id: PillCanisterIron
@@ -407,6 +420,16 @@
     - id: PillIron
       amount: 5
 
+- type: entity
+  parent: PillCanister
+  id: PillCanisterCopper
+  suffix: Copper, 5
+  components:
+  - type: StorageFill
+    contents:
+    - id: PillCopper
+      amount: 5
+
 - type: entity
   name: kelotane pill (10u)
   parent: Pill

diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index f24f68cde45b9cc7c7025f0d0e39b0b983eba1df..a8775799460d6a5a842e68954da233f47089f864 100644 (file)
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -39,10 +39,10 @@
         factor: 1.5
 
 - type: reagent
-  id: SpiderBlood
-  name: reagent-name-spider-blood
+  id: CopperBlood
+  name: reagent-name-hemocyanin-blood
   group: Biological
-  desc: reagent-desc-spider-blood
+  desc: reagent-desc-hemocyanin-blood
   flavor: metallic
   color: "#162581"
   recognizable: true

diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 00c283ddb900b8bf0d29215fa0f25007067b7b13..6389793cda59100759d938b885a5fbeef1f70776 100644 (file)
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -62,9 +62,21 @@
       metabolismRate: 0.1
       effects:
       - !type:HealthChange
+        conditions:
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
         damage:
           types:
             Poison: 0.1
+    Medicine:
+      effects:
+      - !type:ModifyBloodLevel
+        condition:
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: true
+        amount: 4
 
 - type: reagent
   id: Fluorine
@@ -137,9 +149,24 @@
   boilingPoint: 2862.0
   meltingPoint: 1538.0
   metabolisms:
+    Poison:
+      metabolismRate: 0.1
+      effects:
+      - !type:HealthChange
+        conditions:
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: true
+        damage:
+          types:
+            Poison: 0.1
     Medicine:
       effects:
       - !type:ModifyBloodLevel
+        condition:
+        - !type:OrganType
+          type: Arachnid
+          shouldHave: false
         amount: 4
 
 - type: reagent