The Split

_maps/shuttles/whiteship_box.dmm

@@ -306,7 +306,7 @@
 	melee_damage_lower = 11;
 	melee_damage_upper = 11;
 	name = "Rotting Carcass";
-	zombiejob = "Assistant"
+	zombiejob = "Civilian"
 	},
 /turf/open/floor/iron/white/corner{
 	dir = 1
@@ -1558,7 +1558,7 @@
 	melee_damage_lower = 11;
 	melee_damage_upper = 11;
 	name = "Rotting Carcass";
-	zombiejob = "Assistant"
+	zombiejob = "Civilian"
 	},
 /turf/open/floor/iron,
 /area/shuttle/abandoned/medbay)

code/__DEFINES/access.dm

@@ -27,7 +27,7 @@
 #define ACCESS_TELEPORTER 17
 #define ACCESS_EVA 18
 /// Bridge, EVA storage windoors, gateway shutters, AI integrity restorer, comms console
-#define ACCESS_HEADS 19
+#define ACCESS_MANAGEMENT 19
 #define ACCESS_CAPTAIN 20
 #define ACCESS_ALL_PERSONAL_LOCKERS 21
 #define ACCESS_CHAPEL_OFFICE 22
@@ -172,7 +172,7 @@
 /// Bitflag for Private Command ID card accesses. See PRIVATE_COMMAND_ACCESS.
 #define ACCESS_FLAG_PRV_COMMAND (1 << 2)
 /// Displayed name for Captain ID card accesses.
-#define ACCESS_FLAG_CAPTAIN_NAME "Captain"
+#define ACCESS_FLAG_CAPTAIN_NAME "Superintendent"
 /// Bitflag for Captain ID card accesses. See CAPTAIN_ACCESS.
 #define ACCESS_FLAG_CAPTAIN (1 << 3)
 /// Displayed name for Centcom ID card accesses.
@@ -294,7 +294,7 @@
 	ACCESS_RC_ANNOUNCE, \
 	ACCESS_VAULT, \
 	ACCESS_TECH_STORAGE, \
-	ACCESS_HEADS, \
+	ACCESS_MANAGEMENT, \
 	ACCESS_TELEPORTER, \
 	ACCESS_ARMORY, \
 	ACCESS_AI_UPLOAD, \
@@ -455,7 +455,7 @@
 #define REGION_COMMAND "Command"
 /// Used to seed the accesses_by_region list in SSid_access. A list of all command regional accesses that are overseen by the Captain.
 #define REGION_ACCESS_COMMAND list( \
-	ACCESS_HEADS, \
+	ACCESS_MANAGEMENT, \
 	ACCESS_RC_ANNOUNCE, \
 	ACCESS_KEYCARD_AUTH, \
 	ACCESS_CHANGE_IDS, \

code/__DEFINES/cargo.dm

@@ -38,7 +38,7 @@
 #define SUPPLYPOD_X_OFFSET -16
 
 /// The baseline unit for cargo crates. Adjusting this will change the cost of all in-game shuttles, crate export values, bounty rewards, and all supply pack import values, as they use this as their unit of measurement.
-#define CARGO_CRATE_VALUE 200
+#define CARGO_CRATE_VALUE 10
 
 GLOBAL_LIST_EMPTY(supplypod_loading_bays)
 
@@ -58,3 +58,9 @@ GLOBAL_LIST_INIT(podstyles, list(\
 	list(POD_SHAPE_OTHER, "gondola",     FALSE, FALSE, FALSE,   RUBBLE_NONE,     "gondola",     "The silent walker. This one seems to be part of a delivery agency."),\
 	list(POD_SHAPE_OTHER, FALSE,         FALSE,    FALSE,            FALSE,   RUBBLE_NONE,         FALSE,      FALSE,      "rl_click", "give_po")\
 ))
+
+// Supply pack flags
+#define SUPPLY_PACK_EMAG (1<<0)
+#define SUPPLY_PACK_CONTRABAND (1<<1)
+#define SUPPLY_PACK_DROPPOD_ONLY (1<<2)
+#define SUPPLY_PACK_GOVERNMENT (1<<3)

code/__DEFINES/construction.dm

@@ -63,6 +63,8 @@
 //windows affected by Nar'Sie turn this color.
 #define NARSIE_WINDOW_COLOUR "#7D1919"
 
+#define IRON_VALUE_PER_UNIT 0.0004
+
 //The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
 #define MINERAL_MATERIAL_AMOUNT 2000
 //The maximum size of a stack object.

