From 4f0a60b1df9a8406f44ecfe36352afb0ff6536b7 Mon Sep 17 00:00:00 2001 From: Katskan Date: Fri, 8 Mar 2024 19:16:50 -0500 Subject: [PATCH 1/3] Adjust Med duration multiplier --- code/modules/mob/mob_helpers.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index ce9e16e3747e..4d64307ad631 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -482,7 +482,9 @@ GLOBAL_LIST_INIT(limb_types_by_name, list( // Medical if(SKILL_MEDICAL) if(skillcheck(src, SKILL_MEDICAL, SKILL_MEDICAL_MASTER)) - return DURATION_MULTIPLIER_TIER_3 + return DURATION_MULTIPLIER_TIER_2 + if(skillcheck(src, SKILL_MEDICAL, SKILL_MEDICAL_DOCTOR)) + return DURATION_MULTIPLIER_TIER_1 // Surgeon if(SKILL_SURGERY) if(skillcheck(src, SKILL_SURGERY, SKILL_SURGERY_EXPERT)) From 90510882d2839aa3d1dd04f6e70babe01379c104 Mon Sep 17 00:00:00 2001 From: Katskan Date: Mon, 11 Mar 2024 21:53:21 -0400 Subject: [PATCH 2/3] multiplier_tier_3 --- code/modules/mob/mob_helpers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 4d64307ad631..08c03719c41b 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -482,7 +482,7 @@ GLOBAL_LIST_INIT(limb_types_by_name, list( // Medical if(SKILL_MEDICAL) if(skillcheck(src, SKILL_MEDICAL, SKILL_MEDICAL_MASTER)) - return DURATION_MULTIPLIER_TIER_2 + return 0.65 if(skillcheck(src, SKILL_MEDICAL, SKILL_MEDICAL_DOCTOR)) return DURATION_MULTIPLIER_TIER_1 // Surgeon From dfc92c65806341227e73fd2d946287bb719f2b37 Mon Sep 17 00:00:00 2001 From: Katskan Date: Wed, 13 Mar 2024 16:32:11 -0400 Subject: [PATCH 3/3] adjusts how med affects some skills --- code/game/objects/items/devices/defibrillator.dm | 2 +- code/modules/mob/mob_helpers.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/defibrillator.dm b/code/game/objects/items/devices/defibrillator.dm index 9da76b9d21b9..2544bbed2631 100644 --- a/code/game/objects/items/devices/defibrillator.dm +++ b/code/game/objects/items/devices/defibrillator.dm @@ -175,7 +175,7 @@ playsound(get_turf(src),'sound/items/defib_charge.ogg', 25, 0) //Do NOT vary this tune, it needs to be precisely 7 seconds //Taking square root not to make defibs too fast... - if(!do_after(user, 7 SECONDS * user.get_skill_duration_multiplier(SKILL_MEDICAL), INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, H, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) + if(!do_after(user, (3 * user.get_skill_duration_multiplier(SKILL_MEDICAL) + 4) SECONDS, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, H, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) user.visible_message(SPAN_WARNING("[user] stops setting up the paddles on [H]'s chest."), \ SPAN_WARNING("You stop setting up the paddles on [H]'s chest.")) return diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 08c03719c41b..fc69f7012a58 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -482,7 +482,7 @@ GLOBAL_LIST_INIT(limb_types_by_name, list( // Medical if(SKILL_MEDICAL) if(skillcheck(src, SKILL_MEDICAL, SKILL_MEDICAL_MASTER)) - return 0.65 + return 0.35 if(skillcheck(src, SKILL_MEDICAL, SKILL_MEDICAL_DOCTOR)) return DURATION_MULTIPLIER_TIER_1 // Surgeon