Skip to content

Fixed "Converting Metal Sheets into Plasteel Sheets. Issue #12416" #12453

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
LatoDiafol wants to merge 3 commits into
base: master
Choose a base branch
from
+6 −1
Open

Fixed "Converting Metal Sheets into Plasteel Sheets. Issue #12416" #12453

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
648dee3
fixed Converting Metal Sheets into Plasteel Sheets. #12416
Jun 15, 2026
d332bb6
Merge branch 'master' into barricade_upgrade_fix
LatoDiafol Jun 16, 2026
9357c92
Merge branch 'master' into barricade_upgrade_fix
LatoDiafol Jun 18, 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
7 changes: 6 additions & 1 deletion code/game/objects/structures/barricade/barricade.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,12 @@
var/stack_amt
stack_amt = floor(stack_amount * (health/starting_maxhealth)) //Get an amount of sheets back equivalent to remaining health. Obviously, fully destroyed means 0
if(upgraded)
stack_amt += floor(2 * (health/starting_maxhealth))
if(stack_type == /obj/item/stack/sheet/metal)
stack_amt += floor(2 * (health/starting_maxhealth))
else
var/upgrade_metal = floor(2 * (health/starting_maxhealth))
if (upgrade_metal)
new /obj/item/stack/sheet/metal(loc, upgrade_metal)
if(stack_amt)
new stack_type(loc, stack_amt)
else
Expand Down