cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7463 from Novacat/nova-ert

Browse Source 
Overhauls First Aid Kits
This commit is contained in:
Novacat
2020-04-29 18:44:43 -04:00
committed by GitHub
parent b9c6107f26 1048a969d4
commit c70af70266
17 changed files with 293 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+4 -1
View File
@@ -30,7 +30,10 @@
// TODO new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500),
new /datum/data/mining_equipment("Umbrella", /obj/item/weapon/melee/umbrella/random, 200),
new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500),
new /datum/data/mining_equipment("Survival Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner, 500),
new /datum/data/mining_equipment("Trauma Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma, 250),
new /datum/data/mining_equipment("Burn Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, 250),
new /datum/data/mining_equipment("Oxy Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, 250),
new /datum/data/mining_equipment("Detox Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, 250),
new /datum/data/mining_equipment("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 1200),
// new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/twohanded/required/kinetic_crusher, 750),
new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 900),
code/modules/mining/ore_redemption_machine/survey_vendor.dm
+4 -1
View File
@@ -26,7 +26,10 @@
new /datum/data/mining_equipment("Umbrella", /obj/item/weapon/melee/umbrella/random, 20),
new /datum/data/mining_equipment("Shelter Capsule", /obj/item/device/survivalcapsule, 50),
new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card/survey, 50),
new /datum/data/mining_equipment("Survival Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner, 50),
new /datum/data/mining_equipment("Trauma Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma, 25),
new /datum/data/mining_equipment("Burn Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, 25),
new /datum/data/mining_equipment("Oxy Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, 25),
new /datum/data/mining_equipment("Detox Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, 25),
new /datum/data/mining_equipment("Injector (L) - Glucose", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose,50),
new /datum/data/mining_equipment("Injector (L) - Panacea", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity,50),
new /datum/data/mining_equipment("Injector (L) - Trauma", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute,50),
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm
+1 -1
View File
@@ -67,7 +67,7 @@
taste_description = "sparkles"
taste_mult = 3
reagent_state = LIQUID
color = "#964e06"
color = "#750404"
overdose = REAGENTS_OVERDOSE * 0.5
scannable = 1
code/modules/reagents/reagent_containers/hypospray_vr.dm
+26 -17
View File
@@ -1,27 +1,36 @@
/obj/item/weapon/reagent_containers/hypospray/autoinjector/miner
name = "Emergency trauma injector"
desc = "A rapid injector for emergency treatment of injuries. The warning label advises that it is not a substitute for proper medical treatment."
icon_state = "autoinjector"
item_state = "autoinjector"
amount_per_transfer_from_this = 10
volume = 10
/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn
name = "autoinjector (burn)"
icon_state = "purple"
filled_reagents = list("dermaline" = 3.5, "leporazine" = 1.5)
/obj/item/weapon/reagent_containers/hypospray/autoinjector/miner/Initialize()
..()
reagents.add_reagent("bicaridine", 5)
reagents.add_reagent("tricordrazine", 3)
reagents.add_reagent("tramadol", 2)
update_icon()
/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma
name = "autoinjector (trauma)"
icon_state = "black"
filled_reagents = list("bicaridine" = 4, "tramadol" = 1)
/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy
name = "autoinjector (oxy)"
icon_state = "blue"
filled_reagents = list("dexalinp" = 5)
/obj/item/weapon/reagent_containers/hypospray/autoinjector/rad
name = "autoinjector (rad)"
icon_state = "black"
filled_reagents = list("hyronalin" = 5)
/obj/item/weapon/storage/box/traumainjectors
name = "box of emergency trauma injectors"
desc = "Contains emergency trauma autoinjectors."
name = "box of emergency injectors"
desc = "Contains emergency autoinjectors."
icon_state = "syringe"
max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14
/obj/item/weapon/storage/box/traumainjectors/Initialize()
..()
for (var/i = 1 to 7)
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner(src)
for (var/i = 1 to 4)
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma(src)
for (var/i = 1 to 2)
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox(src)
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn(src)
/obj/item/weapon/reagent_containers/hypospray
var/prototype = 0
code/modules/reagents/reagent_containers/pill.dm
+11 -11
View File
@@ -96,13 +96,13 @@
//Pills
/obj/item/weapon/reagent_containers/pill/antitox
name = "Dylovene (25u)"
name = "Dylovene (30u)" //VOREStation Edit
desc = "Neutralizes many common toxins."
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/antitox/Initialize()
. = ..()
reagents.add_reagent("anti_toxin", 25)
reagents.add_reagent("anti_toxin", 30) //VOREStation Edit
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/tox
@@ -146,13 +146,13 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/kelotane
name = "Kelotane (15u)"
name = "Kelotane (20u)" //VOREStation Edit
desc = "Used to treat burns."
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/kelotane/Initialize()
. = ..()
reagents.add_reagent("kelotane", 15)
reagents.add_reagent("kelotane", 20) //VOREStation Edit
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/paracetamol
@@ -196,13 +196,13 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/dexalin
name = "Dexalin (15u)"
name = "Dexalin (7.5u)" //VOREstation Edit
desc = "Used to treat oxygen deprivation."
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/dexalin/Initialize()
. = ..()
reagents.add_reagent("dexalin", 15)
reagents.add_reagent("dexalin", 7.5) //VOREStation Edit
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/dexalin_plus
@@ -256,7 +256,7 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/spaceacillin
name = "Spaceacillin (10u)"
name = "Spaceacillin (15u)" //VOREStation Edit
desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space."
icon_state = "pill3"
@@ -266,23 +266,23 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/carbon
name = "Carbon (15u)"
name = "Carbon (30u)" //VOREStation Edit
desc = "Used to neutralise chemicals in the stomach."
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/carbon/Initialize()
. = ..()
reagents.add_reagent("carbon", 15)
reagents.add_reagent("carbon", 30) //VOREStation Edit
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/iron
name = "Iron (15u)"
name = "Iron (30u)" //VOREStation Edit
desc = "Used to aid in blood regeneration after bleeding."
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/iron/Initialize()
. = ..()
reagents.add_reagent("iron", 15)
reagents.add_reagent("iron", 30) //VOREStation Edit
color = reagents.get_color()
//Not-quite-medicine
code/modules/reagents/reagent_containers/pill_vr.dm
+29 -17
View File
@@ -1,5 +1,5 @@
/obj/item/weapon/reagent_containers/pill/nutriment
name = "Nutriment pill"
name = "Nutriment (30u)"
desc = "Used to feed people on the field. Contains 30 units of Nutriment."
icon_state = "pill10"
@@ -8,7 +8,7 @@
reagents.add_reagent("nutriment", 30)
/obj/item/weapon/reagent_containers/pill/protein
name = "Meat pill"
name = "Protein (30u)"
desc = "Used to feed carnivores on the field. Contains 30 units of Protein."
icon_state = "pill24"
@@ -17,7 +17,7 @@
reagents.add_reagent("protein", 30)
/obj/item/weapon/reagent_containers/pill/rezadone
name = "Rezadone pill"
name = "Rezadone (5u)"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
icon_state = "pill2"
@@ -27,7 +27,7 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/peridaxon
name = "Peridaxon pill"
name = "Peridaxon (10u)"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
icon_state = "pill10"
@@ -36,17 +36,17 @@
reagents.add_reagent("peridaxon", 10)
/obj/item/weapon/reagent_containers/pill/carthatoline
name = "Carthatoline pill"
name = "Carthatoline (15u)"
desc = "Carthatoline is strong evacuant used to treat severe poisoning."
icon_state = "pill4"
/obj/item/weapon/reagent_containers/pill/carthatoline/Initialize()
..()
reagents.add_reagent("carthatoline", 10)
reagents.add_reagent("carthatoline", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/alkysine
name = "Alkysine pill"
name = "Alkysine (10u)"
desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
icon_state = "pill3"
@@ -56,7 +56,7 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/imidazoline
name = "Imidazoline pill"
name = "Imidazoline (15u)"
desc = "Heals eye damage."
icon_state = "pill3"
@@ -66,27 +66,29 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/osteodaxon
name = "Osteodaxon pill"
name = "Osteodaxon (25u)"
desc = "An experimental drug used to heal bone fractures."
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/osteodaxon/Initialize()
..()
reagents.add_reagent("osteodaxon", 10)
reagents.add_reagent("osteodaxon", 15)
reagents.add_reagent("inaprovaline", 10)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/myelamine
name = "Myelamine pill"
name = "Myelamine (25u)"
desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/myelamine/Initialize()
..()
reagents.add_reagent("myelamine", 10)
reagents.add_reagent("myelamine", 15)
reagents.add_reagent("inaprovaline", 10)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/hyronalin
name = "Hyronalin pill"
name = "Hyronalin (15u)"
desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
icon_state = "pill4"
@@ -96,7 +98,7 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/arithrazine
name = "Arithrazine pill"
name = "Arithrazine (5u)"
desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
icon_state = "pill2"
@@ -106,7 +108,7 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/corophizine
name = "Corophizine pill"
name = "Corophizine (5u)"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
icon_state = "pill2"
@@ -115,8 +117,18 @@
reagents.add_reagent("corophizine", 5)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/vermicetol
name = "Vermicetol (15u)"
desc = "An extremely potent drug to treat physical injuries."
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/vermicetol/Initialize()
..()
reagents.add_reagent("vermicetol", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/healing_nanites
name = "Healing nanites capsule"
name = "Healing nanites (30u)"
desc = "Miniature medical robots that swiftly restore bodily damage."
icon_state = "pill1"
@@ -126,7 +138,7 @@
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/sleevingcure
name = "Kitsuhanan Cure pill"
name = "Kitsuhanan Cure (1u)"
desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
icon_state = "pill3"