Skip to content

Updating dev from stable #5305

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
MistakeNot4892 merged 6 commits into from
Feb 18, 2026
Merged

Updating dev from stable #5305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2f41f9
Fix reagent holders being cleared when approximately 0 units are tran…
out-of-phaze Feb 13, 2026
a51c216
Merge pull request #5298 from out-of-phaze/stable-fix/clear-transfer
out-of-phaze Feb 14, 2026
ccbc020
shotgun icon fix
Feb 16, 2026
973ac96
skin color is preserved by rejuv
l3lb0t Feb 16, 2026
0b2567e
Merge pull request #5303 from l3lb0t/shotgun-stable
MistakeNot4892 Feb 17, 2026
0902a46
Merge pull request #5304 from l3lb0t/skin-stable
MistakeNot4892 Feb 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
2 changes: 2 additions & 0 deletions code/modules/organs/external/_external.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@

/obj/item/organ/external/copy_from_mob_snapshot(datum/mob_snapshot/supplied_appearance)
_icon_cache_key = null
skin_colour = supplied_appearance.skin_color //match skin colors
skin_tone = supplied_appearance.skin_tone
if(organ_tag in supplied_appearance?.sprite_accessories)
var/list/sprite_cats = supplied_appearance.sprite_accessories[organ_tag]
for(var/category in sprite_cats)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/projectiles/guns/projectile/shotgun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
else
icon_state = "[get_world_inventory_state()]-empty"

/obj/item/gun/projectile/shotgun/pump/update_base_icon_state()
if(chambered)
icon_state = get_world_inventory_state()
else
icon_state = "[get_world_inventory_state()]-empty"

/obj/item/gun/projectile/shotgun/pump/consume_next_projectile()
if(chambered)
return chambered.BB
Expand Down
9 changes: 7 additions & 2 deletions code/modules/reagents/Chemistry-Holder.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,8 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new
/// Removes up to [amount] of reagents from [src]. Returns actual amount removed.
/datum/reagents/proc/remove_any(var/amount = 1, var/defer_update = FALSE, var/removed_phases = (MAT_PHASE_LIQUID | MAT_PHASE_SOLID), skip_reagents = null)

amount = CHEMS_QUANTIZE(amount)

if(amount <= 0)
return 0

Expand Down Expand Up @@ -518,8 +520,11 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new
else
return 0

var/removing = clamp(CHEMS_QUANTIZE(amount), 0, total_volume) // not ideal but something is making total_volume become NaN
if(!removing || total_volume <= 0)
var/removing = clamp(amount, 0, total_volume) // not ideal but something is making total_volume become NaN
if(!removing)
return 0 // don't clear, we aren't removing any

if(total_volume <= removing) // we're removing everything
. = 0
clear_reagents()
return
Expand Down
Loading