From: brainfood1183 <113240905+brainfood1183@users.noreply.github.com> Date: Tue, 31 Oct 2023 20:41:25 +0000 (+0000) Subject: blue blood now requires copper instead of iron to cure bloodloss (#20863) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=15fc7b1e929596066962fc62a649e1be72b3d292;p=space-station-14.git 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 9785fd8365..b56e1f9308 100644 --- 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] - 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 48f6604ef1..bcf3502c6b 100644 --- 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 b4eb11b623..ee2f16bfea 100644 --- 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 9c95d1d15a..d275bd91c6 100644 --- 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 index 0000000000..b29edadc80 --- /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 832d357d83..faa8535ab4 100644 --- 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 a3507977ad..5689586014 100644 --- 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 262f63b1d6..b52c22a394 100644 --- 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 fa78f426ce..633d8a7282 100644 --- 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 88b7401f74..4670f5fea3 100644 --- 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 f24f68cde4..a877579946 100644 --- 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 00c283ddb9..6389793cda 100644 --- 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