Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cheers? No! MEEEEEDIC!!!! #283

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 4 additions & 23 deletions modular_doppler/deforest_medical_items/code/cargo_packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,15 @@
/obj/item/storage/medkit/combat_surgeon/stocked = 3,
)

/datum/supply_pack/medical/kit_technician
name = "Heavy Duty Medical Kit Crate - Technician"
crate_name = "technician kit crate"
desc = "Contains a pink medical technician kit."
access = ACCESS_MEDICAL
cost = CARGO_CRATE_VALUE * 5.5
contains = list(
/obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked,
)

/datum/supply_pack/medical/kit_surgical
name = "Heavy Duty Medical Kit Crate - Surgical"
crate_name = "surgical kit crate"
desc = "Contains a grey first responder surgical kit."
access = ACCESS_MEDICAL
cost = CARGO_CRATE_VALUE * 5
contains = list(
/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked,
)

/datum/supply_pack/medical/kit_medical
name = "Heavy Duty Medical Kit Crate - Medical"
name = "Heavy Duty Medical Kit Crate"
crate_name = "medical kit crate"
desc = "Contains an orange satchel medical kit."
desc = "Contains two heavy-duty medical kits for emergencies."
access = ACCESS_MEDICAL
cost = CARGO_CRATE_VALUE * 4.5
cost = CARGO_CRATE_VALUE * 11
contains = list(
/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked,
/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked,
)

/datum/supply_pack/medical/deforest_vendor_refill
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
// Twitch, because having sandevistans be implants is for losers, just inject it!
/obj/item/reagent_containers/hypospray/medipen/deforest/twitch
name = "TWitch sensory stimulant injector"
desc = "A Deforest branded autoinjector, loaded with 'TWitch' among other reagents. This drug is known to make \
those who take it 'see faster', whatever that means."
base_icon_state = "twitch"
icon_state = "twitch"
list_reagents = list(
/datum/reagent/drug/twitch = 10,
/datum/reagent/drug/maint/tar = 5,
/datum/reagent/medicine/silibinin = 5,
/datum/reagent/toxin/leadacetate = 5,
)
custom_price = PAYCHECK_COMMAND * 3.5

// Demoneye, for when you feel the need to become "fucking invincible"
/obj/item/reagent_containers/hypospray/medipen/deforest/demoneye
name = "DemonEye steroid injector"
Expand Down Expand Up @@ -54,10 +39,11 @@
/datum/reagent/medicine/c2/penthrite = 5,
/datum/reagent/medicine/polypyr = 5,
/datum/reagent/medicine/silibinin = 5,
/datum/reagent/medicine/omnizine = 5,
/datum/reagent/medicine/omnizine = 10,
/datum/reagent/inverse/healing/tirimol = 5,
)
custom_price = PAYCHECK_COMMAND * 2.5
volume = 30

// Combat stimulant that makes you immune to slowdowns for a bit
/obj/item/reagent_containers/hypospray/medipen/deforest/synalvipitol
Expand Down
16 changes: 8 additions & 8 deletions modular_doppler/deforest_medical_items/code/injectors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
/datum/reagent/medicine/synaptizine = 5,
/datum/reagent/medicine/inaprovaline = 5,
/datum/reagent/determination = 10,
/datum/reagent/toxin/histamine = 5,
/datum/reagent/toxin/lipolicide = 5,
)

// Morpital, heals a small amount of damage and kills pain for a bit
Expand All @@ -87,9 +87,9 @@
base_icon_state = "morpital"
icon_state = "morpital"
list_reagents = list(
/datum/reagent/medicine/morphine = 5,
/datum/reagent/medicine/omnizine/protozine = 15,
/datum/reagent/toxin/staminatoxin = 5,
/datum/reagent/medicine/mine_salve = 5,
/datum/reagent/medicine/omnizine = 15,
/datum/reagent/toxin/lipolicide = 5,
)

// Lipital, heals more damage than morpital but doesnt work much at higher damages
Expand All @@ -102,7 +102,7 @@
list_reagents = list(
/datum/reagent/medicine/lidocaine = 5,
/datum/reagent/medicine/omnizine = 5,
/datum/reagent/medicine/c2/probital = 10,
/datum/reagent/medicine/c2/libital = 10,
)

// Anti-poisoning injector, with a little bit of radiation healing as a treat
Expand All @@ -115,7 +115,7 @@
list_reagents = list(
/datum/reagent/medicine/c2/multiver = 10,
/datum/reagent/medicine/potass_iodide = 10,
/datum/reagent/nitrous_oxide = 5,
/datum/reagent/toxin/lipolicide = 5,
)

// Epinephrine and helps a little bit against stuns and stamina damage
Expand All @@ -141,7 +141,7 @@
/datum/reagent/medicine/atropine = 10,
/datum/reagent/medicine/coagulant/fabricated = 5,
/datum/reagent/medicine/salbutamol = 5,
/datum/reagent/toxin/staminatoxin = 5,
/datum/reagent/toxin/lipolicide = 5,
)

// Coagulant, really not a whole lot more
Expand Down Expand Up @@ -180,7 +180,7 @@
/datum/reagent/medicine/mine_salve = 5,
/datum/reagent/medicine/leporazine = 5,
/datum/reagent/medicine/c2/lenturi = 10,
/datum/reagent/toxin/staminatoxin = 5,
/datum/reagent/toxin/lipolicide = 5,
)

// Stabilizes a lot of stats like drowsiness, sanity, dizziness, so on
Expand Down
55 changes: 0 additions & 55 deletions modular_doppler/deforest_medical_items/code/medstation.dm

This file was deleted.

This file was deleted.

Loading
Loading