From 64e0947b97311cb9238eabe2bcac2475777f820b Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Fri, 17 May 2024 09:07:01 -0400
Subject: [PATCH] prototype nanite injector now heals ipcs / robotic limbs /
cybernetic organs (#25473)
* nanocalcium now heals ipcs / robotic limbs / cybernetic organs
* Update code/modules/reagents/chemistry/reagents/medicine.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>
---------
Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---
code/datums/uplink_items/uplink_general.dm | 2 +-
.../reagents/chemistry/reagents/medicine.dm | 14 +++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm
index c55eefdd207..8fe7955fed5 100644
--- a/code/datums/uplink_items/uplink_general.dm
+++ b/code/datums/uplink_items/uplink_general.dm
@@ -605,7 +605,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/device_tools/bonerepair
name = "Prototype Nanite Autoinjector"
- desc = "Stolen prototype full body repair nanites. On injection it will shut down body systems as it revitilizes limbs and organs."
+ desc = "Stolen prototype full body repair nanites. On injection it will shut down body systems as it revitilizes limbs and organs. Heals organics organs, cybernetic organs, and limbs to fully operational conditions."
reference = "NCAI"
item = /obj/item/reagent_containers/hypospray/autoinjector/nanocalcium
cost = 10
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index 0c1b82d9d0c..eac48e6f390 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -1508,7 +1508,8 @@
metabolization_rate = 0.5
harmless = FALSE
taste_description = "2 minutes of suffering"
- var/list/stimulant_list = list("methamphetamine", "crank", "bath_salts", "stimulative_agent", "stimulants", "mephedrone")
+ process_flags = ORGANIC | SYNTHETIC
+ var/list/stimulant_list = list("methamphetamine", "crank", "bath_salts", "stimulative_agent", "stimulants", "mephedrone", "ultralube", "surge", "surge_plus", "combatlube")
/datum/reagent/medicine/nanocalcium/on_mob_life(mob/living/carbon/human/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1521,7 +1522,7 @@
if(1 to 19)
M.AdjustJitter(8 SECONDS)
if(prob(10))
- to_chat(M, "Your skin feels hot and your veins are on fire!")
+ to_chat(M, "You feel great pain from the nanomachines inside you!")
update_flags |= M.adjustFireLoss(1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
for(var/datum/reagent/R in M.reagents.reagent_list)
if(stimulant_list.Find(R.id))
@@ -1549,7 +1550,10 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
for(var/obj/item/organ/internal/I in M.internal_organs) // 60 healing to all internal organs.
- I.heal_internal_damage(4)
+ I.heal_internal_damage(4, TRUE)
+ if(istype(I, /obj/item/organ/internal/cyberimp)) // Fix disabled implants like the ipc charging implant
+ var/obj/item/organ/internal/cyberimp/crit = I
+ crit.crit_fail = FALSE
if(H.blood_volume < BLOOD_VOLUME_NORMAL * 0.7)// If below 70% blood, regenerate 150 units total
H.blood_volume += 10
for(var/datum/disease/critical/heart_failure/HF in H.viruses)
@@ -1559,8 +1563,8 @@
if(M.health < 40)
update_flags |= M.adjustOxyLoss(-5 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
update_flags |= M.adjustToxLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
- update_flags |= M.adjustBruteLoss(-3 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
- update_flags |= M.adjustFireLoss(-3 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(-3 * REAGENTS_EFFECT_MULTIPLIER, FALSE, robotic = TRUE)
+ update_flags |= M.adjustFireLoss(-3 * REAGENTS_EFFECT_MULTIPLIER, FALSE, robotic = TRUE)
else
if(prob(25))
to_chat(M, "Your skin feels like it is ripping apart and your veins are on fire!") //It is experimental and does cause scars, after all.