cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix extra large stacks (#29811)

Browse Source
This commit is contained in:
DeityLink
2021-06-20 04:21:57 +02:00
committed by GitHub
parent e73fe2c1d9
commit 1e89f54b64
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
__DEFINES/setup.dm
View File

@@ -1652,6 +1652,8 @@ var/proccalls = 1
#define VIOLENCE_DEFAULT 1
#define VIOLENCE_GUN 2
#define MAX_SHEET_STACK_AMOUNT 50
// Used to determine which HUD is in use
#define HUD_NONE 0
#define HUD_MEDICAL 1

4
code/game/objects/items/stacks/sheets/sheets.dm
View File

@@ -1,10 +1,12 @@
/obj/item/stack/sheet
name = "sheet"
flags = FPRINT
w_class = W_CLASS_MEDIUM
force = 5
throwforce = 5
max_amount = 50
max_amount = MAX_SHEET_STACK_AMOUNT
throw_speed = 3
throw_range = 3
attack_verb = list("bashes", "batters", "bludgeons", "thrashes", "smashes")

7
code/modules/research/rdmachines.dm
View File

@@ -122,10 +122,15 @@ var/global/list/rnd_machines = list()
if (materials.storage[matID] == 0) // No materials of this type
continue
var/datum/material/M = materials.getMaterial(matID)
var/obj/item/stack/sheet/sheet = new M.sheettype(src.loc)
var/obj/item/stack/sheet/sheet = new M.sheettype(loc)
if(sheet)
var/available_num_sheets = round(materials.storage[matID]/sheet.perunit)
if(available_num_sheets>0)
while (available_num_sheets > MAX_SHEET_STACK_AMOUNT)
available_num_sheets -= MAX_SHEET_STACK_AMOUNT
var/obj/item/stack/sheet/bonus_sheet = new M.sheettype(loc)
bonus_sheet.amount = MAX_SHEET_STACK_AMOUNT
materials.removeAmount(matID, MAX_SHEET_STACK_AMOUNT * sheet.perunit)
sheet.amount = available_num_sheets
materials.removeAmount(matID, sheet.amount * sheet.perunit)
else