cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-27 07:16:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix 98 (#4969)

Browse Source 
Co-authored-by: silicons <no@you.cat>
This commit is contained in:
silicons
2023-01-17 15:37:05 -06:00
committed by GitHub
co-authored by silicons
parent bcd10c69be
commit 6956f034e9
5 changed files with 68 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+2 -2
View File
@@ -240,6 +240,8 @@
return FALSE
if(mid_delete || other.mid_delete) // bandaid until new inventory code
return FALSE
if((strict_color_stacking || other.strict_color_stacking) && (color != other.color))
return FALSE
return other.stacktype == stacktype
/obj/item/stack/proc/use(used)
@@ -287,8 +289,6 @@
return 0
if (!can_merge(S) && !type_verified)
return 0
if ((strict_color_stacking || S.strict_color_stacking) && S.color != color)
return 0
if (isnull(tamount))
tamount = src.get_amount()