code/__DEFINES/datacore.dm

@@ -0,0 +1,42 @@
+#define DATACORE_ID "id"
+#define DATACORE_NAME "name"
+#define DATACORE_AGE "age"
+#define DATACORE_GENDER "gender"
+#define DATACORE_SPECIES "species"
+#define DATACORE_FINGERPRINT "fingerprint"
+#define DATACORE_APPEARANCE "character_appearance"
+#define DATACORE_MINDREF "mind"
+#define DATACORE_DNA_IDENTITY "identity"
+#define DATACORE_DNA_FEATURES "features"
+
+#define DATACORE_PHYSICAL_HEALTH "p_stat"
+#define DATACORE_MENTAL_HEALTH "m_stat"
+#define DATACORE_BLOOD_TYPE "blood_type"
+#define DATACORE_BLOOD_DNA "b_dna"
+#define DATACORE_DISEASES "cdi"
+#define DATACORE_DISEASES_DETAILS "cdi_d"
+#define DATACORE_DISABILITIES "ma_dis"
+#define DATACORE_DISABILITIES_DETAILS "ma_dis_d"
+
+#define DATACORE_NOTES "notes"
+#define DATACORE_NOTES_DETAILS "notes_d"
+
+#define DATACORE_RANK "rank"
+#define DATACORE_INITIAL_RANK "initial_rank"
+#define DATACORE_TRIM "trim"
+#define DATACORE_PDA_ID "pda_id"
+
+#define DATACORE_CRIMES "crim"
+#define DATACORE_CRIMINAL_STATUS "criminal"
+#define DATACORE_CITATIONS "citation"
+
+/// Keys for SSdatacore.library
+#define DATACORE_RECORDS_STATION "general"
+#define DATACORE_RECORDS_SECURITY "security"
+#define DATACORE_RECORDS_MEDICAL "medical"
+#define DATACORE_RECORDS_LOCKED "locked"
+
+#define DATACORE_RECORDS_AETHER "aether"
+#define DATACORE_RECORDS_DAEDALUS "daedalus"
+#define DATACORE_RECORDS_HERMES "hermes"
+#define DATACORE_RECORDS_MARS "mars"

code/__DEFINES/dcs/signals/signals_datum.dm

@@ -38,12 +38,3 @@
 /// From /datum/gas_mixture/proc/react: ()
 #define COMSIG_GASMIX_REACTED "comsig_gasmix_reacted"
 
-// Modular computer's file signals. Tells the program datum something is going on.
-/// From /obj/item/computer_hardware/hard_drive/proc/store_file: ()
-#define COMSIG_MODULAR_COMPUTER_FILE_ADDING "comsig_modular_computer_file_adding"
-/// From /obj/item/computer_hardware/hard_drive/proc/store_file: ()
-#define COMSIG_MODULAR_COMPUTER_FILE_ADDED "comsig_modular_computer_file_adding"
-/// From /obj/item/computer_hardware/hard_drive/proc/remove_file: ()
-#define COMSIG_MODULAR_COMPUTER_FILE_DELETING "comsig_modular_computer_file_deleting"
-/// From /obj/item/computer_hardware/hard_drive/proc/store_file: ()
-#define COMSIG_MODULAR_COMPUTER_FILE_DELETED "comsig_modular_computer_file_adding"

code/__DEFINES/economy.dm

@@ -1,70 +1,40 @@
-/// Number of paychecks jobs start with at the creation of a new bank account for a player (So at shift-start or game join, but not a blank new account.)
-#define STARTING_PAYCHECKS 7
 /// How much mail the Economy SS will create per minute, regardless of firing time.
-#define MAX_MAIL_PER_MINUTE 3
+#define MAX_MAIL_PER_MINUTE 0.05
 /// Probability of using letters of envelope sprites on all letters.
 #define FULL_CRATE_LETTER_ODDS 70
 
-//
-#define PAYCHECK_PRISONER 25
-#define PAYCHECK_ASSISTANT 50
-#define PAYCHECK_MINIMAL 55
-#define PAYCHECK_EASY 60
-#define PAYCHECK_MEDIUM 75
-#define PAYCHECK_HARD 100
-#define PAYCHECK_COMMAND 200
 
-#define PAYCHECK_ZERO 0
+/// The baseline cost for basically everything in the game
+#define PAYCHECK_ASSISTANT 10
 
