Skip to content
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

Jump to bottom

Vault Change #775

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Vault Change #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cc15cd
Vault
NPC1314 Sep 22, 2024
ce895d0
Merge remote-tracking branch 'upstream/main' into vault
NPC1314 Sep 26, 2024
788e35c
Merge remote-tracking branch 'upstream/main' into vault
NPC1314 Sep 29, 2024
e743618
Merge branch 'main' into vault
NPC1314 Sep 29, 2024
c3983d9
Merge branch 'main' into vault
NPC1314 Sep 29, 2024
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
5 changes: 5 additions & 0 deletions code/__HELPERS/unsorted.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,3 +1616,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
return input
else
return 1

// -------- ECONOMY RELATED GLOBAL LISTS
GLOBAL_LIST_INIT(ITEM_DOES_NOT_GENERATE_VAULT_RENT, typecacheof(list(
/obj/item/roguecoin
)))
6 changes: 4 additions & 2 deletions code/controllers/subsystem/rogue/treasury.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,10 @@ SUBSYSTEM_DEF(treasury)
*/
if(!I.submitted_to_stockpile)
I.submitted_to_stockpile = TRUE
//Passive income is 25% of the items worth.
passive_income += (I.get_real_price()*0.25)
//Passive income is 10% of the items worth.
if(is_type_in_typecache(I, GLOB.ITEM_DOES_NOT_GENERATE_VAULT_RENT) )
passive_income += (I.get_real_price()*0) // coin gives no interest, need to have rare items or refined products
else passive_income += (I.get_real_price()*0.1)
return passive_income

/*
Expand Down
Loading