Skip to content

"Post" debt fixes #940

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

Merged
MrMelbert merged 3 commits into from
Aug 23, 2026
Merged

"Post" debt fixes #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ef4cc0
Post debt fixes
MrMelbert Aug 17, 2026
b18e910
Merge branch 'master' into postdebtfix
MrMelbert Aug 17, 2026
4c45da5
Thermoreg fix
MrMelbert Aug 17, 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
8 changes: 8 additions & 0 deletions code/modules/clothing/suits/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
species_exception = list(/datum/species/golem)
armor_type = /datum/armor/suit_apron

/obj/item/clothing/suit/apron/generate_digitigrade_icons(icon/base_icon, greyscale_colors)
var/icon/legs = icon(SSgreyscale.GetColoredIconByType(/datum/greyscale_config/digitigrade, greyscale_colors), "apron_worn")
return replace_icon_legs(base_icon, legs)

/datum/armor/suit_apron
bio = 50

Expand Down Expand Up @@ -436,6 +440,10 @@
/obj/item/extinguisher,
)

/obj/item/clothing/suit/atmos_overalls/generate_digitigrade_icons(icon/base_icon, greyscale_colors)
var/icon/legs = icon(SSgreyscale.GetColoredIconByType(/datum/greyscale_config/digitigrade, greyscale_colors), "apron_worn")
return replace_icon_legs(base_icon, legs)

/datum/armor/atmos_overalls
fire = 100
acid = 50
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mod/modules/modules_general.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,10 +583,10 @@

/obj/item/mod/module/thermal_regulator/on_active_process(seconds_per_tick)
var/mob/living/user = mod.wearer
if(user.body_temperature < temperature_setting)
user.adjust_body_temperature(min(-1 KELVIN, (temperature_setting - user.body_temperature) * 0.08) * seconds_per_tick, max_temp = temperature_setting)
else if(user.body_temperature > temperature_setting)
user.adjust_body_temperature(max(1 KELVIN, (temperature_setting - user.body_temperature) * 0.08) * seconds_per_tick, min_temp = temperature_setting)
if(user.body_temperature > temperature_setting)
user.adjust_body_temperature(min(-1 KELVIN, (temperature_setting - user.body_temperature) * 0.08) * seconds_per_tick, min_temp = temperature_setting)
else if(user.body_temperature < temperature_setting)
user.adjust_body_temperature(max(1 KELVIN, (user.body_temperature - temperature_setting) * 0.08) * seconds_per_tick, max_temp = temperature_setting)

///DNA Lock - Prevents people without the set DNA from activating the suit.
/obj/item/mod/module/dna_lock
Expand Down
Loading