-///The amount of money taken from station master and distributed to all departments every 5 minutes.
-#define ECON_STATION_PAYOUT 6000
-///The amount of money in a department account where station master will stop filling it up.
-#define ECON_STATION_PAYOUT_MAX 5000
+#define PAYCHECK_MINIMAL (PAYCHECK_ASSISTANT * 2)
+#define PAYCHECK_EASY (PAYCHECK_ASSISTANT * 2.5)
+#define PAYCHECK_MEDIUM (PAYCHECK_ASSISTANT * 4)
+#define PAYCHECK_HARD (PAYCHECK_ASSISTANT * 7)
+#define PAYCHECK_COMMAND (PAYCHECK_ASSISTANT * 20)
 
-///The minimum amount of money in the station master account required for a departmental payout
-#define ECON_STATION_PAYOUT_REQUIREMENT 600
+#define PAYCHECK_ZERO 0
 
 //A multiplier for when you buy from your department.
 #define VENDING_DISCOUNT 0
 
-///NOT USED FOR ECONOMY
-#define ACCOUNT_CIV "CIV"
-
-
 #define ACCOUNT_ENG "ENG"
-#define ACCOUNT_ENG_NAME "Engineering Budget"
-#define ACCOUNT_SCI "SCI"
-#define ACCOUNT_SCI_NAME "Scientific Budget"
+#define ACCOUNT_ENG_NAME "Daedalus Industries Funds"
 #define ACCOUNT_MED "MED"
-#define ACCOUNT_MED_NAME "Medical Budget"
+#define ACCOUNT_MED_NAME "Aether Pharmaceuticals Funds"
 #define ACCOUNT_SRV "SRV"
-#define ACCOUNT_SRV_NAME "Service Budget"
 #define ACCOUNT_CAR "CAR"
-#define ACCOUNT_CAR_NAME "Cargo Budget"
+#define ACCOUNT_CAR_NAME "Hermes Galactic Freight Funds"
 #define ACCOUNT_SEC "SEC"
-#define ACCOUNT_SEC_NAME "Defense Budget"
-
-/// The number of departmental accounts for the economy. DOES NOT INCLUDE STATION MASTER.
-#define ECON_NUM_DEPARTMENT_ACCOUNTS 6
+#define ACCOUNT_SEC_NAME "Mars People's Coalition Budget"
 
 #define ACCOUNT_STATION_MASTER "STA"
 #define ACCOUNT_STATION_MASTER_NAME "Station Budget"
 
-#define NO_FREEBIES "commies go home"
+#define ACCOUNT_GOV "GOV"
+#define ACCOUNT_GOV_NAME "Special Order Budget"
 
-//Defines that set what kind of civilian bounties should be applied mid-round.
-#define CIV_JOB_BASIC 1
-#define CIV_JOB_ROBO 2
-#define CIV_JOB_CHEF 3
-#define CIV_JOB_SEC 4
-#define CIV_JOB_DRINK 5
-#define CIV_JOB_CHEM 6
-#define CIV_JOB_VIRO 7
-#define CIV_JOB_ENG 9
-#define CIV_JOB_MINE 10
-#define CIV_JOB_MED 11
-#define CIV_JOB_GROW 12
-#define CIV_JOB_RANDOM 13
+#define NO_FREEBIES "commies go home"
 
 //By how much should the station's inflation value be multiplied by when dividing the civilian bounty's reward?
 #define BOUNTY_MULTIPLIER 10

code/__DEFINES/jobs.dm

@@ -28,20 +28,18 @@
  */
 
 //No department
-#define JOB_ASSISTANT "Assistant"
+#define JOB_ASSISTANT "Civilian"
 #define JOB_PRISONER "Prisoner"
 //Command
-#define JOB_CAPTAIN "Captain"
-#define JOB_HEAD_OF_PERSONNEL "Head of Personnel"
-#define JOB_SECURITY_MARSHAL "Security Marshal"
-#define JOB_RESEARCH_DIRECTOR "Research Director"
-#define JOB_CHIEF_ENGINEER "Chief Engineer"
-#define JOB_MEDICAL_DIRECTOR "Medical Director"
+#define JOB_CAPTAIN "Superintendent"
+#define JOB_HEAD_OF_PERSONNEL "Delegate"
+#define JOB_SECURITY_CONSULTANT "Security Consultant"
 //Silicon
 #define JOB_AI "AI"
 #define JOB_CYBORG "Cyborg"
 #define JOB_PERSONAL_AI "Personal AI"
 //Security
