cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6906 from Fox-McCloud/merge-oddities

Browse Source 
Fixes Stack Merge Oddities
This commit is contained in:
Crazy Lemon
2017-03-26 23:27:58 -07:00
committed by GitHub
parent 4fed9db912 9ed89ef7cd
commit 09f7b52f3b
6 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cash.dm
+1
View File
@@ -12,6 +12,7 @@
burn_state = FLAMMABLE
singular_name = "credit"
max_amount = 1000000
merge_type = /obj/item/stack/spacecash
/obj/item/stack/spacecash/New(loc, amt = null)
..()