cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2432 from Tastyfish/master

Browse Source 
Fixed how things get space cash worth, and richest escapee scoreboard line
This commit is contained in:
TheDZD
2015-10-31 16:12:05 -04:00
parent d09c2e4ba6 16cb55af34
commit 67f2662fb4
7 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/economy/ATM.dm
+4 -5
View File
@@ -13,8 +13,6 @@ log transactions
#define VIEW_TRANSACTION_LOGS 3
#define PRINT_DELAY 100
/obj/item/weapon/card/id/var/money = 2000
/obj/machinery/atm
name = "Nanotrasen Automatic Teller Machine"
desc = "For all your monetary needs!"
@@ -97,7 +95,8 @@ log transactions
else if(authenticated_account)
if(istype(I,/obj/item/weapon/spacecash))
//consume the money
authenticated_account.money += I:worth * I:amount
var/obj/item/weapon/spacecash/C = I
authenticated_account.money += C.get_total()
if(prob(50))
playsound(loc, 'sound/items/polaroid1.ogg', 50, 1)
else
@@ -107,13 +106,13 @@ log transactions
var/datum/transaction/T = new()
T.target_name = authenticated_account.owner_name
T.purpose = "Credit deposit"
T.amount = I:worth
T.amount = C.get_total()
T.source_terminal = machine_id
T.date = current_date_string
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
user << "<span class='info'>You insert [I] into [src].</span>"
user << "<span class='info'>You insert [C] into [src].</span>"
src.attack_hand(user)
qdel(I)
else
code/modules/economy/POS.dm
+1 -1
View File
@@ -521,7 +521,7 @@ var/const/POS_HEADER = {"<html>
flick(src,"pos-error")
return
var/obj/item/weapon/spacecash/C=A
credits_held += C.worth*C.amount
credits_held += C.get_total()
if(credits_held >= credits_needed)
visible_message("\blue The machine beeps, and begins printing a receipt","You hear a beep and the sound of paper being shredded.")
PrintReceipt()
code/modules/economy/cash.dm
-16
View File
@@ -17,50 +17,34 @@
var/worth = 0
/obj/item/weapon/spacecash/c1
name = "1 credip chip"
icon_state = "spacecash"
desc = "It's worth 1 credit."
worth = 1
/obj/item/weapon/spacecash/c10
name = "10 credit chip"
icon_state = "spacecash10"
desc = "It's worth 10 credits."
worth = 10
/obj/item/weapon/spacecash/c20
name = "20 credit chip"
icon_state = "spacecash20"
desc = "It's worth 20 credits."
worth = 20
/obj/item/weapon/spacecash/c50
name = "50 credit chip"
icon_state = "spacecash50"
desc = "It's worth 50 credits."
worth = 50
/obj/item/weapon/spacecash/c100
name = "100 credit chip"
icon_state = "spacecash100"
desc = "It's worth 100 credits."
worth = 100
/obj/item/weapon/spacecash/c200
name = "200 credit chip"
icon_state = "spacecash200"
desc = "It's worth 200 credits."
worth = 200
/obj/item/weapon/spacecash/c500
name = "500 credit chip"
icon_state = "spacecash500"
desc = "It's worth 500 credits."
worth = 500
/obj/item/weapon/spacecash/c1000
name = "1000 credit chip"
icon_state = "spacecash1000"
desc = "It's worth 1000 credits."
worth = 1000