From b37a023823e608a228dbf078678d02922dc8c8da Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 2 Jun 2023 04:50:34 +1000 Subject: [PATCH] Merge pull request #14912 from Youtubeboy139/Thaler-Change It's all bout that Money Money Money --- code/__defines/plants.dm | 2 +- code/game/objects/random/misc.dm | 1 + code/game/objects/structures/loot_piles.dm | 1 + code/modules/economy/cash.dm | 18 ++++++++++++------ code/modules/fishing/fishing.dm | 3 ++- icons/obj/economy.dmi | Bin 0 -> 2207 bytes 6 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 icons/obj/economy.dmi diff --git a/code/__defines/plants.dm b/code/__defines/plants.dm index 928315df3f..bca340f2d3 100644 --- a/code/__defines/plants.dm +++ b/code/__defines/plants.dm @@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(plant_item_products, list( /obj/item/organ/internal/brain/grey = 1, /obj/item/organ/internal/heart/grey = 1, /obj/item/weapon/spacecash/c1 = 3, - /obj/item/weapon/spacecash/c10 = 1 + /obj/item/weapon/spacecash/c5 = 1 )) GLOBAL_LIST_INIT(forbidden_plant_growth_sprites, list( diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index ce2f20fedd..ffc5111d72 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -276,6 +276,7 @@ /obj/random/cash/item_to_spawn() return pick(prob(320);/obj/random/maintenance/clean, prob(12);/obj/item/weapon/spacecash/c1, + prob(10);/obj/item/weapon/spacecash/c5, prob(8);/obj/item/weapon/spacecash/c10, prob(4);/obj/item/weapon/spacecash/c20, prob(1);/obj/item/weapon/spacecash/c50, diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index 87b91e8469..0100167a05 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -190,6 +190,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/clothing/under/harness, /obj/item/clothing/accessory/storage/webbing, /obj/item/weapon/spacecash/c1, + /obj/item/weapon/spacecash/c5, /obj/item/weapon/spacecash/c10, /obj/item/weapon/spacecash/c20, /obj/item/weapon/camera_assembly, diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index e5a539f5e8..7b2d31a391 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -3,7 +3,7 @@ var/initial_name = "Thaler" desc = "It's worth 0 Thalers." gender = PLURAL - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/economy.dmi' icon_state = "spacecash1" opacity = 0 density = FALSE @@ -38,24 +38,24 @@ /obj/item/weapon/spacecash/update_icon() cut_overlays() name = "[worth] [initial_name]\s" - if(worth in list(1000,500,200,100,50,20,10,1)) + if(worth in list(1000,500,200,100,50,20,10,5,1)) icon_state = "spacecash[worth]" desc = "It's worth [worth] [initial_name]s." return var/sum = src.worth var/num = 0 - for(var/i in list(1000,500,200,100,50,20,10,1)) + for(var/i in list(1000,500,200,100,50,20,10,5,1)) while(sum >= i && num < 50) sum -= i num++ - var/image/banknote = image('icons/obj/items.dmi', "spacecash[i]") + var/image/banknote = image('icons/obj/economy.dmi', "spacecash[i]") var/matrix/M = matrix() M.Translate(rand(-6, 6), rand(-4, 8)) M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) banknote.transform = M add_overlay(banknote) if(num == 0) // Less than one thaler, let's just make it look like 1 for ease - var/image/banknote = image('icons/obj/items.dmi', "spacecash1") + var/image/banknote = image('icons/obj/economy.dmi', "spacecash1") var/matrix/M = matrix() M.Translate(rand(-6, 6), rand(-4, 8)) M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) @@ -96,9 +96,15 @@ /obj/item/weapon/spacecash/c1 name = "1 Thaler" icon_state = "spacecash1" - desc = "It's worth 1 credit." + desc = "It's worth 1 Thaler." worth = 1 +/obj/item/weapon/spacecash/c5 + name = "5 Thaler" + icon_state = "spacecash5" + desc = "It's worth 5 Thalers." + worth = 5 + /obj/item/weapon/spacecash/c10 name = "10 Thaler" icon_state = "spacecash10" diff --git a/code/modules/fishing/fishing.dm b/code/modules/fishing/fishing.dm index 802faf2d6b..4b77912ef8 100644 --- a/code/modules/fishing/fishing.dm +++ b/code/modules/fishing/fishing.dm @@ -35,7 +35,8 @@ GLOBAL_LIST_INIT(generic_fishing_pool_list, list( /obj/random/junk = 80, /obj/random/trash = 80, /obj/item/weapon/spacecash/c1 = 10, - /obj/item/weapon/spacecash/c10 = 5, + /obj/item/weapon/spacecash/c5 = 3, + /obj/item/weapon/spacecash/c10 = 2, /obj/item/weapon/spacecash/c100 = 1 )) diff --git a/icons/obj/economy.dmi b/icons/obj/economy.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8dcbd42c500a20b2fb6821c05ffaeba9762cdb4d GIT binary patch literal 2207 zcmaKuc|6qn8pnTQWNU0?n+a#glBH~8OEQ+L>=Z-da4chtJ;uJ4NEs<%49RlRiDn{7 zqL9ck)&^N7dnOEeIm4|P=1#AB?(L8JI`@y~d0yY=`TX(x@qT^2PmZ(WIbk7~5C8ze zHs`G_aBDg@d_| z<0hqSttr1Uen>&3Xx4h3lNP~H4gmPOY^=;(F^tWXyV2d8${n( z+ad5rW&jvFTgUdM0xJ0YbF5!j6{dRPk+p+(7**xEtL0KVywtNvU0pFBbLiqVKYJUU zF&OqFTJm~S#^bSU+SIAm=q<_+#3E^U>&s?&#Of!?x1swbw3fzewRLsoHwNYp&D>r*H&$$UQ{z3c+Ho^h z{jip(?iiTQ(zwCRt@<5^7egJv3G|vIjm*4pDY+KhC|V8oR~|EnNt(H7 zodZUi_t=`2P6qT(oR44)4|vPyX+VTcOkDMCWs&JUCk}GXd=xWUQ767Ciyb)fbpAoF zDod$GrE;`J%cr^@WN>EIEjBQpw7+AE=2N8AF3|32qkJh4A?SR?ZZjKn*VN12>JQ>6B_Eb ziwTJ5M|IMs2t+i&L@@W)`gCZ4B5mL7GbWOp(VF4_ewX{(7T{g)&5_xO%L*rZH(|t^ zId4U!f6&;&KD8O^_~2|!_jG&tY3(KDoj!figH;b}bh~ zff1Q*vpXglMY{S!_Xjk&@N8L~?IQ1IRApIkdmhaySe zFL~B&JG}5@Ha4Nej1!ggq&{CNgIyY&Ab8h>Hs7AymfvI+?)8JDL^P~r&~;BiL7@ggqtRxEu`u|VGhWfa8T zfL_8Hsq69Iv*htEf4bK9sjpT(N~cIbO@Bc~(kGFB>vmiK#Sh5yR4VmA-lE+?@4q(q zlgz&ya#PxT=7ZD~_f@iYv7j1RHoJLeOX#3#&Ay$pCsvvF*)XG|U{%|{e{G)9x22=6 z8sUR5&|NI7Sg)He8`Jo-d-A5g6KO(kZ?&~?+( z6eAvMzH>nsKXkWO{#0C_8EpQ==kV>T>)|J}a!apP9<5Qt#v`UvNnNv&>q))5YrOhk z4>wxpb{D^a(nE>kQ3Kd}ly&RfZ_WU6iL9s;9%Uv|74WO!-3vFP8dapX9+ZJ5X`V4n zhR(+vV&(=QY9#ZL@(|tNi%kN&&MDg zTw!2ynqN<%2rXkHU#x%B!(p*#{8IpUTVCp3mw9pHA)}&&oL7@QGaq~&LDMs8K&O{i zDIc}1La^U?R+0gFiU(%aEz{6!Fl#+LOv`i-2t^2sL63CiGU+2RZQ9K-Z39z_VXDbx zppN~-KApL}*+R0?97jEU2=oy`hgQ^m%c>mi+ap`PiIZcLPsRxLqC19wdrj`wYC!U_ z&wfc2TP*>_!~A@Yvv)vrvabc^e?G*YBpiV3x;NA=?vCtmFAl)wAC6XJ3*W2%0z*^+ AMF0Q* literal 0 HcmV?d00001