+#define JOB_SECURITY_MARSHAL "Security Marshal"
 #define JOB_WARDEN "Brig Lieutenant"
 #define JOB_DETECTIVE "Private Investigator"
 #define JOB_SECURITY_OFFICER "Security Officer"
@@ -50,17 +48,15 @@
 #define JOB_SECURITY_OFFICER_SCIENCE "Security Officer (Science)"
 #define JOB_SECURITY_OFFICER_SUPPLY "Security Officer (Cargo)"
 //Engineering
+#define JOB_CHIEF_ENGINEER "Chief Engineer"
 #define JOB_STATION_ENGINEER "Station Engineer"
 #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician"
 //Medical
+#define JOB_MEDICAL_DIRECTOR "Medical Director"
 #define JOB_MEDICAL_DOCTOR "General Practitioner"
 #define JOB_PARAMEDIC "Paramedic"
 #define JOB_CHEMIST "Chemist"
 #define JOB_VIROLOGIST "Virologist"
-//Science
-#define JOB_SCIENTIST "Scientist"
-#define JOB_ROBOTICIST "Roboticist"
-#define JOB_GENETICIST "Geneticist"
 //Supply
 #define JOB_QUARTERMASTER "Quartermaster"
 #define JOB_DECKHAND "Deckhand"
@@ -71,7 +67,6 @@
 #define JOB_COOK "Cook"
 #define JOB_JANITOR "Janitor"
 #define JOB_CLOWN "Clown"
-#define JOB_MIME "Mime"
 #define JOB_ARCHIVIST "Archivist"
 #define JOB_LAWYER "Lawyer"
 #define JOB_CHAPLAIN "Chaplain"
@@ -102,25 +97,27 @@
 #define DEPARTMENT_UNASSIGNED "No department assigned"
 
 #define DEPARTMENT_BITFLAG_SECURITY (1<<0)
-#define DEPARTMENT_SECURITY "Security"
-#define DEPARTMENT_BITFLAG_COMMAND (1<<1)
-#define DEPARTMENT_COMMAND "Command"
+#define DEPARTMENT_SECURITY "Mars Private Security"
+#define DEPARTMENT_BITFLAG_MANAGEMENT (1<<1)
+#define DEPARTMENT_MANAGEMENT "Management"
 #define DEPARTMENT_BITFLAG_SERVICE (1<<2)
-#define DEPARTMENT_SERVICE "Service"
+#define DEPARTMENT_SERVICE "Independant"
 #define DEPARTMENT_BITFLAG_CARGO (1<<3)
-#define DEPARTMENT_CARGO "Cargo"
+#define DEPARTMENT_CARGO "Hermes Galactic Freight"
 #define DEPARTMENT_BITFLAG_ENGINEERING (1<<4)
-#define DEPARTMENT_ENGINEERING "Engineering"
+#define DEPARTMENT_ENGINEERING "Daedalus Industries"
 #define DEPARTMENT_BITFLAG_SCIENCE (1<<5)
 #define DEPARTMENT_SCIENCE "Science"
 #define DEPARTMENT_BITFLAG_MEDICAL (1<<6)
-#define DEPARTMENT_MEDICAL "Medical"
+#define DEPARTMENT_MEDICAL "Aether Pharmaceuticals"
 #define DEPARTMENT_BITFLAG_SILICON (1<<7)
 #define DEPARTMENT_SILICON "Silicon"
 #define DEPARTMENT_BITFLAG_ASSISTANT (1<<8)
-#define DEPARTMENT_ASSISTANT "Assistant"
+#define DEPARTMENT_ASSISTANT "Civilian"
 #define DEPARTMENT_BITFLAG_CAPTAIN (1<<9)
 #define DEPARTMENT_CAPTAIN "Captain"
+#define DEPARTMENT_BITFLAG_COMPANY_LEADER (1<<10)
+#define DEPARTMENT_COMPANY_LEADER "Company Leader"
 
 /* Job datum job_flags */
 /// Whether the mob is announced on arrival.
@@ -133,15 +130,12 @@
 #define JOB_CREW_MEMBER (1<<3)
 /// Whether this job can be joined through the new_player menu.
 #define JOB_NEW_PLAYER_JOINABLE (1<<4)
-/// Whether this job appears in bold in the job menu.
-#define JOB_BOLD_SELECT_TEXT (1<<5)
 /// Reopens this position if we lose the player at roundstart.
