cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Various medical features and adjustments. Kiosk rework. (#10321)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-06 14:01:48 -07:00
committed by GitHub
parent aff135e946
commit 11e9fd3516
15 changed files with 317 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -130,13 +130,13 @@
//Pills
/obj/item/reagent_containers/pill/antitox
name = REAGENT_ANTITOXIN + " (30u)" //VOREStation Edit
name = REAGENT_ANTITOXIN + " (30u)"
desc = "Neutralizes many common toxins."
icon_state = "pill1"
/obj/item/reagent_containers/pill/antitox/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 30) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 30)
color = reagents.get_color()
/obj/item/reagent_containers/pill/tox
@@ -180,13 +180,13 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/kelotane
name = REAGENT_KELOTANE + " (20u)" //VOREStation Edit
name = REAGENT_KELOTANE + " (20u)"
desc = "Used to treat burns."
icon_state = "pill3"
/obj/item/reagent_containers/pill/kelotane/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_KELOTANE, 20) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_KELOTANE, 20)
color = reagents.get_color()
/obj/item/reagent_containers/pill/paracetamol
@@ -230,13 +230,13 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/dexalin
name = REAGENT_DEXALIN + " (7.5u)" //VOREstation Edit
name = REAGENT_DEXALIN + " (7.5u)"
desc = "Used to treat oxygen deprivation."
icon_state = "pill1"
/obj/item/reagent_containers/pill/dexalin/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_DEXALIN, 7.5) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_DEXALIN, 7.5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/dexalin_plus
@@ -290,7 +290,7 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/spaceacillin
name = REAGENT_SPACEACILLIN + " (15u)" //VOREStation Edit
name = REAGENT_SPACEACILLIN + " (15u)"
desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space."
icon_state = "pill3"
@@ -300,23 +300,23 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/carbon
name = REAGENT_CARBON + " (30u)" //VOREStation Edit
name = REAGENT_CARBON + " (30u)"
desc = "Used to neutralise chemicals in the stomach."
icon_state = "pill3"
/obj/item/reagent_containers/pill/carbon/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_CARBON, 30) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_CARBON, 30)
color = reagents.get_color()
/obj/item/reagent_containers/pill/iron
name = REAGENT_IRON + " (30u)" //VOREStation Edit
name = REAGENT_IRON + " (30u)"
desc = "Used to aid in blood regeneration after bleeding for red-blooded crew."
icon_state = "pill1"
/obj/item/reagent_containers/pill/iron/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_IRON, 30) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_IRON, 30)
color = reagents.get_color()
/obj/item/reagent_containers/pill/copper
@@ -361,5 +361,70 @@
/obj/item/reagent_containers/pill/diet/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_LIPOZINE, 15) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_LIPOZINE, 15)
color = reagents.get_color()
// DISPENSER PILLS!
// These are smaller variants of pills that the medical kiosk gives!
/obj/item/reagent_containers/pill/small_blood_restoration
name = "blood restoration pill"
desc = "Used to aid in blood regeneration after or during bleeding for crew with commonly found blood types."
icon_state = "pill1"
/obj/item/reagent_containers/pill/small_blood_restoration/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_IRON, 5)
reagents.add_reagent(REAGENT_ID_COPPER, 5)
reagents.add_reagent(REAGENT_ID_SILVER, 5)
reagents.add_reagent(REAGENT_ID_GOLD, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/small_inaprovaline
name = REAGENT_INAPROVALINE + " (5u)"
desc = "Used to stabilize patients."
icon_state = "pill2"
/obj/item/reagent_containers/pill/small_inaprovaline/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/small_prussian_blue
name = REAGENT_PRUSSIANBLUE + " (5u)"
desc = "Used for the temporary cessation of radiation effects."
icon_state = "pill2"
/obj/item/reagent_containers/pill/small_prussian_blue/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_PRUSSIANBLUE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/small_tramadol
name = REAGENT_TRAMADOL + " (5u)"
desc = "A reelatively moderate painkiller typically given for more severe injuries."
icon_state = "pill2"
/obj/item/reagent_containers/pill/small_tramadol/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_TRAMADOL, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/small_paracetamol
name = REAGENT_PARACETAMOL + " (5u)"
desc = "A rather weak painkiller typically given for minor injuries."
icon_state = "pill3"
/obj/item/reagent_containers/pill/small_paracetamol/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/small_dylovene
name = REAGENT_ANTITOXIN + " (5u)"
desc = "A broad-spectrum anti-toxin."
icon_state = "pill1"
/obj/item/reagent_containers/pill/small_dylovene/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 5)
color = reagents.get_color()

