diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index b079bf453a9..6a8b4955a28 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -37,6 +37,10 @@ #define ACCOUNT_CAR_NAME "Cargo Budget" #define ACCOUNT_SEC "SEC" #define ACCOUNT_SEC_NAME "Defense Budget" +#define ACCOUNT_CMD "CMD" // SKYRAT EDIT +#define ACCOUNT_CMD_NAME "Command Budget" // SKYRAT EDIT +#define ACCOUNT_CCM "CCM" // SKYRAT EDIT +#define ACCOUNT_CCM_NAME "Central Command Budget" // SKYRAT EDIT #define NO_FREEBIES "commies go home" diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm index 94da45e978c..2d146a1370c 100644 --- a/code/controllers/subsystem/economy.dm +++ b/code/controllers/subsystem/economy.dm @@ -11,7 +11,10 @@ SUBSYSTEM_DEF(economy) ACCOUNT_MED = ACCOUNT_MED_NAME, ACCOUNT_SRV = ACCOUNT_SRV_NAME, ACCOUNT_CAR = ACCOUNT_CAR_NAME, - ACCOUNT_SEC = ACCOUNT_SEC_NAME) + ACCOUNT_SEC = ACCOUNT_SEC_NAME, + ACCOUNT_CMD = ACCOUNT_CMD_NAME, // SKYRAT EDIT + ACCOUNT_CCM = ACCOUNT_CCM_NAME, // SKYRAT EDIT + ) var/list/generated_accounts = list() var/full_ancap = FALSE // Enables extra money charges for things that normally would be free, such as sleepers/cryo/cloning. //Take care when enabling, as players will NOT respond well if the economy is set up for low cash flows. diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index ac877c6d3a2..36aa40234a8 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -63,6 +63,8 @@ ACCOUNT_SRV = COLOR_PALE_GREEN_GRAY, ACCOUNT_CAR = COLOR_BEIGE, ACCOUNT_SEC = COLOR_PALE_RED_GRAY, + ACCOUNT_CMD = COLOR_BLUE_GRAY, // SKYRAT EDIT ADDITION + ACCOUNT_CCM = COLOR_DARK_MODERATE_LIME_GREEN, // SKYRAT EDIT ADDITION ) // Icons diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 5e60dd92e05..387f6e21dc2 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -18,7 +18,7 @@ plasmaman_outfit = /datum/outfit/plasmaman/captain paycheck = PAYCHECK_COMMAND - paycheck_department = ACCOUNT_SEC + paycheck_department = ACCOUNT_CMD // SKYRAT EDIT - Original: paycheck_department = ACCOUNT_SEC liver_traits = list(TRAIT_ROYAL_METABOLISM) diff --git a/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm b/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm index 62bcd2611d1..2262b9c618d 100644 --- a/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm @@ -14,7 +14,7 @@ exp_granted_type = EXP_TYPE_CREW paycheck = PAYCHECK_HARD - paycheck_department = ACCOUNT_SEC + paycheck_department = ACCOUNT_CCM outfit = /datum/outfit/job/blueshield plasmaman_outfit = /datum/outfit/plasmaman/blueshield diff --git a/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm b/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm index f9572fe4051..635c262c6b9 100644 --- a/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm +++ b/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm @@ -18,7 +18,7 @@ plasmaman_outfit = /datum/outfit/plasmaman/centcom_official paycheck = PAYCHECK_NANOTRASEN_FLEET_COMMAND - paycheck_department = ACCOUNT_SEC + paycheck_department = ACCOUNT_CCM liver_traits = list(TRAIT_ROYAL_METABOLISM) diff --git a/modular_skyrat/modules/central_command_module/code/jobs/deck_crew.dm b/modular_skyrat/modules/central_command_module/code/jobs/deck_crew.dm index cc09a999a24..31c0ba95621 100644 --- a/modular_skyrat/modules/central_command_module/code/jobs/deck_crew.dm +++ b/modular_skyrat/modules/central_command_module/code/jobs/deck_crew.dm @@ -19,7 +19,7 @@ plasmaman_outfit = /datum/outfit/plasmaman/centcom_official paycheck = PAYCHECK_NANOTRASEN_FLEET_COMMAND - paycheck_department = ACCOUNT_SEC + paycheck_department = ACCOUNT_CCM liver_traits = list(TRAIT_ROYAL_METABOLISM) diff --git a/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm b/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm index f346046feea..23857f69c10 100644 --- a/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm +++ b/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm @@ -18,7 +18,7 @@ plasmaman_outfit = /datum/outfit/plasmaman/centcom_commander paycheck = PAYCHECK_NANOTRASEN_FLEET_COMMAND - paycheck_department = ACCOUNT_SEC + paycheck_department = ACCOUNT_CCM liver_traits = list(TRAIT_ROYAL_METABOLISM) diff --git a/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm b/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm index cdf4a75c307..2f4e70371b9 100644 --- a/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm +++ b/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm @@ -18,7 +18,7 @@ plasmaman_outfit = /datum/outfit/plasmaman/centcom_official paycheck = PAYCHECK_NANOTRASEN_FLEET_COMMAND - paycheck_department = ACCOUNT_SEC + paycheck_department = ACCOUNT_CCM liver_traits = list(TRAIT_ROYAL_METABOLISM) diff --git a/modular_skyrat/modules/command_vendor/code/vending/vending.dm b/modular_skyrat/modules/command_vendor/code/vending/vending.dm index a0062e6438e..7c00602eb74 100644 --- a/modular_skyrat/modules/command_vendor/code/vending/vending.dm +++ b/modular_skyrat/modules/command_vendor/code/vending/vending.dm @@ -7,6 +7,7 @@ light_mask = "wardrobe-light-mask" vend_reply = "Thank you for using the CommDrobe!" auto_build_products = TRUE + payment_department = ACCOUNT_CMD /obj/machinery/vending/access/command/build_access_list(list/access_lists) access_lists["[ACCESS_CAPTAIN]"] = list( diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_representative.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_representative.dm index d09c8735a03..795c6ec0c31 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_representative.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_representative.dm @@ -21,7 +21,7 @@ plasmaman_outfit = /datum/outfit/plasmaman/nanotrasen_representative paycheck = PAYCHECK_HARD - paycheck_department = ACCOUNT_SEC + paycheck_department = ACCOUNT_CCM display_order = JOB_DISPLAY_ORDER_NANOTRASEN_REPRESENTATIVE bounty_types = CIV_JOB_SEC diff --git a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm index c4abdce5843..177633ad0f4 100644 --- a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm +++ b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm @@ -16,7 +16,7 @@ plasmaman_outfit = /datum/outfit/plasmaman/security paycheck = PAYCHECK_EASY - paycheck_department = ACCOUNT_SEC + paycheck_department = ACCOUNT_CCM mind_traits = list(TRAIT_DONUT_LOVER) liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)