Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45

code/__DEFINES/DNA.dm

@@ -106,6 +106,7 @@
 #define SKINTONE		23	//uses skin tones
 #define HORNCOLOR		24
 
+//organ slots
 #define ORGAN_SLOT_BRAIN "brain"
 #define ORGAN_SLOT_APPENDIX "appendix"
 #define ORGAN_SLOT_RIGHT_ARM_AUG "r_arm_device"
@@ -129,3 +130,8 @@
 #define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun"
 #define ORGAN_SLOT_TAIL "tail"
 #define ORGAN_SLOT_PENIS "penis"
+
+////organ defines
+#define STANDARD_ORGAN_THRESHOLD 	100
+#define STANDARD_ORGAN_HEALING 		0.001
+#define STANDARD_ORGAN_DECAY		0.00222		//designed to fail organs when left to decay for ~15 minutes

code/__DEFINES/colors.dm

@@ -4,15 +4,15 @@
 #define COLOR_INPUT_ENABLED "#D3B5B5"
 
 #define COLOR_DARKMODE_INFO_BUTTONS_BG "#40628A"
-#define COLOR_DARKMODE_ISSUE_BUTTON_BG "#ce4242"
-#define COLOR_DARKMODE_BACKGROUND "#202020"
-#define COLOR_DARKMODE_DARKBACKGROUND "#171717"
-#define COLOR_DARKMODE_TEXT "#f0f0f0"
+#define COLOR_DARKMODE_ISSUE_BUTTON_BG "#A92C2C"
+#define COLOR_DARKMODE_BACKGROUND "#272727"
+#define COLOR_DARKMODE_DARKBACKGROUND "#242424"
+#define COLOR_DARKMODE_TEXT "#E0E0E0"
 
-#define COLOR_WHITEMODE_INFO_BUTTONS_BG "#90b3dd"
-#define COLOR_WHITEMODE_ISSUE_BUTTON_BG "#ef7f7f"
-#define COLOR_WHITEMODE_BACKGROUND "#ffffff"
-#define COLOR_WHITEMODE_DARKBACKGROUND "#eeeeee"
+#define COLOR_WHITEMODE_INFO_BUTTONS_BG "#90B3DD"
+#define COLOR_WHITEMODE_ISSUE_BUTTON_BG "#EF7F7F"
+#define COLOR_WHITEMODE_BACKGROUND "#F0F0F0"
+#define COLOR_WHITEMODE_DARKBACKGROUND "#E6E6E6"
 #define COLOR_WHITEMODE_TEXT "#000000"
 
 #define COLOR_FLOORTILE_GRAY   "#8D8B8B"

code/__DEFINES/flags.dm

@@ -10,6 +10,8 @@
 #define CHECK_BITFIELD(variable, flag) (variable & (flag))
 #define TOGGLE_BITFIELD(variable, flag) (variable ^= (flag))
 
+#define CHECK_MULTIPLE_BITFIELDS(flagvar, flags) (((flagvar) & (flags)) == (flags))
+
 GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768))
 
 // for /datum/var/datum_flags

code/__DEFINES/logging.dm

@@ -35,6 +35,7 @@
 #define LOG_GAME		(1 << 12)
 #define LOG_ADMIN_PRIVATE (1 << 13)
 #define LOG_ASAY		(1 << 14)
+#define LOG_VIRUS			(1 << 15)
 
 //Individual logging panel pages
 #define INDIVIDUAL_ATTACK_LOG		(LOG_ATTACK)

code/__DEFINES/misc.dm

@@ -314,7 +314,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define MAP_MAXZ 6
 
 // Defib stats
-#define DEFIB_TIME_LIMIT 120
+#define DEFIB_TIME_LIMIT 960
 #define DEFIB_TIME_LOSS 60
 
 // Diagonal movement

code/__DEFINES/mobs.dm

@@ -205,8 +205,6 @@
 
 #define MAX_CHICKENS 50
 
