From bc9150e90e7f7be2adb9559f922ada356e8dd79a Mon Sep 17 00:00:00 2001 From: Paxilmaniac Date: Sun, 1 Dec 2024 17:43:55 -0600 Subject: [PATCH] un-vomits medical tools --- .../modular_items/bettermed_overrides.dm | 99 ++---------------- .../modular_items/icons/bettermed.dmi | Bin 10032 -> 0 bytes .../modular_items/icons/bettermed_lh.dmi | Bin 1680 -> 0 bytes .../modular_items/icons/bettermed_medcart.dmi | Bin 6005 -> 0 bytes .../modular_items/icons/bettermed_rh.dmi | Bin 1686 -> 0 bytes .../modular_items/shipchem_overrides.dm | 13 ++- 6 files changed, 13 insertions(+), 99 deletions(-) delete mode 100644 modular_doppler/modular_items/icons/bettermed.dmi delete mode 100644 modular_doppler/modular_items/icons/bettermed_lh.dmi delete mode 100644 modular_doppler/modular_items/icons/bettermed_medcart.dmi delete mode 100644 modular_doppler/modular_items/icons/bettermed_rh.dmi diff --git a/modular_doppler/modular_items/bettermed_overrides.dm b/modular_doppler/modular_items/bettermed_overrides.dm index 1c75101da278f..1234bef07c6d0 100644 --- a/modular_doppler/modular_items/bettermed_overrides.dm +++ b/modular_doppler/modular_items/bettermed_overrides.dm @@ -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" diff --git a/modular_doppler/modular_items/icons/bettermed.dmi b/modular_doppler/modular_items/icons/bettermed.dmi deleted file mode 100644 index 09d6352ee249a27c458edb7332a227be754cbdb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10032 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 O0FV}!6Dtz0F)`#d)ZHe}U z+f#FW$mTBdb>P)*r8EOu;O^j^EA`wP&m%f}ALGRKlINA@!;k*~dwANI;Ki5hGtW3u zdkhc1wlFRmF=0Fd)Y5*y$suNYOE* zs1pD{&AXoIY|yf8W!i{z-RgW7T);t`^&1Eam)2gon)0`)EI!dUWBvNFp2!a}cHsmV z#h}y)6fDrcNb+j@elSmpsB`F~cxC78B}6~T7GpwNSG8gcXNRc8YsRfs`XNY9KW}?{ zDJn9dNbl@AkC8fUTjM8Qd+i4DnJq^vg#)D|I#uTYyTW@{hro06FAH)zHb%c}Ph`^h znE`lB%S_sa#44SCihsYQB&Iuo_tU3b4ILD&JNa$Ml!k@1erpChrk$q$1b|=KFm5g& zHE*IX>_9JmRazKEpy@^Wi=+Aea6N9t6;0BLMP*Y}W|)?kJkf=)e|ks!L}P9CmxCuK zk_ax@YJ*ivct+8Ap`4>dEvb#7t!8Y|>wH;#eU<;MQ0@czTtT7H*}{mkdq9hNz7e=` zHlk~Rv#F=5u?Y8Z3jT4*Km3^gx~?%@-L`0|y{U(+o3V+I?85hhnVMQ?XMpOha@ME2 z36GZxJrO;=d2mn!F`YAPKJi6!cyNU9)ZKk`6|2a}lwYhMsnQok3pte>=YF$>G}(8B zK(o!@x745}l!Qs(6#7_a_K)czw3^fd_mSjAja|Zz%5Asy%HKkc-?F0H)g=w`}voHmS ztFW~)OnFdk~d=ZkxH1s3sPkU64 zC!$dK-t0*3!U7?u&4_fIJ4a_c3b{{272?%CZf_9v)(`a7-(WC~*3QxQ%*egJT>L?= zC&vCE%%DQh!BV{%3Wf~xM3BC(D!XDeDXkE&+V>QIS;9PrxIot4_8FeqKc?5w`s61w z@8f8+0F7p+mwm@Z`{ace6--{yS{4fcj;yJ9jT0eAuyjYWNrSqWl*S+28A78~J%7*G zzDs3ko21;hAD*!!H%3nC`TPM3ilip$!Sk}@n~Mz8=02cHO?F~m6Q zE0DRjS5v6{3I+xZAGO06EcpxN$fi=Ao=0>oLY8NwS5ZTvStBU2%W9T#?LK7Ib?)u@ zk{=VdJBzotV<2i@f3W&_;WL2({6TG*Zv zmr_&GC+QUM<0S&y{D09t!TcR%K39FJm9&JU)-3;6gB3rJ2_etcd=blo11ue%%k!H8 zno^yPni)SX=4biZ&St{@yAj3e6O?IIT9%%vqij8763ByhAIhta__(?LIkaa2JuOT+ zXJ$M!Y=hEziLAq)Yp2?wyu9J^c>#ZjPC>irY4-?u2p2 Ky0P|z(*Flu7AY$L diff --git a/modular_doppler/modular_items/icons/bettermed_medcart.dmi b/modular_doppler/modular_items/icons/bettermed_medcart.dmi deleted file mode 100644 index 6b696dfb62a6cadd29f31be1561363c452227f64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6005 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 S(^~0BpcBjy;XtwTPy7!y!!!N> diff --git a/modular_doppler/modular_items/shipchem_overrides.dm b/modular_doppler/modular_items/shipchem_overrides.dm index a2785c5d0a0d8..d2888886e51a5 100644 --- a/modular_doppler/modular_items/shipchem_overrides.dm +++ b/modular_doppler/modular_items/shipchem_overrides.dm @@ -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 @@ -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 @@ -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"