[Merge Ready]Medipen middle ground, direct nerf but more versatile (#51757)

* lavaland changes

* luxury medipens

* Update code/modules/reagents/reagent_containers/hypospray.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/reagents/reagent_containers/hypospray.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* e

* e

* e

* Update code/modules/reagents/reagent_containers/hypospray.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
This commit is contained in:
EdgeLordExe
2020-06-29 13:25:28 -04:00
committed by GitHub
co-authored by Rohesie ラッピ from PSO2
parent 2621e88430
commit bf604b00d6
4 changed files with 25 additions and 22 deletions
+1
View File
@@ -36,6 +36,7 @@
new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750),
new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800),
new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800),
new /datum/data/mining_equipment("Luxury Medipen", /obj/item/reagent_containers/hypospray/medipen/survival/luxury, 1000),
new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000),
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000),
@@ -1025,25 +1025,6 @@
..()
return TRUE
/datum/reagent/medicine/lavaland_extract
name = "Lavaland Extract"
description = "An extract of lavaland atmospheric and mineral elements. Heals the user in small doses, but is extremely toxic otherwise."
color = "#6B372E" //dark and red like lavaland
overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent
can_synth = FALSE
/datum/reagent/medicine/lavaland_extract/on_mob_life(mob/living/carbon/M)
M.heal_bodypart_damage(5,5)
..()
return TRUE
/datum/reagent/medicine/lavaland_extract/overdose_process(mob/living/M)
M.adjustBruteLoss(3*REM, 0, FALSE, BODYPART_ORGANIC)
M.adjustFireLoss(3*REM, 0, FALSE, BODYPART_ORGANIC)
M.adjustToxLoss(3*REM, 0)
..()
return TRUE
//used for changeling's adrenaline power
/datum/reagent/medicine/changelingadrenaline
name = "Changeling Adrenaline"
@@ -214,13 +214,34 @@
icon_state = "[initial(icon_state)]0"
/obj/item/reagent_containers/hypospray/medipen/survival
name = "survival medipen"
desc = "A medipen for surviving in the harshest of environments, heals and protects from environmental hazards. WARNING: Do not inject more than one pen in quick succession."
name = "survival emergency medipen"
desc = "A medipen for surviving in the harsh environments, heals most common damage sources. WARNING: May cause organ damage."
icon_state = "stimpen"
inhand_icon_state = "stimpen"
volume = 30
amount_per_transfer_from_this = 30
list_reagents = list( /datum/reagent/medicine/epinephrine = 8, /datum/reagent/medicine/c2/aiuri = 8, /datum/reagent/medicine/c2/libital = 8 ,/datum/reagent/medicine/leporazine = 6)
/obj/item/reagent_containers/hypospray/medipen/survival/inject(mob/living/M, mob/user)
if(!lavaland_equipment_pressure_check(get_turf(user)))
if(M in user.do_afters)
to_chat(user,"<span class='notice'>You are too busy to use \the [src]!</span>")
return
to_chat(user,"<span class='notice'>You start manually releasing the low-pressure gauge...</span>")
if(do_mob(user, M ,10 SECONDS))
amount_per_transfer_from_this = initial(amount_per_transfer_from_this) * 0.5
return ..()
amount_per_transfer_from_this = initial(amount_per_transfer_from_this)
return ..()
/obj/item/reagent_containers/hypospray/medipen/survival/luxury
name = "luxury medipen"
desc = "Cutting edge bluespace technology allowed Nanotrasen to compact 60u of volume into a single medipen. Contains rare and powerful chemicals used to aid in exploration of very hard enviroments. WARNING: DO NOT MIX WITH EPINEPHRINE OR ATROPINE."
icon_state = "luxpen"
inhand_icon_state = "atropen"
volume = 60
amount_per_transfer_from_this = 60
list_reagents = list(/datum/reagent/medicine/salbutamol = 10, /datum/reagent/medicine/leporazine = 15, /datum/reagent/medicine/epinephrine = 10, /datum/reagent/medicine/lavaland_extract = 2, /datum/reagent/medicine/omnizine = 5, /datum/reagent/medicine/oxandrolone = 8, /datum/reagent/medicine/sal_acid = 8, /datum/reagent/medicine/morphine = 2)
list_reagents = list(/datum/reagent/medicine/salbutamol = 10, /datum/reagent/medicine/c2/penthrite = 10, /datum/reagent/medicine/oxandrolone = 10, /datum/reagent/medicine/sal_acid = 10 ,/datum/reagent/medicine/omnizine = 10 ,/datum/reagent/medicine/leporazine = 10)
/obj/item/reagent_containers/hypospray/medipen/atropine
name = "atropine autoinjector"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB