Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins

All hail glorious leader tigercat

code/__DEFINES/clothing.dm

@@ -78,3 +78,5 @@
 
 #define BLOCKHEADHAIR 			4		// temporarily removes the user's hair overlay. Leaves facial hair.
 #define BLOCKHAIR				32768	// temporarily removes the user's hair, facial and otherwise.
+
+#define ONESIZEFITSALL 			1		// determines if something can be worn by a fatty or not.

code/__DEFINES/flags.dm

@@ -7,10 +7,7 @@
 #define NOSHIELD				32		// weapon not affected by shield
 #define CONDUCT					64		// conducts electricity (metal etc.)
 #define ABSTRACT				128		// for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
-#define ON_BORDER				512		// item has priority to check when entering or leaving
-#define NODELAY 				32768	// 1 second attackby delay skipped (Can be used once every 0.2s). Most objects have a 1s attackby delay, which doesn't require a flag.
-
-#define NOBLOODY				2048	// used to items if they don't want to get a blood overlay
+#define ON_BORDER				256		// item has priority to check when entering or leaving
 
 #define GLASSESCOVERSEYES		1024
 #define MASKCOVERSEYES			1024	// get rid of some of the other retardation in these flags
@@ -21,14 +18,13 @@
 #define HEADBANGPROTECT			4096
 #define EARBANGPROTECT			1024
 
-#define THICKMATERIAL 	1024			//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with NOSLIP)
 #define NOSLIP					1024 	//prevents from slipping on wet floors, in space etc
 
 #define OPENCONTAINER			4096	// is an open container for chemistry purposes
 
-#define BLOCK_GAS_SMOKE_EFFECT	8192	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! (NOTE: flag shared with ONESIZEFITSALL)
-#define ONESIZEFITSALL 			8192
-#define PLASMAGUARD 			16384	//Does not get contaminated by plasma.
+#define BLOCK_GAS_SMOKE_EFFECT	8192	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
+#define THICKMATERIAL 			8192	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with BLOCK_GAS_SMOKE_EFFECT)
+
 
 #define	NOREACT					16384 	//Reagents dont' react inside this container.
 

code/__DEFINES/genetics.dm

@@ -124,3 +124,8 @@
 #define NUTRITION_LEVEL_HUNGRY 250
 #define NUTRITION_LEVEL_STARVING 150
 
+//Used for calculations for negative effects of having genetics powers
+#define DEFAULT_GENE_STABILITY 100
+#define GENE_INSTABILITY_MINOR 5
+#define GENE_INSTABILITY_MODERATE 10
+#define GENE_INSTABILITY_MAJOR 15

code/__DEFINES/misc.dm

@@ -157,6 +157,8 @@
 	for(type in view(range, dview_mob))
 #define END_FOR_DVIEW dview_mob.loc = null
 
+#define get_turf(A) (get_step(A, 0))
+
 #define MIN_SUPPLIED_LAW_NUMBER 15
 #define MAX_SUPPLIED_LAW_NUMBER 50
 
@@ -264,3 +266,6 @@
 #define TRIGGER_GUARD_ALLOW_ALL -1
 #define TRIGGER_GUARD_NONE 0
 #define TRIGGER_GUARD_NORMAL 1
+
+// Macro to get the current elapsed round time, rather than total world runtime
+#define ROUND_TIME (round_start_time ? (world.time - round_start_time) : 0)

code/__DEFINES/tick.dm

@@ -2,4 +2,4 @@
 #define TICK_LIMIT_TO_RUN 85
 
 #define TICK_CHECK ( world.tick_usage > TICK_LIMIT_RUNNING ? stoplag() : 0 )
-#define CHECK_TICK if (world.tick_usage > TICK_LIMIT_RUNNING)  stoplag()
+#define CHECK_TICK if(world.tick_usage > TICK_LIMIT_RUNNING)  stoplag()