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.

Sign up for GitHub

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

Biblically Accurate Health Analyzer #652

Draft
wants to merge 20 commits into
base: master
Choose a base branch
from
Draft

Biblically Accurate Health Analyzer #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2f19c57
It technically works
The32bitguy Nov 22, 2024
5af58b6
viable med scan
The32bitguy Nov 22, 2024
9815d1e
Test "beam" updating
The32bitguy Jan 6, 2025
b18c538
"beam" is now working consistently
The32bitguy Jan 6, 2025
076234f
Fix an error and remove unneeded proc
The32bitguy Jan 7, 2025
b082778
Add the main beeping loop to it
The32bitguy Jan 7, 2025
87c3a05
Add oxygen alarm loop loop
The32bitguy Jan 7, 2025
44dcd5c
adjustments to loop sound
The32bitguy Jan 7, 2025
db8a330
Make chat message appear only on data record(temp)
The32bitguy Jan 8, 2025
3e22789
Redo sound except oxygen alarm myself+if else fix
The32bitguy Jan 15, 2025
8e02cdf
"normal" loadouts now have bible analyzer
The32bitguy Jan 15, 2025
edb9c3c
fix to water bottle
The32bitguy Jan 15, 2025
5fc0085
Merge remote-tracking branch 'upstream/master' into healthanalyzer-ne…
The32bitguy Jan 15, 2025
8359ad0
fix merge conflict
The32bitguy Jan 15, 2025
433c635
Make scanner normal/medium size
The32bitguy Jan 15, 2025
02b35b2
vendor changes
The32bitguy Jan 16, 2025
b40d773
Finish loadout fixes
The32bitguy Jan 16, 2025
dd48189
change icon, fix beam not updating(extra MC ms!!)
The32bitguy Jan 17, 2025
74bc821
FIx to loadout
The32bitguy Jan 17, 2025
4d78a66
change skill delay for ecg
The32bitguy Jan 21, 2025
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
2 changes: 1 addition & 1 deletion code/game/machinery/bots/medbot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@

new /obj/item/device/assembly/prox_sensor(Tsec)

new /obj/item/device/healthanalyzer(Tsec)
new /obj/item/device/healthanalyzer(Tsec) //yeah

