cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Overhauls First Aid Kits

Browse Source 
- Refactors First aid kits to be mostly autoinjector and pill based. No syringes, just autoinjectors and pills. Health analyzers are also removed.
Regular First Aid Kit: 3x Gauze, 2x Ointment, 1x Paracetamol pill bottle, 1x Inaprovaline pill bottle
Toxin First Aid Kit: 1x Dylovene Pill Bottle, 6x Dylovene Autoinjectors
Burn First Aid Kit: 1x Kelotane pill bottle, 6x Dermaline autoinjectors.
Oxy First Aid Kit: 5x Dexalin Plus autoinjectors, 1x Iron pill bottle, 1x Dexalin Pill Bottle
Adv First Aid Kit: Replaces Autoinjector with Assorted Pill bottle (3 Inaprov, 3 Dylovene, 2 Iron, 2 Tramadol, 3 Hyronalin, 1 Spaceacillin pills)
- Buffs default pill bottle contents. This narrows the effectiveness between autogenerated pills and pill bottles, and those brewed up by players.
- Splits Miner autoinjector into four seperate autoinjectors, one for each damage type. Reduces the price in the mining/exploration vendors.
- Tweaks Pill contents for a bit better consistency. Biggest change is that dexalin pills are 7.5u each.
- Changes Vermicetol chemical color to something more reddish.
- Overhauls Internals closet, removed O2 kits from them, adds more emergency spacesuits.
- Removes Organ Kits, Combat First Aid Kits now have a pill bottle with assorted organ repair pills.
- Surgical kits now have a regular health analyzer, and can hold health analyzers.
This commit is contained in:
Unknown
2020-04-26 13:38:28 -04:00
parent 5874df8756
commit a6deb3078d
16 changed files with 291 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/firstaid.dm
+9 -9
View File
@@ -10,26 +10,26 @@
/obj/item/weapon/storage/firstaid
name = "first aid kit"
desc = "It's an emergency medical kit for those serious boo-boos."
icon = 'icons/obj/storage_vr.dmi'
icon = 'icons/obj/storage.dmi'
icon_state = "firstaid"
throw_speed = 2
throw_range = 8
max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14
// var/list/icon_variety // VOREStation edit
var/list/icon_variety
drop_sound = 'sound/items/drop/box.ogg'
/obj/item/weapon/storage/firstaid/Initialize()
. = ..()
// if(icon_variety) // VOREStation edit
// icon_state = pick(icon_variety)
// icon_variety = null
if(icon_variety)
icon_state = pick(icon_variety)
icon_variety = null
/obj/item/weapon/storage/firstaid/fire
name = "fire first aid kit"
desc = "It's an emergency medical kit for when the toxins lab <i>spontaneously</i> burns down."
icon_state = "ointment"
item_state_slots = list(slot_r_hand_str = "firstaid-ointment", slot_l_hand_str = "firstaid-ointment")
// icon_variety = list("ointment","firefirstaid") // VOREStation edit
//icon_variety = list("ointment","firefirstaid") //VOREStation Removal
starts_with = list(
/obj/item/device/healthanalyzer,
/obj/item/weapon/reagent_containers/hypospray/autoinjector,
@@ -57,7 +57,7 @@
desc = "Used to treat when one has a high amount of toxins in their body."
icon_state = "antitoxin"
item_state_slots = list(slot_r_hand_str = "firstaid-toxin", slot_l_hand_str = "firstaid-toxin")
// icon_variety = list("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") // VOREStation edit
//icon_variety = list("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") //VOREStation Removal
starts_with = list(
/obj/item/weapon/reagent_containers/syringe/antitoxin,
/obj/item/weapon/reagent_containers/syringe/antitoxin,
@@ -135,7 +135,7 @@
/obj/item/weapon/surgical/FixOVein,
/obj/item/stack/medical/advanced/bruise_pack,
/obj/item/stack/nanopaste,
///obj/item/device/healthanalyzer/advanced, //VOREStation Removal,
/obj/item/device/healthanalyzer/advanced,
/obj/item/weapon/autopsy_scanner
)
@@ -150,7 +150,7 @@
/obj/item/weapon/surgical/bonegel,
/obj/item/weapon/surgical/FixOVein,
/obj/item/stack/medical/advanced/bruise_pack,
///obj/item/device/healthanalyzer/advanced, //VOREStation Removal,
/obj/item/device/healthanalyzer/advanced,
/obj/item/weapon/autopsy_scanner
)
code/game/objects/items/weapons/storage/firstaid_vr.dm
+191 -29
View File
@@ -1,9 +1,148 @@
/obj/item/weapon/storage/firstaid
icon = 'icons/obj/storage_vr.dmi'
/obj/item/weapon/storage/firstaid/fire
starts_with = list(
/obj/item/weapon/storage/pill_bottle/kelotane,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn
)
/obj/item/weapon/storage/firstaid/regular
starts_with = list(
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/ointment,
/obj/item/stack/medical/ointment,
/obj/item/weapon/storage/pill_bottle/inaprovaline,
/obj/item/weapon/storage/pill_bottle/paracetamol
)
/obj/item/weapon/storage/firstaid/toxin
starts_with = list(
/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox,
/obj/item/weapon/storage/pill_bottle/antitox
)
/obj/item/weapon/storage/firstaid/o2
starts_with = list(
/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,
/obj/item/weapon/storage/pill_bottle/iron,
/obj/item/weapon/storage/pill_bottle/dexalin
)
/obj/item/weapon/storage/firstaid/adv
starts_with = list(
/obj/item/weapon/storage/pill_bottle/assorted,
/obj/item/stack/medical/advanced/bruise_pack,
/obj/item/stack/medical/advanced/bruise_pack,
/obj/item/stack/medical/advanced/bruise_pack,
/obj/item/stack/medical/advanced/ointment,
/obj/item/stack/medical/advanced/ointment,
/obj/item/stack/medical/splint
)
/obj/item/weapon/storage/firstaid/combat
starts_with = list(
/obj/item/weapon/storage/pill_bottle/vermicetol,
/obj/item/weapon/storage/pill_bottle/dermaline,
/obj/item/weapon/storage/pill_bottle/dexalin_plus,
/obj/item/weapon/storage/pill_bottle/carthatoline,
/obj/item/weapon/storage/pill_bottle/tramadol,
/obj/item/weapon/storage/pill_bottle/corophizine,
/obj/item/weapon/storage/pill_bottle/combat,
/obj/item/stack/medical/splint,
/obj/item/device/healthanalyzer/advanced
)
/obj/item/weapon/storage/firstaid/surgery
can_hold = list(
/obj/item/weapon/surgical/bonesetter,
/obj/item/weapon/surgical/cautery,
/obj/item/weapon/surgical/circular_saw,
/obj/item/weapon/surgical/hemostat,
/obj/item/weapon/surgical/retractor,
/obj/item/weapon/surgical/scalpel,
/obj/item/weapon/surgical/surgicaldrill,
/obj/item/weapon/surgical/bonegel,
/obj/item/weapon/surgical/FixOVein,
/obj/item/stack/medical/advanced/bruise_pack,
/obj/item/stack/nanopaste,
/obj/item/device/healthanalyzer,
/obj/item/weapon/autopsy_scanner
)
starts_with = list(
/obj/item/weapon/surgical/bonesetter,
/obj/item/weapon/surgical/cautery,
/obj/item/weapon/surgical/circular_saw,
/obj/item/weapon/surgical/hemostat,
/obj/item/weapon/surgical/retractor,
/obj/item/weapon/surgical/scalpel,
/obj/item/weapon/surgical/surgicaldrill,
/obj/item/weapon/surgical/bonegel,
/obj/item/weapon/surgical/FixOVein,
/obj/item/stack/medical/advanced/bruise_pack,
/obj/item/device/healthanalyzer,
/obj/item/weapon/autopsy_scanner
)
/obj/item/weapon/storage/firstaid/clotting
icon_state = "clottingkit"
/obj/item/weapon/storage/firstaid/bonemed
icon_state = "pinky"
/obj/item/weapon/storage/pill_bottle/antitox
starts_with = list(/obj/item/weapon/reagent_containers/pill/antitox = 14)
/obj/item/weapon/storage/pill_bottle/bicaridine
starts_with = list(/obj/item/weapon/reagent_containers/pill/bicaridine = 14)
/obj/item/weapon/storage/pill_bottle/dexalin_plus
starts_with = list(/obj/item/weapon/reagent_containers/pill/dexalin_plus = 14)
/obj/item/weapon/storage/pill_bottle/dermaline
starts_with = list(/obj/item/weapon/reagent_containers/pill/dermaline = 14)
/obj/item/weapon/storage/pill_bottle/dylovene
starts_with = list(/obj/item/weapon/reagent_containers/pill/dylovene = 14)
/obj/item/weapon/storage/pill_bottle/inaprovaline
starts_with = list(/obj/item/weapon/reagent_containers/pill/inaprovaline = 14)
/obj/item/weapon/storage/pill_bottle/kelotane
starts_with = list(/obj/item/weapon/reagent_containers/pill/kelotane = 14)
/obj/item/weapon/storage/pill_bottle/spaceacillin
starts_with = list(/obj/item/weapon/reagent_containers/pill/spaceacillin = 14)
/obj/item/weapon/storage/pill_bottle/tramadol
starts_with = list(/obj/item/weapon/reagent_containers/pill/tramadol = 14)
/obj/item/weapon/storage/pill_bottle/citalopram
starts_with = list(/obj/item/weapon/reagent_containers/pill/citalopram = 14)
/obj/item/weapon/storage/pill_bottle/carbon
starts_with = list(/obj/item/weapon/reagent_containers/pill/carbon = 14)
/obj/item/weapon/storage/pill_bottle/iron
starts_with = list(/obj/item/weapon/reagent_containers/pill/iron = 14)
/obj/item/weapon/storage/pill_bottle/adminordrazine
name = "pill bottle (Adminordrazine)"
desc = "It's magic. We don't have to explain it."
@@ -17,67 +156,73 @@
/obj/item/weapon/storage/pill_bottle/rezadone
name = "pill bottle (Rezadone)"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
starts_with = list(/obj/item/weapon/reagent_containers/pill/rezadone = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/rezadone = 14)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/weapon/storage/pill_bottle/peridaxon
name = "pill bottle (Peridaxon)"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
starts_with = list(/obj/item/weapon/reagent_containers/pill/peridaxon = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/peridaxon = 14)
wrapper_color = COLOR_PURPLE
/obj/item/weapon/storage/pill_bottle/carthatoline
name = "pill bottle (Carthatoline)"
desc = "Carthatoline is strong evacuant used to treat severe poisoning."
starts_with = list(/obj/item/weapon/reagent_containers/pill/carthatoline = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/carthatoline = 14)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/weapon/storage/pill_bottle/alkysine
name = "pill bottle (Alkysine)"
desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
starts_with = list(/obj/item/weapon/reagent_containers/pill/alkysine = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/alkysine = 14)
wrapper_color = COLOR_YELLOW
/obj/item/weapon/storage/pill_bottle/imidazoline
name = "pill bottle (Imidazoline)"
desc = "Heals eye damage."
starts_with = list(/obj/item/weapon/reagent_containers/pill/imidazoline = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/imidazoline = 14)
wrapper_color = COLOR_PURPLE_GRAY
/obj/item/weapon/storage/pill_bottle/osteodaxon
name = "pill bottle (Osteodaxon)"
desc = "An experimental drug used to heal bone fractures."
starts_with = list(/obj/item/weapon/reagent_containers/pill/osteodaxon = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/osteodaxon = 14)
wrapper_color = COLOR_WHITE
/obj/item/weapon/storage/pill_bottle/myelamine
name = "pill bottle (Myelamine)"
desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
starts_with = list(/obj/item/weapon/reagent_containers/pill/myelamine = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/myelamine = 14)
wrapper_color = COLOR_PALE_PURPLE_GRAY
/obj/item/weapon/storage/pill_bottle/hyronalin
name = "pill bottle (Hyronalin)"
desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
starts_with = list(/obj/item/weapon/reagent_containers/pill/hyronalin = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/hyronalin = 14)
wrapper_color = COLOR_TEAL
/obj/item/weapon/storage/pill_bottle/arithrazine
name = "pill bottle (Arithrazine)"
desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
starts_with = list(/obj/item/weapon/reagent_containers/pill/arithrazine = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/arithrazine = 14)
wrapper_color = COLOR_TEAL
/obj/item/weapon/storage/pill_bottle/corophizine
name = "pill bottle (Corophizine)"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
starts_with = list(/obj/item/weapon/reagent_containers/pill/corophizine = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/corophizine = 14)
wrapper_color = COLOR_PALE_GREEN_GRAY
/obj/item/weapon/storage/pill_bottle/vermicetol
name = "pill bottle (Vermicetol)"
desc = "Contains pills used to stabilize the extremely injured."
starts_with = list(/obj/item/weapon/reagent_containers/pill/vermicetol = 14)
wrapper_color = COLOR_MAROON
/obj/item/weapon/storage/pill_bottle/healing_nanites
name = "pill bottle (Healing nanites)"
desc = "Miniature medical robots that swiftly restore bodily damage."
starts_with = list(/obj/item/weapon/reagent_containers/pill/healing_nanites = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/healing_nanites = 14)
/obj/item/weapon/storage/pill_bottle/sleevingcure
name = "pill bottle (Kitsuhanan Cure)"
@@ -87,23 +232,6 @@
/obj/item/weapon/storage/pill_bottle/sleevingcure/full
starts_with = list(/obj/item/weapon/reagent_containers/pill/sleevingcure = 14)
/obj/item/weapon/storage/firstaid/insiderepair
name = "combat organ kit"
desc = "Contains advanced organ medical treatments."
icon_state = "bezerk"
item_state_slots = list(slot_r_hand_str = "firstaid-advanced", slot_l_hand_str = "firstaid-advanced")
starts_with = list(
/obj/item/weapon/storage/pill_bottle/rezadone,
/obj/item/weapon/storage/pill_bottle/peridaxon,
/obj/item/weapon/storage/pill_bottle/carthatoline,
/obj/item/weapon/storage/pill_bottle/alkysine,
/obj/item/weapon/storage/pill_bottle/imidazoline,
/obj/item/weapon/storage/pill_bottle/osteodaxon,
/obj/item/weapon/storage/pill_bottle/myelamine,
/obj/item/weapon/storage/pill_bottle/arithrazine,
/obj/item/device/healthanalyzer/advanced
)
/obj/item/weapon/storage/mrebag/pill
name = "vacuum-sealed pill"
desc = "A small vacuum-sealed package containing a singular pill. For emergencies only."
@@ -119,5 +247,39 @@
/obj/item/weapon/storage/pill_bottle/paracetamol
name = "pill bottle (Paracetamol)"
desc = "Contains over the counter medicine to treat pain."
starts_with = list(/obj/item/weapon/reagent_containers/pill/paracetamol = 7)
starts_with = list(/obj/item/weapon/reagent_containers/pill/paracetamol = 14)
wrapper_color = COLOR_GRAY
/obj/item/weapon/storage/pill_bottle/dexalin
name = "pill bottle (Dexalin)"
desc = "Contains pills used to treat oxygen deprivation."
starts_with = list(/obj/item/weapon/reagent_containers/pill/dexalin = 14)
wrapper_color = "#3366cc"
/obj/item/weapon/storage/pill_bottle/assorted
name = "pill bottle (Assorted)"
desc = "Commonly found on paramedics, these assorted pill bottles contain basic treatments for nonstandard injuries."
starts_with = list(
/obj/item/weapon/reagent_containers/pill/inaprovaline = 3,
/obj/item/weapon/reagent_containers/pill/dylovene = 3,
/obj/item/weapon/reagent_containers/pill/iron = 2,
/obj/item/weapon/reagent_containers/pill/tramadol = 2,
/obj/item/weapon/reagent_containers/pill/hyronalin = 3,
/obj/item/weapon/reagent_containers/pill/spaceacillin
)
wrapper_color = COLOR_BLACK
/obj/item/weapon/storage/pill_bottle/combat
name = "pill bottle (Combat)"
desc = "A pill bottle filled with some of the rarest medical treatmeants to exist."
max_storage_space = ITEMSIZE_COST_TINY * 20
starts_with = list(
/obj/item/weapon/reagent_containers/pill/peridaxon = 5,
/obj/item/weapon/reagent_containers/pill/rezadone = 5,
/obj/item/weapon/reagent_containers/pill/myelamine = 3,
/obj/item/weapon/reagent_containers/pill/osteodaxon = 3,
/obj/item/weapon/reagent_containers/pill/arithrazine = 2,
/obj/item/weapon/reagent_containers/pill/alkysine = 1,
/obj/item/weapon/reagent_containers/pill/imidazoline = 1
)
wrapper_color = COLOR_BLACK
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+9 -7
View File
@@ -21,32 +21,34 @@
/obj/structure/closet/emcloset/Initialize()
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
//VOREStation Block Edit Start - Modified List
if ("small")
starts_with = list(
/obj/item/weapon/tank/emergency/oxygen = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/suit/space/emergency,
/obj/item/clothing/head/helmet/space/emergency)
/obj/item/clothing/suit/space/emergency = 2,
/obj/item/clothing/head/helmet/space/emergency = 2)
if ("aid")
starts_with = list(
/obj/item/weapon/tank/emergency/oxygen,
/obj/item/weapon/storage/toolbox/emergency,
/obj/item/clothing/mask/breath,
/obj/item/weapon/storage/firstaid/o2,
/obj/item/clothing/suit/space/emergency,
/obj/item/clothing/head/helmet/space/emergency)
if ("tank")
starts_with = list(
/obj/item/weapon/tank/emergency/oxygen/engi = 2,
/obj/item/clothing/mask/breath = 2)
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/suit/space/emergency = 2,
/obj/item/clothing/head/helmet/space/emergency = 2)
if ("both")
starts_with = list(
/obj/item/weapon/storage/toolbox/emergency,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/clothing/mask/breath,
/obj/item/weapon/storage/firstaid/o2,
/obj/item/weapon/tank/emergency/oxygen/engi = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/suit/space/emergency = 2,
/obj/item/clothing/head/helmet/space/emergency = 2)
//VOREStation Block Edit End
return ..()