From cf13a6dd549b923afdbfbd5765c022c4bb9d464a Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 22 Feb 2026 20:05:15 -0600 Subject: [PATCH 1/7] A scrubs --- code/modules/clothing/under/jobs/medical.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index 24030717a676..9d4e2a41f3b1 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -90,6 +90,7 @@ /obj/item/clothing/under/rank/medical/scrubs name = "medical scrubs" + gender = PLURAL /obj/item/clothing/under/rank/medical/scrubs/Initialize(mapload) . = ..() From 62b10607220b04d48eb5971affe5c96b77510546 Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 22 Feb 2026 21:57:47 -0600 Subject: [PATCH 2/7] Guh --- code/modules/surgery/operations/operation_bone_repair.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/operations/operation_bone_repair.dm b/code/modules/surgery/operations/operation_bone_repair.dm index a13fa90540ba..9f17181e2779 100644 --- a/code/modules/surgery/operations/operation_bone_repair.dm +++ b/code/modules/surgery/operations/operation_bone_repair.dm @@ -101,7 +101,7 @@ return TRUE if(locate(/datum/wound/blunt/bone/rib_break) in limb.wounds) return TRUE - return TRUE + return FALSE /datum/surgery_operation/limb/repair_hairline/on_preop(obj/item/bodypart/limb, mob/living/surgeon, obj/item/tool, list/operation_args) display_results( From 9cc99a787fc33ba70f9e58ed8798310a7943efbc Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 22 Feb 2026 22:06:46 -0600 Subject: [PATCH 3/7] Fix cause of death --- code/modules/mob/living/carbon/human/death.dm | 2 +- .../code/datums/pain/pain_status_effects/anesthetic.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index e500632e7dc2..ce24b4907035 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -70,7 +70,7 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift) switch(probable_cause) // This should all be refactored later it's a bit of a mess ngl - if(null, "revival_sickess", "anesthetics", "recent_defib") + if(null, /datum/status_effect/anesthetic::id, /datum/status_effect/recent_defib::id) return "unknown causes" if(OXY_DAMAGE) diff --git a/maplestation_modules/code/datums/pain/pain_status_effects/anesthetic.dm b/maplestation_modules/code/datums/pain/pain_status_effects/anesthetic.dm index ad429101e059..b70c7282b52f 100644 --- a/maplestation_modules/code/datums/pain/pain_status_effects/anesthetic.dm +++ b/maplestation_modules/code/datums/pain/pain_status_effects/anesthetic.dm @@ -38,16 +38,16 @@ if(HAS_TRAIT(owner, TRAIT_SLEEPIMMUNE)) return FALSE RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_SLEEPIMMUNE), PROC_REF(qdel_us)) - owner.add_max_consciousness_value(type, 10) - owner.set_pain_mod(type, 0.1) + owner.add_max_consciousness_value(id, 10) + owner.set_pain_mod(id, 0.1) applied_at = world.time return TRUE /datum/status_effect/anesthetic/on_remove() UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_SLEEPIMMUNE)) if(!QDELETED(owner)) - owner.remove_max_consciousness_value(type) - owner.unset_pain_mod(type) + owner.remove_max_consciousness_value(id) + owner.unset_pain_mod(id) owner.apply_status_effect(/datum/status_effect/anesthesia_grog, applied_at) /datum/status_effect/anesthetic/get_examine_text() From a50309569d103eeed086acdd8a142d3db12a939e Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 22 Feb 2026 22:06:57 -0600 Subject: [PATCH 4/7] Random wordings --- code/datums/wounds/internal_bleeding.dm | 2 +- .../modules/mob/living/carbon/human/rad_rework/radiation.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/wounds/internal_bleeding.dm b/code/datums/wounds/internal_bleeding.dm index 206267e0fdbe..184d979743f6 100644 --- a/code/datums/wounds/internal_bleeding.dm +++ b/code/datums/wounds/internal_bleeding.dm @@ -80,7 +80,7 @@ if(SPT_PROB(1, seconds_per_tick)) var/datum/blood_type/blood_type = victim.get_blood_type() if(blood_type) - to_chat(victim, span_notice("You can taste [blood_type.reagent_type::name].")) + to_chat(victim, span_notice("You can taste [LOWERTEXT(blood_type.reagent_type::name)].")) switch(limb.body_zone) if(BODY_ZONE_HEAD) diff --git a/maplestation_modules/code/modules/mob/living/carbon/human/rad_rework/radiation.dm b/maplestation_modules/code/modules/mob/living/carbon/human/rad_rework/radiation.dm index ef23e8d57e6b..b8f0e9fcfaf6 100644 --- a/maplestation_modules/code/modules/mob/living/carbon/human/rad_rework/radiation.dm +++ b/maplestation_modules/code/modules/mob/living/carbon/human/rad_rework/radiation.dm @@ -105,7 +105,7 @@ var/mob/living/carbon/get_sick = owner get_sick.vomit(VOMIT_CATEGORY_BLOOD, lost_nutrition = 10) else if(blood_type) - to_chat(owner, span_notice("You can taste [blood_type.reagent_type::name].")) + to_chat(owner, span_notice("You can taste [LOWERTEXT(blood_type.reagent_type::name)].")) if(time_since_irradiated > 2 MINUTES && SPT_PROB(0.5, seconds_per_tick)) if(!owner.IsParalyzed()) From df4b30cc6fe0cb86f700e3275ee172bf77168dba Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 22 Feb 2026 22:13:38 -0600 Subject: [PATCH 5/7] Oops --- code/datums/wounds/internal_bleeding.dm | 2 +- .../modules/mob/living/carbon/human/rad_rework/radiation.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/wounds/internal_bleeding.dm b/code/datums/wounds/internal_bleeding.dm index 184d979743f6..db73b8daab4b 100644 --- a/code/datums/wounds/internal_bleeding.dm +++ b/code/datums/wounds/internal_bleeding.dm @@ -80,7 +80,7 @@ if(SPT_PROB(1, seconds_per_tick)) var/datum/blood_type/blood_type = victim.get_blood_type() if(blood_type) - to_chat(victim, span_notice("You can taste [LOWERTEXT(blood_type.reagent_type::name)].")) + to_chat(victim, span_notice("You can taste [LOWER_TEXT(blood_type.reagent_type::name)].")) switch(limb.body_zone) if(BODY_ZONE_HEAD) diff --git a/maplestation_modules/code/modules/mob/living/carbon/human/rad_rework/radiation.dm b/maplestation_modules/code/modules/mob/living/carbon/human/rad_rework/radiation.dm index b8f0e9fcfaf6..3e6c9a79c2f9 100644 --- a/maplestation_modules/code/modules/mob/living/carbon/human/rad_rework/radiation.dm +++ b/maplestation_modules/code/modules/mob/living/carbon/human/rad_rework/radiation.dm @@ -105,7 +105,7 @@ var/mob/living/carbon/get_sick = owner get_sick.vomit(VOMIT_CATEGORY_BLOOD, lost_nutrition = 10) else if(blood_type) - to_chat(owner, span_notice("You can taste [LOWERTEXT(blood_type.reagent_type::name)].")) + to_chat(owner, span_notice("You can taste [LOWER_TEXT(blood_type.reagent_type::name)].")) if(time_since_irradiated > 2 MINUTES && SPT_PROB(0.5, seconds_per_tick)) if(!owner.IsParalyzed()) From 1bdfa2b95a6ac4707bc4a8f56a144f0d33c2a517 Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 22 Feb 2026 22:22:04 -0600 Subject: [PATCH 6/7] Lower frostbite rate --- code/datums/wounds/burns.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index 12b0e45754ba..45b65f64533c 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -444,7 +444,7 @@ damage_multiplier_penalty = 1.1 interaction_efficiency_penalty = 0.9 threshold_penalty = 25 - infection_rate = 0.05 + infection_rate = 0.01 flesh_damage = 10 treatable_by = list(/obj/item/flashlight/pen/paramedic) @@ -467,13 +467,13 @@ return switch(severity) if(WOUND_SEVERITY_SEVERE) - infection_rate = 0.075 + infection_rate = 0.025 damage_multiplier_penalty = 1.2 interaction_efficiency_penalty = 0.6 threshold_penalty = 50 examine_desc = "is turning white" if(WOUND_SEVERITY_CRITICAL) - infection_rate = 0.1 + infection_rate = 0.05 damage_multiplier_penalty = 1.25 interaction_efficiency_penalty = 0.3 threshold_penalty = 75 From d7603ef0b9f60c6bc365385a2596537ea0282d29 Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 22 Feb 2026 23:31:08 -0600 Subject: [PATCH 7/7] plus five lasers --- code/modules/projectiles/projectile/beams.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 3545c38ded81..ff0798873057 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -3,7 +3,7 @@ name = "laser" icon_state = "laser" pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE - damage = 20 + damage = 25 damage_type = BURN hitsound = 'sound/weapons/sear.ogg' hitsound_wall = 'sound/weapons/effects/searwall.ogg'