cleanup of game folder, other fixes

code/__DEFINES/clockcult.dm

@@ -28,8 +28,9 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us
 #define SCRIPTURE_APPLICATION "Application"
 
 //Various costs related to power.
-#define SCRIPT_UNLOCK_THRESHOLD 50000 //Scripts will unlock if the total power reaches this amount
-#define APPLICATION_UNLOCK_THRESHOLD 100000 //Applications will unlock if the total powre reaches this amount
+#define MAX_CLOCKWORK_POWER 50000 //The max power in W that the cult can stockpile
+#define SCRIPT_UNLOCK_THRESHOLD 25000 //Scripts will unlock if the total power reaches this amount
+#define APPLICATION_UNLOCK_THRESHOLD 40000 //Applications will unlock if the total powre reaches this amount
 
 #define ABSCOND_ABDUCTION_COST 95
 

code/__DEFINES/cult.dm

@@ -4,6 +4,11 @@
 #define RUNE_COLOR_OFFER "#FFFFFF"
 #define RUNE_COLOR_DARKRED "#7D1717"
 #define RUNE_COLOR_MEDIUMRED "#C80000"
+#define RUNE_COLOR_BURNTORANGE "#CC5500"
 #define RUNE_COLOR_RED "#FF0000"
 #define RUNE_COLOR_EMP "#4D94FF"
 #define RUNE_COLOR_SUMMON "#00FF00"
+
+//blood magic
+#define MAX_BLOODCHARGE 5
+#define RUNELESS_MAX_BLOODCHARGE 2

code/__DEFINES/flags.dm

@@ -65,7 +65,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define UNUSED_TRANSIT_TURF_1	2
 #define CAN_BE_DIRTY_1			4 // If a turf can be made dirty at roundstart. This is also used in areas.
 #define NO_DEATHRATTLE_1		16 // Do not notify deadchat about any deaths that occur on this turf.
-#define NO_RUINS_1				32 //Blocks ruins spawning in the area
+#define NO_RUINS_1				32 //Blocks ruins spawning on the turf
+#define NO_LAVA_GEN_1				64 //Blocks lava rivers being generated on the turf
 //#define CHECK_RICOCHET_1	32		//Same thing as atom flag.
 
 /*

code/__DEFINES/layers.dm

@@ -34,7 +34,7 @@
 #define HIGH_SIGIL_LAYER 2.56
 
 #define BELOW_OPEN_DOOR_LAYER 2.6
-#define SHUTTER_LAYER 2.65 //Prevents shutters from being placed above doors. It's overridden by /obj/machinery/door/New() & poddoor/shutters/New()
+#define SHUTTER_LAYER 2.65 //Prevents shutters from being placed above doors. It's overridden by /obj/machinery/door/Initialize() & poddoor/shutters/Initialize()
 #define OPEN_DOOR_LAYER 2.7
 #define PROJECTILE_HIT_THRESHHOLD_LAYER 2.75 //projectiles won't hit objects at or below this layer if possible
 #define TABLE_LAYER 2.8

code/__DEFINES/traits.dm

@@ -17,7 +17,9 @@
 #define TRAIT_DISFIGURED		"disfigured"
 #define TRAIT_XENO_HOST			"xeno_host"	//Tracks whether we're gonna be a baby alien's mummy.
 #define TRAIT_STUNIMMUNE		"stun_immunity"
+#define TRAIT_SLEEPIMMUNE		"sleep_immunity"
 #define TRAIT_PUSHIMMUNE		"push_immunity"
+#define TRAIT_SHOCKIMMUNE		"shock_immunity"
 
 // common trait sources
 #define TRAIT_GENERIC "generic"
@@ -32,6 +34,7 @@
 // unique trait sources, still defines
 #define STATUE_MUTE "statue"
 #define CHANGELING_DRAIN "drain"
+#define CHANGELING_HIVEMIND_MUTE "ling_mute"
 #define ABYSSAL_GAZE_BLIND "abyssal_gaze"
 #define HIGHLANDER "highlander"
-#define TRAIT_HULK "hulk"
+#define TRAIT_HULK "hulk"