-#define JOB_REOPEN_ON_ROUNDSTART_LOSS (1<<6)
+#define JOB_REOPEN_ON_ROUNDSTART_LOSS (1<<5)
 /// If the player with this job can have quirks assigned to him or not. Relevant for new player joinable jobs and roundstart antags.
-#define JOB_ASSIGN_QUIRKS (1<<7)
+#define JOB_ASSIGN_QUIRKS (1<<6)
 /// Whether this job can be an intern.
-#define JOB_CAN_BE_INTERN (1<<8)
-
+#define JOB_CAN_BE_INTERN (1<<7)
 
 #define FACTION_NONE "None"
 #define FACTION_STATION "Station"

code/__DEFINES/paint.dm

@@ -9,7 +9,7 @@
 #define PAINT_STRIPE_PRIAPUS PAINT_STRIPE_DAEDALUS
 
 //Mars Executive Outcomes
-#define PAINT_WALL_MARSEXECUTIVE PAINT_WALL_DAEDALUS
+#define PAINT_WALL_MARS PAINT_WALL_DAEDALUS
 #define PAINT_STRIPE_MARSEXECUTIVE "#683822"
 
 //Medical

code/__DEFINES/radio.dm

@@ -2,30 +2,30 @@
 
 //say based modes like binary are in living/say.dm
 
-#define RADIO_CHANNEL_COMMON "Common"
+#define RADIO_CHANNEL_COMMON "Local"
 #define RADIO_KEY_COMMON ";"
 
-#define RADIO_CHANNEL_SECURITY "Security"
+#define RADIO_CHANNEL_SECURITY "Mars"
 #define RADIO_KEY_SECURITY "s"
 #define RADIO_TOKEN_SECURITY ":s"
 
-#define RADIO_CHANNEL_ENGINEERING "Engineering"
+#define RADIO_CHANNEL_ENGINEERING "Daedalus"
 #define RADIO_KEY_ENGINEERING "e"
 #define RADIO_TOKEN_ENGINEERING ":e"
 
-#define RADIO_CHANNEL_COMMAND "Command"
+#define RADIO_CHANNEL_COMMAND "Management"
 #define RADIO_KEY_COMMAND "c"
 #define RADIO_TOKEN_COMMAND ":c"
 
 #define RADIO_CHANNEL_SCIENCE "Science"
 #define RADIO_KEY_SCIENCE "n"
 #define RADIO_TOKEN_SCIENCE ":n"
 
-#define RADIO_CHANNEL_MEDICAL "Medical"
+#define RADIO_CHANNEL_MEDICAL "Aether"
 #define RADIO_KEY_MEDICAL "m"
 #define RADIO_TOKEN_MEDICAL ":m"
 
-#define RADIO_CHANNEL_SUPPLY "Supply"
+#define RADIO_CHANNEL_SUPPLY "Hermes"
 #define RADIO_KEY_SUPPLY "u"
 #define RADIO_TOKEN_SUPPLY ":u"
 

code/__DEFINES/subsystems.dm

@@ -131,12 +131,13 @@
 #define INIT_ORDER_MATERIALS 72 //HAS to be before reagents, reagents have materials
 #define INIT_ORDER_REAGENTS 71 //HAS to be before mapping and assets - both create objects, which creates reagents, which relies on lists made in this subsystem
 #define INIT_ORDER_EVENTS 70
-#define INIT_ORDER_IDACCESS 66
-#define INIT_ORDER_JOBS 65 // Must init before atoms, to set up properly the dynamic job lists.
-#define INIT_ORDER_AI_MOVEMENT 56 //We need the movement setup
-#define INIT_ORDER_MEDIA 56 //Needs to init before ticker to generate the login music pool
-#define INIT_ORDER_AI_CONTROLLERS 55 //So the controller can get the ref
-#define INIT_ORDER_TICKER 55
+#define INIT_ORDER_IDACCESS 68
+#define INIT_ORDER_JOBS 67 // Must init before atoms, to set up properly the dynamic job lists.
+#define INIT_ORDER_AI_MOVEMENT 66 //We need the movement setup
+#define INIT_ORDER_MEDIA 64 //Needs to init before ticker to generate the login music pool
+#define INIT_ORDER_DATACORE 63 // Must come before SSticker so datacore reading things can access it
+#define INIT_ORDER_AI_CONTROLLERS 62 //So the controller can get the ref
+#define INIT_ORDER_TICKER 61
 #define INIT_ORDER_TCG 55
 #define INIT_ORDER_MAPPING 50
 #define INIT_ORDER_EARLY_ASSETS 49