From 9cb5db5ba30dfda1a3133fdabb6ecabea3e0f17d Mon Sep 17 00:00:00 2001 From: genessee596 <46986487+genessee596@users.noreply.github.com> Date: Tue, 22 Oct 2019 16:13:06 -0400 Subject: [PATCH] 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 --- code/controllers/subsystem/economy.dm | 8 +++++ code/game/objects/items/cards_ids.dm | 30 ------------------- .../closets/secure/engineering.dm | 1 - .../crates_lockers/closets/secure/medical.dm | 1 - .../closets/secure/scientist.dm | 1 - .../crates_lockers/closets/secure/security.dm | 3 -- 6 files changed, 8 insertions(+), 36 deletions(-) diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm index 36b27969812..0fdf902c963 100644 --- a/code/controllers/subsystem/economy.dm +++ b/code/controllers/subsystem/economy.dm @@ -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 diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 84b662018a9..d5a02080737 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -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" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 5e017fcba3e..b12f2d93ce6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -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" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 0bde14f0e4b..8f660caf4b9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -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" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index f67f828fc60..45bf80e1187 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -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) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 4af7eb79a8b..248a8e2c81b 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -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"