-#define UNHEALING_EAR_DAMAGE 100
-
 
 #define INCORPOREAL_MOVE_BASIC 1
 #define INCORPOREAL_MOVE_SHADOW 2 // leaves a trail of shadows
@@ -258,6 +256,9 @@
 
 #define MAX_QUIRKS 6 //The maximum amount of quirks one character can have at roundstart
 
+#define MAX_REVIVE_FIRE_DAMAGE 180
+#define MAX_REVIVE_BRUTE_DAMAGE 180
+
 // AI Toggles
 #define AI_CAMERA_LUMINOSITY	5
 #define AI_VOX // Comment out if you don't want VOX to be enabled and have players download the voice sounds.

code/__DEFINES/obj_flags.dm

@@ -39,3 +39,12 @@
 #define THICKMATERIAL				(1<<5)	//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.
 #define VOICEBOX_TOGGLABLE (1<<6) // The voicebox in this clothing can be toggled.
 #define VOICEBOX_DISABLED (1<<7) // The voicebox is currently turned off.
+
+// Flags for the organ_flags var on /obj/item/organ
+
+#define ORGAN_SYNTHETIC			(1<<0)	//Synthetic organs, or cybernetic organs. Reacts to EMPs and don't deteriorate or heal
+#define ORGAN_FROZEN			(1<<1)	//Frozen organs, don't deteriorate
+#define ORGAN_FAILING			(1<<2)	//Failing organs perform damaging effects until replaced or fixed
+#define ORGAN_EXTERNAL			(1<<3)	//Was this organ implanted/inserted/etc, if true will not be removed during species change.
+#define ORGAN_VITAL				(1<<4)	//Currently only the brain
+#define ORGAN_NO_SPOIL			(1<<5)	//Currently only the brain

code/__DEFINES/reagents.dm

@@ -34,3 +34,17 @@
 #define DEL_REAGENT		1	// reagent deleted (fully cleared)
 #define ADD_REAGENT		2	// reagent added
 #define REM_REAGENT		3	// reagent removed (may still exist)
+
+//reagent bitflags, used for altering how they works
+#define REAGENT_DEAD_PROCESS		(1<<0)	//calls on_mob_dead() if present in a dead body
+#define REAGENT_DONOTSPLIT			(1<<1)	//Do not split the chem at all during processing
+#define REAGENT_ONLYINVERSE			(1<<2)	//Only invert chem, no splitting
+#define REAGENT_ONMOBMERGE			(1<<3)	//Call on_mob_life proc when reagents are merging.
+#define REAGENT_INVISIBLE			(1<<4)	//Doesn't appear on handheld health analyzers.
+#define REAGENT_FORCEONNEW			(1<<5)  //Forces a on_new() call without a data overhead
+#define REAGENT_SNEAKYNAME          (1<<6)  //When inverted, the inverted chem uses the name of the original chem
+#define REAGENT_SPLITRETAINVOL      (1<<7)  //Retains initial volume of chem when splitting
+
+//Chemical reaction flags, for determining reaction specialties
+#define REACTION_CLEAR_IMPURE       (1<<0)  //Convert into impure/pure on reaction completion
+#define REACTION_CLEAR_INVERSE      (1<<1)  //Convert into inverse on reaction completion when purity is low enough

code/__DEFINES/stat.dm

@@ -8,6 +8,9 @@
 #define UNCONSCIOUS	2
 #define DEAD		3
 
+//Maximum healthiness an individual can have
+#define MAX_SATIETY 600
+
 // bitflags for machine stat variable
 #define BROKEN	(1<<0)
 #define NOPOWER	(1<<1)

code/__DEFINES/traits.dm

@@ -165,6 +165,7 @@
 #define OBESITY "obesity"
 #define MAGIC_TRAIT "magic"
 #define TRAUMA_TRAIT "trauma"
+#define DISEASE_TRAIT "disease"
 #define SPECIES_TRAIT "species"
 #define ORGAN_TRAIT "organ"
 #define JOB_TRAIT "job"