From 3a5d0a152fdd1b9e844a13d6e9872fff9d7e5277 Mon Sep 17 00:00:00 2001 From: McRamon <31545294+McRamon@users.noreply.github.com> Date: Tue, 7 May 2024 10:17:26 +0300 Subject: [PATCH] Succesful heist (money resprite) (#25373) * first sprite check * gooners-be-gone * code * time to see --- code/game/objects/items/weapons/cash.dm | 24 ++++++++++++------------ icons/goonstation/objects/money.dmi | Bin 1013 -> 0 bytes icons/obj/money.dmi | Bin 0 -> 776 bytes 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 icons/goonstation/objects/money.dmi create mode 100644 icons/obj/money.dmi diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index 4881050991e..ecdd65fec53 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -1,8 +1,8 @@ /obj/item/stack/spacecash name = "1 Credit" desc = "Money money money." - icon = 'icons/goonstation/objects/money.dmi' - icon_state = "cashgreen" + icon = 'icons/obj/money.dmi' + icon_state = "cash" hitsound = "swing_hit" force = 1 throwforce = 1 @@ -38,18 +38,18 @@ /obj/item/stack/spacecash/update_icon_state() name = "[amount] Credit[amount > 1 ? "s" : ""]" - if(amount >= 1 && amount < 10) - icon_state = "cashgreen" - else if(amount >= 10 && amount < 50) - icon_state = "spacecash" - else if(amount >= 50 && amount < 500) - icon_state = "cashblue" + if(amount >= 1 && amount < 50) + icon_state = "cash" + else if(amount >= 50 && amount < 100) + icon_state = "cash2" + else if(amount >= 100 && amount < 500) + icon_state = "cash3" else if(amount >= 500 && amount < 1000) - icon_state = "cashindi" - else if(amount >= 1000 && amount <= 10000) - icon_state = "cashpurp" + icon_state = "cash4" + else if(amount >= 1000 && amount < 10000) + icon_state = "cash5" else - icon_state = "cashrbow" + icon_state = "cash6" /obj/item/stack/spacecash/c5 amount = 5 diff --git a/icons/goonstation/objects/money.dmi b/icons/goonstation/objects/money.dmi deleted file mode 100644 index c4f6508f02595ff346bb3a051a8abe63184fbc4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1013 zcmV%Ae zMFRs|0s?d&AB!z3i$pJwK|ygWCnpC4#l^+5ML+fc0004WQchCV=-0C=2@(7z6XFc1dtx%U(etj73vbTJUaAn#Dc`a{MEsJ{vPh?M{l^1#1?m*0>gNfyM0AY|i6V~E`3K(PNoocaF-ee#& zv5(sx#Dmpk2 zC25xCEK3c`1rXqr@Pg-TU-FXkVs!ul6(v<&<*csNqpCM+Aka|Kv`x<1Ry~?_w}k>! zz4ezCphCMW7q9mMlykn<0!3MrC0`xh?geP2(E^%kvwpu9pp8ZgXqw&j!|OnrW|&pJSi!S@{? z+9240v}gKBss9(44)C6FcLyGHpsspWxjXQv15M8wcL$)r!puR(+!R287c&PPb5j5X z)@BYm=B5A&Y|R{W%uN9l&<2|0$reB$Im{eSwg3X!Kyy6V0tjdW&GBRlPat`nIbUo6 z1d_Lz^TifGAbFoTUu*#cl8>45#TK3bf*=TjAP9mWKTIee7_J6FuNH6~n;+cd10ogb zD-q@cgQP@`GH0KYoTMDD0}zPJ4{q{-Ok_fMAEyJAQvTKg<1|i_ybfRY0+IQ_O+Fwp zMZ%D@wd%nxqzfp0oMl)$n41D95Sbr@^MPUJc(Mf$h|Ukf`M}rA`CvH3w* zAh6$$%@4u?f&G4Leh?N2?Du2ygRnqgzaN_)garco{n-2V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DLJt?Ly3zsC9|j)$Tj5ROe;#vO@**g6d4hv z%9tosCPb++B}$bUE>+43u6{1yFaZEx{7v60{Rs;I00Ia}L_t(YiS1QAPa8oH#VL%- zOxC)j3=1eGN^{v2y}98JAXaW!BCT~)B$6>CO_GKyXlQKK9Sstci2Q;4vh4c4cF!N= z%0zzMNb}~snZ27?TU%j;5&*9@0BR5j-`k498WjnC+{DmJuvlDihCn#tvIN5S4?Rl+ z8N($639mmxu#8Zts8s(|!L#tjC{zeMqC9d5o&}Qp_~b9PIRsmA zHw)UVTUj&4l0XJd8y?{ceW%p;LhFLioHi|4*+#lsvjPLrlhD6cvMAV8@o*GhJFcb{ z+SrB6l8VQ7MQjyqwX6`@fcfx;dJ%yP=>FaS0000