From 6ff7083bfb592fdc8fe5679b8ecec38ddfa16dec Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 7 Dec 2019 00:48:30 -0600 Subject: [PATCH] the one where i buff a 4 tc item, give trilby a (You), and squash my commits --- code/game/objects/items/storage/firstaid.dm | 7 +++--- .../chemistry/reagents/medicine_reagents.dm | 23 +++++++++++++++++++ .../reagents/reagent_containers/hypospray.dm | 4 ++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 822a1d5011..6f7d2b617d 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -179,9 +179,10 @@ new /obj/item/stack/medical/gauze(src) new /obj/item/defibrillator/compact/combat/loaded(src) new /obj/item/reagent_containers/hypospray/combat(src) - new /obj/item/reagent_containers/pill/patch/styptic(src) - new /obj/item/reagent_containers/pill/patch/silver_sulf(src) - new /obj/item/reagent_containers/syringe/lethal/choral(src) + new /obj/item/reagent_containers/medspray/styptic(src) + new /obj/item/reagent_containers/medspray/silver_sulf(src) + new /obj/item/healthanalyzer/advanced(src) + new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for new /obj/item/clothing/glasses/hud/health/night(src) /* diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 6700c6c006..9903234d3b 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1186,7 +1186,30 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M) M.adjustToxLoss(-5*REM, 0) M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -15*REM) M.adjustCloneLoss(-3*REM, 0) + M.adjustStaminaLoss(-25*REM,0) + if(M.blood_volume < (BLOOD_VOLUME_NORMAL*M.blood_ratio)) + M.blood_volume += 40 // blood fall out man bad + ..() + . = 1 + +/datum/reagent/medicine/lesser_syndicate_nanites // the one in the injector + name = "Regenerative Nanites" + id = "lesser_syndicate_nanites" + description = "Miniature medical robots that restore damage and get operatives back in the fight." + reagent_state = SOLID + color = "#555555" + pH = 11 + +/datum/reagent/medicine/lesser_syndicate_nanites/on_mob_life(mob/living/carbon/M) + M.adjustBruteLoss(-3*REM, 0) // hidden gold shh + M.adjustFireLoss(-3*REM, 0) + M.adjustOxyLoss(-15, 0) + M.adjustToxLoss(-3*REM, 0) + M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -15*REM) + M.adjustCloneLoss(-3*REM, 0) M.adjustStaminaLoss(-20*REM,0) + if(M.blood_volume < (BLOOD_VOLUME_NORMAL*M.blood_ratio)) + M.blood_volume += 20 // blood fall out man bad ..() . = 1 diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 85cb544667..8f4bd763b2 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -56,12 +56,12 @@ /obj/item/reagent_containers/hypospray/combat name = "combat stimulant injector" - desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat." + desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat and get people back in the fight." amount_per_transfer_from_this = 10 icon_state = "combat_hypo" volume = 90 ignore_flags = 1 // So they can heal their comrades. - list_reagents = list("epinephrine" = 30, "omnizine" = 30, "leporazine" = 15, "atropine" = 15) + list_reagents = list("epinephrine" = 30, "lesser_syndicate_nanites" = 30, "leporazine" = 15, "atropine" = 15) /obj/item/reagent_containers/hypospray/combat/nanites desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with experimental medical compounds for rapid healing."