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

un-vomits medical tools #263

Merged
merged 4 commits into from
Dec 3, 2024
Merged

un-vomits medical tools #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc9150e
un-vomits medical tools
Paxilmaniac Dec 1, 2024
1ba15bf
say goodnight
Paxilmaniac Dec 2, 2024
4333169
missing design id
Paxilmaniac Dec 2, 2024
c7c6918
bug (actual)
Paxilmaniac Dec 3, 2024
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
Binary file modified code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
105 changes: 7 additions & 98 deletions modular_doppler/modular_items/bettermed_overrides.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,111 +1,26 @@
/// == TOOL UPDATE ZONE ==
/obj/item/scalpel
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'

/obj/item/cautery
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'

/obj/item/retractor
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'

/obj/item/hemostat
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'

/obj/item/bonesetter
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'

/obj/item/blood_filter
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'

/obj/item/circular_saw
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'

/obj/item/surgicaldrill
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'

/obj/item/scalpel/advanced
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'
light_color = "#AAFF00"
light_range = 2
lefthand_file = 'modular_doppler/modular_items/icons/bettermed_lh.dmi'
righthand_file = 'modular_doppler/modular_items/icons/bettermed_rh.dmi'

/obj/item/scalpel/advanced/on_transform(obj/item/source, mob/user, active)
. = ..()
if(active)
set_light_range(2)
set_light_color("#FFAA00")
else
set_light_range(2)
set_light_color("#AAFF00")

/obj/item/retractor/advanced
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'
lefthand_file = 'modular_doppler/modular_items/icons/bettermed_lh.dmi'
righthand_file = 'modular_doppler/modular_items/icons/bettermed_rh.dmi'

/obj/item/cautery/advanced
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'
lefthand_file = 'modular_doppler/modular_items/icons/bettermed_lh.dmi'
righthand_file = 'modular_doppler/modular_items/icons/bettermed_rh.dmi'
light_color = "#AAFF00"

/obj/item/cautery/advanced/on_transform(obj/item/source, mob/user, active)
. = ..()
if(active)
set_light_color("#FFAA00")
else
set_light_color("#AAFF00")

/obj/item/surgical_drapes
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'



/// == STORAGE UPDATE ZONE ==
/obj/item/surgery_tray
icon = 'modular_doppler/modular_items/icons/bettermed_medcart.dmi'

/obj/item/storage/medkit
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'
lefthand_file = 'modular_doppler/modular_items/icons/bettermed_lh.dmi'
righthand_file = 'modular_doppler/modular_items/icons/bettermed_rh.dmi'

/obj/item/storage/medkit/coroner
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'
// Empty medkits

/obj/item/storage/medkit/empty
empty = TRUE

/obj/item/storage/medkit/brute/empty
empty = TRUE

/obj/item/storage/medkit/fire/empty
empty = TRUE

/obj/item/storage/medkit/toxin/empty
empty = TRUE

/obj/item/storage/medkit/o2/empty
empty = TRUE

/obj/item/storage/medkit/surgery/empty
empty = TRUE
/obj/item/storage/medkit/advanced/empty
empty = TRUE

/obj/item/storage/medkit/ancient
icon = 'modular_doppler/modular_items/icons/bettermed.dmi'
lefthand_file = 'modular_doppler/modular_items/icons/bettermed_lh.dmi'
righthand_file = 'modular_doppler/modular_items/icons/bettermed_rh.dmi'
icon_state = "medkit_old"
inhand_icon_state = "oldkit"

/obj/item/storage/medkit/buffs
name = "support medkit"
desc = "An empty medkit for creative chemists to fill with concoctions."
icon_state = "medkit_buffs"
inhand_icon_state = "medkit-buffs"
damagetype_healed = HEAL_ALL_DAMAGE
/obj/item/storage/medkit/advanced/empty
empty = TRUE



/// == RECIPE ADDITION ZONE ==
/datum/design/spare_medkit
name = "Medkit"
Expand Down Expand Up @@ -142,19 +57,13 @@
id = "medkit_o2"
build_path = /obj/item/storage/medkit/o2/empty

/datum/design/spare_medkit/buffs
name = "Support Medkit"
id = "medkit_buffs"
build_path = /obj/item/storage/medkit/buffs

/datum/techweb_node/medbay_equip/New()
design_ids += list(
"medkit",
"medkit_brute",
"medkit_burn",
"medkit_toxin",
"medkit_o2",
"medkit_buffs",
)
return ..()

Expand Down
Binary file removed modular_doppler/modular_items/icons/bettermed.dmi
View file
Open in desktop
Binary file not shown.
Binary file removed modular_doppler/modular_items/icons/bettermed_lh.dmi
View file
Open in desktop
Binary file not shown.
Binary file removed modular_doppler/modular_items/icons/bettermed_medcart.dmi
View file
Open in desktop
Binary file not shown.
Binary file removed modular_doppler/modular_items/icons/bettermed_rh.dmi
View file
Open in desktop
Binary file not shown.
13 changes: 6 additions & 7 deletions modular_doppler/modular_items/shipchem_overrides.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@

/// ACTUAL AESTHETIC CHANGES BEGIN HERE
/obj/item/reagent_containers/cup/beaker
desc = "A beaker. It can hold up to 60 units."
icon = 'modular_doppler/modular_items/icons/shipchems.dmi'
fill_icon = 'modular_doppler/modular_items/icons/shipchems_reagentfillings.dmi'
fill_icon_thresholds = list(1, 40, 60, 80, 100)
//fill_icon_state = "beaker"

cap_on = TRUE
can_have_cap = TRUE
Expand All @@ -106,7 +106,6 @@
volume = 60
possible_transfer_amounts = list(5,10,15,20,30,60)
amount_per_transfer_from_this = 5
desc = "A beaker. It can hold up to 60 units."

/obj/item/reagent_containers/cup/beaker/oldstation
amount_per_transfer_from_this = 5
Expand All @@ -121,36 +120,36 @@
possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)

/obj/item/reagent_containers/cup/beaker/large
desc = "A large beaker. Can hold up to 120 units."
fill_icon_thresholds = list(1, 40, 60, 80, 100)
cap_icon_state = "beakerlarge_cap"

volume = 120
possible_transfer_amounts = list(5,10,15,20,30,40,60,120)
desc = "A large beaker. Can hold up to 120 units."

/obj/item/reagent_containers/cup/beaker/plastic
desc = "An extra-large beaker. Can hold up to 180 units."
fill_icon_thresholds = list(1, 25, 50, 75, 100)
fill_icon_state = "beakerxlarge"
cap_icon_state = "beakerwhite_cap"

volume = 180
possible_transfer_amounts = list(5,10,15,20,30,60,90,180)
desc = "An extra-large beaker. Can hold up to 180 units."

/obj/item/reagent_containers/cup/beaker/meta
desc = "An ultra-large beaker. Can hold up to 240 units."
fill_icon_thresholds = list(1, 25, 50, 75, 100)
cap_icon_state = "beakergold_cap"

volume = 240
possible_transfer_amounts = list(5,10,15,20,30,60,120,240)
desc = "An ultra-large beaker. Can hold up to 240 units."

/obj/item/reagent_containers/cup/beaker/noreact
desc = "A cryostasis beaker that allows for chemical storage without \
reactions. Can hold up to 120 units."
cap_icon_state = "beakernoreact_cap"

volume = 120
desc = "A cryostasis beaker that allows for chemical storage without \
reactions. Can hold up to 120 units."

/obj/item/reagent_containers/cup/beaker/bluespace
cap_icon_state = "beakerbluespace_cap"
Expand Down
Loading