Removes all budget cards except for cargo card, gives cargo small steady income -- [ACTUALLY WORKS THIS TIME] (#47256)

Exact same as my earlier PR, but it actually works - [https://github.com//pull/47212]
Changelog

cl
del: Removed all departmental budget cards except for cargo card
tweak: Cargo now gets 500 credits per paycheck
balance: Cargo can't amass infinite money from other departments
/cl
This commit is contained in:
genessee596
2019-10-22 16:13:06 -04:00
committed by oranges
parent 7ed6cea4f6
commit 9cb5db5ba3
6 changed files with 8 additions and 36 deletions
+8
View File
@@ -59,6 +59,7 @@ SUBSYSTEM_DEF(economy)
sci_payout() // Payout based on slimes.
secmedsrv_payout() // Payout based on crew safety, health, and mood.
civ_payout() // Payout based on ??? Profit
car_payout() // Cargo's natural gain in the cash moneys.
for(var/A in bank_accounts)
var/datum/bank_account/B = A
B.payday(1)
@@ -75,6 +76,13 @@ SUBSYSTEM_DEF(economy)
if(D)
D.adjust_money(engineering_cash)
/datum/controller/subsystem/economy/proc/car_payout()
var/cargo_cash = 500
var/datum/bank_account/D = get_dep_account(ACCOUNT_CAR)
if(D)
D.adjust_money(cargo_cash)
/datum/controller/subsystem/economy/proc/secmedsrv_payout()
var/crew
var/alive_crew
-30
View File
@@ -699,37 +699,7 @@ update_label()
/obj/item/card/id/departmental_budget/update_label()
return
/obj/item/card/id/departmental_budget/civ
department_ID = ACCOUNT_CIV
department_name = ACCOUNT_CIV_NAME
icon_state = "civ_budget"
/obj/item/card/id/departmental_budget/eng
department_ID = ACCOUNT_ENG
department_name = ACCOUNT_ENG_NAME
icon_state = "eng_budget"
/obj/item/card/id/departmental_budget/sci
department_ID = ACCOUNT_SCI
department_name = ACCOUNT_SCI_NAME
icon_state = "sci_budget"
/obj/item/card/id/departmental_budget/med
department_ID = ACCOUNT_MED
department_name = ACCOUNT_MED_NAME
icon_state = "med_budget"
/obj/item/card/id/departmental_budget/srv
department_ID = ACCOUNT_SRV
department_name = ACCOUNT_SRV_NAME
icon_state = "srv_budget"
/obj/item/card/id/departmental_budget/car
department_ID = ACCOUNT_CAR
department_name = ACCOUNT_CAR_NAME
icon_state = "car_budget" //saving up for a new tesla
/obj/item/card/id/departmental_budget/sec
department_ID = ACCOUNT_SEC
department_name = ACCOUNT_SEC_NAME
icon_state = "sec_budget"
@@ -32,7 +32,6 @@
new /obj/item/circuitboard/machine/techfab/department/engineering(src)
new /obj/item/extinguisher/advanced(src)
new /obj/item/storage/photo_album/CE(src)
new /obj/item/card/id/departmental_budget/eng(src)
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies locker"
@@ -75,7 +75,6 @@
new /obj/item/wallframe/defib_mount(src)
new /obj/item/circuitboard/machine/techfab/department/medical(src)
new /obj/item/storage/photo_album/CMO(src)
new /obj/item/card/id/departmental_budget/med(src)
/obj/structure/closet/secure_closet/animal
name = "animal control"
@@ -29,4 +29,3 @@
new /obj/item/door_remote/research_director(src)
new /obj/item/circuitboard/machine/techfab/department/science(src)
new /obj/item/storage/photo_album/RD(src)
new /obj/item/card/id/departmental_budget/sci(src)
@@ -34,7 +34,6 @@
new /obj/item/door_remote/captain(src)
new /obj/item/card/id/captains_spare(src)
new /obj/item/storage/photo_album/Captain(src)
new /obj/item/card/id/departmental_budget/civ(src)
/obj/structure/closet/secure_closet/hop
name = "\proper head of personnel's locker"
@@ -64,7 +63,6 @@
new /obj/item/door_remote/civillian(src)
new /obj/item/circuitboard/machine/techfab/department/service(src)
new /obj/item/storage/photo_album/HoP(src)
new /obj/item/card/id/departmental_budget/srv(src)
/obj/structure/closet/secure_closet/hos
name = "\proper head of security's locker"
@@ -100,7 +98,6 @@
new /obj/item/pinpointer/nuke(src)
new /obj/item/circuitboard/machine/techfab/department/security(src)
new /obj/item/storage/photo_album/HoS(src)
new /obj/item/card/id/departmental_budget/sec(src)
/obj/structure/closet/secure_closet/warden
name = "\proper warden's locker"