cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

round2electricboogaloo (#7612)

Browse Source
This commit is contained in:
AxieTheAxolotl
2021-08-21 22:24:46 +01:00
committed by GitHub
parent 02462af58c
commit 897c1f0db3
12 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/economy.dm
+4
View File
@@ -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"
code/controllers/subsystem/economy.dm
+4 -1
View File
@@ -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.
code/game/objects/items/mail.dm
+2
View File
@@ -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
code/modules/jobs/job_types/captain.dm
+1 -1
View File
@@ -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)
modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm
+1 -1
View File
@@ -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
modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm
+1 -1
View File
@@ -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)
modular_skyrat/modules/central_command_module/code/jobs/deck_crew.dm
+1 -1
View File
@@ -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)
modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm
+1 -1
View File
@@ -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)
modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm
+1 -1
View File
@@ -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)
modular_skyrat/modules/command_vendor/code/vending/vending.dm
+1
View File
@@ -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(
modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_representative.dm
+1 -1
View File
@@ -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
modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm
+1 -1
View File
@@ -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)