13
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -955,7 +955,6 @@
M.apply_effect(4, AGONY, 0)
if(prob(5))
M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), span_danger("You feel like your insides are burning!"))
// holder.remove_reagent(REAGENT_ID_FROSTOIL, 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/* Drinks */
@@ -984,7 +983,7 @@
/datum/reagent/drink/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(!(M.species.allergens & allergen_type))
var/bonus = M.food_preference(allergen_type)
M.adjust_nutrition((nutrition + bonus) * removed) //RS edit
M.adjust_nutrition((nutrition + bonus) * removed)
M.dizziness = max(0, M.dizziness + adj_dizzy)
M.drowsyness = max(0, M.drowsyness + adj_drowsy)
M.AdjustSleeping(adj_sleepy)
@@ -995,10 +994,6 @@
if(issmall(M)) removed *= 2 //CHOMP Station addition Small bodymass, more effect from lower volume.
if(M.species.organic_food_coeff) //CHOMPStation addition. If this is set to 0, they don't get nutrition from food.
M.nutrition += nutriment_factor * removed //CHOMPStation addition For hunger and fatness
/* VOREStation Removal
if(alien == IS_SLIME && water_based)
M.adjustToxLoss(removed * 2)
*/ //VOREStation Removal End
/datum/reagent/drink/overdose(var/mob/living/carbon/M, var/alien) //Add special interactions here in the future if desired.
..()
@@ -1587,7 +1582,7 @@
adj_drowsy = -3
adj_sleepy = -2
adj_temp = 25
overdose = 45
overdose = REAGENTS_OVERDOSE *1.5
cup_icon_state = "cup_coffee"
cup_name = REAGENT_ID_COFFEE
@@ -2819,7 +2814,7 @@
glass_desc = "That is just way too much syrup to drink on its own."
allergen_type = ALLERGEN_SUGARS
overdose = 45
overdose = REAGENTS_OVERDOSE *1.5
/datum/reagent/drink/syrup/overdose(var/mob/living/carbon/M, var/alien)
if(alien == IS_DIONA)
@@ -3134,7 +3129,7 @@
/datum/reagent/ethanol/coffee
name = REAGENT_DEVELOPER_WARNING
id = REAGENT_ID_DEVELOPER_WARNING
overdose = 45
overdose = REAGENTS_OVERDOSE *1.5
allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Contains coffee or is made from coffee
/datum/reagent/ethanol/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)

2
code/modules/reagents/reagents/food_drinks_vr.dm
View File

@@ -729,7 +729,7 @@
glass_name = REAGENT_ID_NUKIE
glass_desc = "A drink to perk you up and refresh you!"
overdose = 30
overdose = REAGENTS_OVERDOSE
taste_description = "flavourless energy"

4
code/modules/reagents/reagents/other.dm
View File

@@ -7,7 +7,7 @@
taste_description = "powdered wax"
reagent_state = LIQUID
color = "#888888"
overdose = 5
overdose = 10
/datum/reagent/crayon_dust/red
name = REAGENT_CRAYONDUSTRED
@@ -56,7 +56,7 @@
taste_description = "extremely bitter"
reagent_state = LIQUID
color = "#888888"
overdose = 5
overdose = 10
/datum/reagent/marker_ink/black
name = REAGENT_MARKERINKBLACK