if(src.reagent_glass)
src.reagent_glass.forceMove(Tsec)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/antag/antag_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
/obj/item/bodybag/cryobag,
/obj/item/device/defibrillator,
/obj/item/storage/firstaid/adv,
/obj/item/device/healthanalyzer,
/obj/item/device/healthanalyzer/soul,
/obj/item/roller,
/obj/item/tool/surgery/surgical_line,
/obj/item/tool/surgery/synthgraft,
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
/obj/item/bodybag/cryobag,
/obj/item/device/defibrillator,
/obj/item/storage/firstaid/adv,
/obj/item/device/healthanalyzer,
/obj/item/device/healthanalyzer/soul,
/obj/item/roller,
)

Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/vending/vendor_types/crew/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list(
spawned_gear_list = list(
/obj/item/device/defibrillator,
/obj/item/storage/firstaid/adv,
/obj/item/device/healthanalyzer,
/obj/item/device/healthanalyzer/soul,
/obj/item/tool/surgery/surgical_line,
/obj/item/tool/surgery/synthgraft,
/obj/item/storage/syringe_case,
Expand All @@ -258,7 +258,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list(
spawned_gear_list = list(
/obj/item/device/defibrillator,
/obj/item/storage/firstaid/adv,
/obj/item/device/healthanalyzer,
/obj/item/device/healthanalyzer/soul,
/obj/item/tool/surgery/surgical_line,
/obj/item/tool/surgery/synthgraft,
/obj/item/clothing/accessory/stethoscope,
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/crew/senior_officers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
spawned_gear_list = list(
/obj/item/device/defibrillator,
/obj/item/storage/firstaid/adv,
/obj/item/device/healthanalyzer,
/obj/item/device/healthanalyzer/soul,
/obj/item/tool/surgery/surgical_line,
/obj/item/tool/surgery/synthgraft,
/obj/item/device/flashlight/pen,
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/crew/synthetic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR),
list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR),

list("Health Analyzer", 2, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR),
list("Health Analyzer", 2, /obj/item/device/healthanalyzer/soul, null, VENDOR_ITEM_REGULAR),
list("Surgical Line", 3, /obj/item/tool/surgery/surgical_line, null, VENDOR_ITEM_REGULAR),
list("Synth-Graft", 3, /obj/item/tool/surgery/synthgraft, null, VENDOR_ITEM_REGULAR),

Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/engineering.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,6 @@

list("MISCELLANOUS", -1, null, null),
list("Anesthetic Tank", 2, /obj/item/tank/anesthetic, VENDOR_ITEM_REGULAR),
list("Health Analyzer", 2, /obj/item/device/healthanalyzer, VENDOR_ITEM_REGULAR)
list("Health Diagnostic Equipment", 2, /obj/item/device/healthanalyzer/soul, VENDOR_ITEM_REGULAR)
)

14 changes: 6 additions & 8 deletions code/game/machinery/vending/vendor_types/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
var/list/chem_refill = list(
/obj/item/reagent_container/hypospray/autoinjector/bicaridine,
/obj/item/reagent_container/hypospray/autoinjector/dexalinp,
/obj/item/reagent_container/hypospray/autoinjector/adrenaline,,
/obj/item/reagent_container/hypospray/autoinjector/adrenaline,
/obj/item/reagent_container/hypospray/autoinjector/inaprovaline,
/obj/item/reagent_container/hypospray/autoinjector/kelotane,
/obj/item/reagent_container/hypospray/autoinjector/oxycodone,
Expand Down Expand Up @@ -511,7 +511,7 @@
list("Surgical Line", floor(scale * 2), /obj/item/tool/surgery/surgical_line, VENDOR_ITEM_REGULAR),
list("Synth-Graft", floor(scale * 2), /obj/item/tool/surgery/synthgraft, VENDOR_ITEM_REGULAR),
list("Hypospray", floor(scale * 3), /obj/item/reagent_container/hypospray/tricordrazine, VENDOR_ITEM_REGULAR),
list("Health Analyzer", floor(scale * 5), /obj/item/device/healthanalyzer, VENDOR_ITEM_REGULAR),
list("Health Diagnostic Equipment", floor(scale * 3), /obj/item/device/healthanalyzer/soul, VENDOR_ITEM_REGULAR),
list("M276 Pattern Medical Storage Rig", floor(scale * 2), /obj/item/storage/belt/medical, VENDOR_ITEM_REGULAR),
list("Medical HUD Glasses", floor(scale * 3), /obj/item/clothing/glasses/hud/health, VENDOR_ITEM_REGULAR),
list("Syringe", floor(scale * 7), /obj/item/reagent_container/syringe, VENDOR_ITEM_REGULAR)
Expand Down Expand Up @@ -710,7 +710,7 @@
list("Surgical Line", floor(scale * 2), /obj/item/tool/surgery/surgical_line, VENDOR_ITEM_REGULAR),
list("Synth-Graft", floor(scale * 2), /obj/item/tool/surgery/synthgraft, VENDOR_ITEM_REGULAR),
list("Hypospray", floor(scale * 2), /obj/item/reagent_container/hypospray/tricordrazine, VENDOR_ITEM_REGULAR),
list("Health Analyzer", floor(scale * 5), /obj/item/device/healthanalyzer, VENDOR_ITEM_REGULAR),
list("Health Diagnostic Equipment", floor(scale * 3), /obj/item/device/healthanalyzer/soul, VENDOR_ITEM_REGULAR),
list("Type 41 Pattern Medical Storage Rig", floor(scale * 2), /obj/item/storage/belt/medical/upp, VENDOR_ITEM_REGULAR),
list("Medical HUD Glasses", floor(scale * 3), /obj/item/clothing/glasses/hud/health, VENDOR_ITEM_REGULAR),
list("Syringe", floor(scale * 7), /obj/item/reagent_container/syringe, VENDOR_ITEM_REGULAR)
Expand Down Expand Up @@ -747,8 +747,7 @@
list("Pain-Stop Autoinjector", floor(scale * 5), /obj/item/reagent_container/hypospray/autoinjector/skillless/tramadol, VENDOR_ITEM_REGULAR),

list("DEVICES", -1, null, null),
list("Health Analyzer", floor(scale * 3), /obj/item/device/healthanalyzer, VENDOR_ITEM_REGULAR),

list("Health Diagnostic Equipment", floor(scale * 2), /obj/item/device/healthanalyzer/soul, VENDOR_ITEM_REGULAR),
list("FIELD SUPPLIES", -1, null, null),
list("Fire Extinguisher (portable)", 5, /obj/item/tool/extinguisher/mini, VENDOR_ITEM_REGULAR),
list("Ointment", floor(scale * 8), /obj/item/stack/medical/ointment, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -820,7 +819,7 @@
list("Medical Splints", 4, /obj/item/stack/medical/splint, VENDOR_ITEM_REGULAR),

list("UTILITY", -1, null, null),
list("HF2 Health Analyzer", 2, /obj/item/device/healthanalyzer, VENDOR_ITEM_REGULAR)
list("Rebreather", 2, /obj/item/clothing/mask/rebreather, VENDOR_ITEM_REGULAR)
)

chem_refill_volume = 250
Expand Down Expand Up @@ -860,8 +859,7 @@
list("Pain-Stop Autoinjector", 8, /obj/item/reagent_container/hypospray/autoinjector/skillless/tramadol, VENDOR_ITEM_REGULAR),

list("DEVICES", -1, null, null),
list("Health Analyzer", 8, /obj/item/device/healthanalyzer, VENDOR_ITEM_REGULAR),

list("Health Analyzer", 2, /obj/item/device/healthanalyzer/soul, VENDOR_ITEM_REGULAR),
list("FIELD SUPPLIES", -1, null, null),
list("Burn Kit", 8, /obj/item/stack/medical/advanced/ointment, VENDOR_ITEM_REGULAR),
list("Trauma Kit", 8, /obj/item/stack/medical/advanced/bruise_pack, VENDOR_ITEM_REGULAR),
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list(
list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR),
list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR),

list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR),
list("Health Analyzer", 4, /obj/item/device/healthanalyzer/soul, null, VENDOR_ITEM_REGULAR),
list("Roller Bed", 2, /obj/item/roller, null, VENDOR_ITEM_REGULAR),

list("PRIMARY AMMUNITION", 0, null, null, null),
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED),

list("MEDICAL UTILITIES", 0, null, null, null),
list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR),
list("Health Analyzer", 4, /obj/item/device/healthanalyzer/soul, null, VENDOR_ITEM_REGULAR),
list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR),
list("Pressurized Reagent Canister Pouch (EMPTY)", 3, /obj/item/storage/pouch/pressurized_reagent_canister, null, VENDOR_ITEM_REGULAR),
list("G8-A General Utility Pouch", 15, /obj/item/storage/backpack/general_belt, null, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -219,7 +219,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
spawned_gear_list = list(
/obj/item/storage/firstaid/adv,
/obj/item/storage/firstaid/adv,
/obj/item/device/healthanalyzer,
/obj/item/device/healthanalyzer/soul,
/obj/item/roller/medevac,
/obj/item/roller,
/obj/item/tool/surgery/surgical_line,
Expand Down
Loading
Loading