Skip to content

Post "crew L" round tweaks #887

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

Open
MrMelbert wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Post "crew L" round tweaks #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf13a6d
A scrubs
MrMelbert Feb 23, 2026
62b1060
Guh
MrMelbert Feb 23, 2026
9cc99a7
Fix cause of death
MrMelbert Feb 23, 2026
a503095
Random wordings
MrMelbert Feb 23, 2026
df4b30c
Oops
MrMelbert Feb 23, 2026
1bdfa2b
Lower frostbite rate
MrMelbert Feb 23, 2026
d7603ef
plus five lasers
MrMelbert Feb 23, 2026
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
6 changes: 3 additions & 3 deletions code/datums/wounds/burns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/wounds/internal_bleeding.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [LOWER_TEXT(blood_type.reagent_type::name)]."))

switch(limb.body_zone)
if(BODY_ZONE_HEAD)
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/under/jobs/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/death.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/beams.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/surgery/operations/operation_bone_repair.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions maplestation_modules/code/datums/pain/pain_status_effects/anesthetic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion maplestation_modules/code/modules/mob/living/carbon/human/rad_rework/radiation.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [LOWER_TEXT(blood_type.reagent_type::name)]."))

if(time_since_irradiated > 2 MINUTES && SPT_PROB(0.5, seconds_per_tick))
if(!owner.IsParalyzed())
Expand Down
Loading