Detaching from Persistent Economy

baystation12.dme

@@ -34,7 +34,6 @@
 #include "code\__defines\atmospherics.dm"
 #include "code\__defines\audio.dm"
 #include "code\__defines\callback.dm"
-#include "code\__defines\characters.dm"
 #include "code\__defines\chat.dm"
 #include "code\__defines\chemistry.dm"
 #include "code\__defines\client.dm"
@@ -298,8 +297,6 @@
 #include "code\controllers\subsystems\wireless.dm"
 #include "code\controllers\subsystems\xenoarch.dm"
 #include "code\controllers\subsystems\zcopy.dm"
-#include "code\controllers\subsystems\characters\character_helpers.dm"
-#include "code\controllers\subsystems\characters\database_persistence.dm"
 #include "code\controllers\subsystems\initialization\codex.dm"
 #include "code\controllers\subsystems\processing\airflow.dm"
 #include "code\controllers\subsystems\processing\circuit.dm"
@@ -785,6 +782,7 @@
 #include "code\game\machinery\syndicatebeacon.dm"
 #include "code\game\machinery\teleporter.dm"
 #include "code\game\machinery\vending.dm"
+#include "code\game\machinery\vending_miner.dm"
 #include "code\game\machinery\wall_frames.dm"
 #include "code\game\machinery\washing_machine.dm"
 #include "code\game\machinery\wishgranter.dm"

code/__defines/economy.dm

@@ -8,10 +8,4 @@
 #define SALARY_COMMAND	1500	//Department heads and bridge staff
 #define SALARY_HIGH_COMMAND	3000	//The captain and first officer
 
-
-
-#define FEE_NEUTRAL	0.1	//10 percent
-#define FEE_DEATH	0.15
-
-
-#define REWARD_SCHEMATIC	3000
+#define REWARD_SCHEMATIC	3000

code/__defines/research.dm

@@ -12,10 +12,11 @@
 #define TECH_ILLEGAL "earth gov"
 #define TECH_NECRO "marker"
 
-#define NONE		0
-#define IMPRINTER	1	//For circuits. Uses glass/chemicals.
-#define PROTOLATHE	2	//New stuff. Uses glass/metal/chemicals
-#define MECHFAB		4	//Mechfab
-#define CHASSIS		8	//For protolathe, but differently
-#define AUTOLATHE	16  //For autolathe
-#define STORE		32	//Purchasing in store
+#define NONE				0x1
+#define IMPRINTER			0x2		// For circuits. Uses glass/chemicals.
+#define PROTOLATHE			0x4		// New stuff. Uses glass/metal/chemicals
+#define MECHFAB				0x8		// Mechfab
+#define CHASSIS				0x10	// For protolathe, but differently
+#define AUTOLATHE			0x20	// For autolathe
+#define STORE_SCHEMATICS	0x40	// Bound to schematic, unlockable in store with said chematic
+#define STORE_ROUNDSTART	0x80	// Always available in store

code/__defines/subsystems.dm

@@ -61,7 +61,6 @@
 
 #define SS_INIT_PROFILER			101
 #define SS_INIT_GARBAGE				99
-#define SS_INIT_DATABASE			95
 #define SS_INIT_SERVER_MAINT		93
 #define SS_INIT_TIMETRACK			46
 #define SS_INIT_MATERIALS        8

code/_helpers/global_lists.dm

@@ -21,9 +21,6 @@ var/global/list/whitelisted_species = list(SPECIES_HUMAN) // Species that requir
 var/global/list/playable_species = list(SPECIES_HUMAN)    // A list of ALL playable species, whitelisted, latejoin or otherwise.
 
 
-//A list of IC characters in the format character_id = mind
-GLOBAL_LIST_EMPTY(characters)
-
 //Datum/patron_item instances
 GLOBAL_LIST_EMPTY(patron_items)