TG DNA update attempt #3: post-TGUI preferences edition

code/__DEFINES/DNA.dm

@@ -60,6 +60,7 @@
 
 #define UI_CHANGED "ui changed"
 #define UE_CHANGED "ue changed"
+#define UF_CHANGED "uf changed"
 
 #define CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY 255
 #define CHAMELEON_MUTATION_MINIMUM_TRANSPARENCY 30
@@ -81,6 +82,8 @@
 //DNA - Because fuck you and your magic numbers being all over the codebase.
 #define DNA_BLOCK_SIZE				3
 
+#define DNA_BLOCK_SIZE_COLOR DEFAULT_HEX_COLOR_LEN
+
 #define DNA_UNI_IDENTITY_BLOCKS		7
 #define DNA_HAIR_COLOR_BLOCK		1
 #define DNA_FACIAL_HAIR_COLOR_BLOCK	2
@@ -90,6 +93,30 @@
 #define DNA_FACIAL_HAIR_STYLE_BLOCK	6
 #define DNA_HAIR_STYLE_BLOCK		7
 
+/// This number needs to equal the total number of DNA blocks
+#define DNA_FEATURE_BLOCKS 19
+
+#define DNA_MUTANT_COLOR_BLOCK 1
+#define DNA_ETHEREAL_COLOR_BLOCK 2
+#define DNA_LIZARD_MARKINGS_BLOCK 3
+#define DNA_LIZARD_TAIL_BLOCK 4
+#define DNA_SNOUT_BLOCK 5
+#define DNA_HORNS_BLOCK 6
+#define DNA_FRILLS_BLOCK 7
+#define DNA_SPINES_BLOCK 8
+#define DNA_HUMAN_TAIL_BLOCK 9
+#define DNA_EARS_BLOCK 10
+#define DNA_MOTH_WINGS_BLOCK 11
+#define DNA_MUSHROOM_CAPS_BLOCK 12
+#define DNA_POD_HAIR_BLOCK 13
+//Yog specific DNA Blocks
+#define DNA_POD_FLOWER_BLOCK 14
+#define DNA_POLY_TAIL_BLOCK 15
+#define DNA_POLY_TEETH_BLOCK 16
+#define DNA_POLY_DOME_BLOCK 17
+#define DNA_POLY_DORSAL_BLOCK 18
+#define DNA_ETHEREAL_MARK_BLOCK 19
+
 #define DNA_SEQUENCE_LENGTH			4
 #define DNA_MUTATION_BLOCKS			8
 #define DNA_UNIQUE_ENZYMES_LEN		32

code/__DEFINES/colors.dm

@@ -1,7 +1,16 @@
 // This is eventually for wjohn to add more color standardization stuff like I keep asking him >:(
 
-#define COLOR_INPUT_DISABLED "#F0F0F0"
-#define COLOR_INPUT_ENABLED "#D3B5B5"
+//different types of atom colorations
+/// Only used by rare effects like greentext coloring mobs and when admins varedit color
+#define ADMIN_COLOUR_PRIORITY 1
+/// e.g. purple effect of the revenant on a mob, black effect when mob electrocuted
+#define TEMPORARY_COLOUR_PRIORITY 2
+/// Color splashed onto an atom (e.g. paint on turf)
+#define WASHABLE_COLOUR_PRIORITY 3
+/// Color inherent to the atom (e.g. blob color)
+#define FIXED_COLOUR_PRIORITY 4
+///how many colour priority levels there are.
+#define COLOUR_PRIORITY_AMOUNT 4
 
 #define COLOR_DARKMODE_BACKGROUND "#202020"
 #define COLOR_DARKMODE_DARKBACKGROUND "#171717"
@@ -122,31 +131,37 @@
 #define COLOR_PURPLE_GRAY "#AE8CA8"
 
 //Color defines used by the assembly detailer.
-#define COLOR_ASSEMBLY_BLACK   "#545454"
-#define COLOR_ASSEMBLY_BGRAY   "#9497AB"
-#define COLOR_ASSEMBLY_WHITE   "#E2E2E2"
-#define COLOR_ASSEMBLY_RED     "#CC4242"
-#define COLOR_ASSEMBLY_ORANGE  "#E39751"
-#define COLOR_ASSEMBLY_BEIGE   "#AF9366"
-#define COLOR_ASSEMBLY_BROWN   "#97670E"
-#define COLOR_ASSEMBLY_GOLD    "#AA9100"
-#define COLOR_ASSEMBLY_YELLOW  "#CECA2B"
-#define COLOR_ASSEMBLY_GURKHA  "#999875"
-#define COLOR_ASSEMBLY_LGREEN  "#789876"
-#define COLOR_ASSEMBLY_GREEN   "#44843C"
-#define COLOR_ASSEMBLY_LBLUE   "#5D99BE"
-#define COLOR_ASSEMBLY_BLUE    "#38559E"
-#define COLOR_ASSEMBLY_PURPLE  "#6F6192"
+#define COLOR_ASSEMBLY_BLACK "#545454"
+#define COLOR_ASSEMBLY_BGRAY "#9497AB"
+#define COLOR_ASSEMBLY_WHITE "#E2E2E2"
+#define COLOR_ASSEMBLY_RED "#CC4242"
+#define COLOR_ASSEMBLY_ORANGE "#E39751"
+#define COLOR_ASSEMBLY_BEIGE "#AF9366"
+#define COLOR_ASSEMBLY_BROWN "#97670E"
+#define COLOR_ASSEMBLY_GOLD "#AA9100"
+#define COLOR_ASSEMBLY_YELLOW "#CECA2B"
+#define COLOR_ASSEMBLY_GURKHA "#999875"
+#define COLOR_ASSEMBLY_LGREEN "#789876"
+#define COLOR_ASSEMBLY_GREEN "#44843C"
+#define COLOR_ASSEMBLY_LBLUE "#5D99BE"
+#define COLOR_ASSEMBLY_BLUE "#38559E"
+#define COLOR_ASSEMBLY_PURPLE "#6F6192"
 
-/// The default color for admin say, used as a fallback when the preference is not enabled
-#define DEFAULT_ASAY_COLOR "#996600"
+///Colors for grayscale tools
+#define COLOR_TOOL_BLUE "#1861d5"
+#define COLOR_TOOL_RED "#951710"
+#define COLOR_TOOL_PINK "#d5188d"
+#define COLOR_TOOL_BROWN "#a05212"
+#define COLOR_TOOL_GREEN "#0e7f1b"
+#define COLOR_TOOL_CYAN "#18a2d5"
+#define COLOR_TOOL_YELLOW "#d58c18"
 
-/*
- * Antag Specific Colors
-*/
-
-#define COLOR_CHANGELING_CHEMICALS "#DD66DD"
-#define COLOR_DARKSPAWN_PSI "#7264FF"
+///Colors for xenobiology vatgrowing
+#define COLOR_SAMPLE_YELLOW "#c0b823"
+#define COLOR_SAMPLE_PURPLE "#342941"
+#define COLOR_SAMPLE_GREEN "#98b944"
+#define COLOR_SAMPLE_BROWN "#91542d"
+#define COLOR_SAMPLE_GRAY "#5e5856"
 
 ///Main colors for UI themes
 #define COLOR_THEME_MIDNIGHT "#6086A0"
@@ -157,8 +172,15 @@
 #define COLOR_THEME_GLASS "#75A4C4"
 #define COLOR_THEME_CLOCKWORK "#CFBA47"
 #define COLOR_THEME_TRASENKNOX "#3ce375"
+
+///yog UI colors
 #define COLOR_THEME_DETECTIVE "#c7b08b"
 
+///Colors for eigenstates
+#define COLOR_PERIWINKLEE "#9999FF"
+
+/// Starlight!
+#define COLOR_STARLIGHT "#8589fa"
 /**
  * Some defines to generalise colours used in lighting.
  *
@@ -168,68 +190,145 @@
 /// Warm but extremely diluted red. rgb(250, 130, 130)
 #define LIGHT_COLOR_RED        "#FA8282"
 /// Bright but quickly dissipating neon green. rgb(100, 200, 100)
-#define LIGHT_COLOR_GREEN      "#64C864"
+#define LIGHT_COLOR_GREEN "#64C864"
+/// Electric green. rgb(0, 255, 0)
+#define LIGHT_COLOR_ELECTRIC_GREEN "#00FF00"
 /// Cold, diluted blue. rgb(100, 150, 250)
-#define LIGHT_COLOR_BLUE       "#6496FA"
+#define LIGHT_COLOR_BLUE "#6496FA"
 /// Light blueish green. rgb(125, 225, 175)
-#define LIGHT_COLOR_BLUEGREEN  "#7DE1AF"
+#define LIGHT_COLOR_BLUEGREEN "#7DE1AF"
 /// Diluted cyan. rgb(125, 225, 225)
-#define LIGHT_COLOR_CYAN       "#7DE1E1"
+#define LIGHT_COLOR_CYAN "#7DE1E1"
+/// Electric cyan rgb(0, 255, 255)
+#define LIGHT_COLOR_ELECTRIC_CYAN "#00FFFF"
 /// More-saturated cyan. rgb(64, 206, 255)
 #define LIGHT_COLOR_LIGHT_CYAN "#40CEFF"
 /// Saturated blue. rgb(51, 117, 248)
-#define LIGHT_COLOR_DARK_BLUE  "#6496FA"
+#define LIGHT_COLOR_DARK_BLUE "#6496FA"
 /// Diluted, mid-warmth pink. rgb(225, 125, 225)
-#define LIGHT_COLOR_PINK       "#E17DE1"
+#define LIGHT_COLOR_PINK "#E17DE1"
 /// Dimmed yellow, leaning kaki. rgb(225, 225, 125)
-#define LIGHT_COLOR_YELLOW     "#E1E17D"
+#define LIGHT_COLOR_YELLOW "#E1E17D"
 /// Clear brown, mostly dim. rgb(150, 100, 50)
-#define LIGHT_COLOR_BROWN      "#966432"
+#define LIGHT_COLOR_BROWN "#966432"
 /// Mostly pure orange. rgb(250, 150, 50)
-#define LIGHT_COLOR_ORANGE     "#FA9632"
+#define LIGHT_COLOR_ORANGE "#FA9632"
 /// Light Purple. rgb(149, 44, 244)
-#define LIGHT_COLOR_PURPLE     "#952CF4"
+#define LIGHT_COLOR_PURPLE "#952CF4"
 /// Less-saturated light purple. rgb(155, 81, 255)
-#define LIGHT_COLOR_LAVENDER   "#9B51FF"
-
-///slightly desaturated bright yellow.
-#define LIGHT_COLOR_HOLY_MAGIC	"#FFF743"
+#define LIGHT_COLOR_LAVENDER "#9B51FF"
+/// slightly desaturated bright yellow.
+#define LIGHT_COLOR_HOLY_MAGIC "#FFF743"
 /// deep crimson
-#define LIGHT_COLOR_BLOOD_MAGIC	"#D00000"
+#define LIGHT_COLOR_BLOOD_MAGIC "#D00000"
+/// yog clockies color
 #define LIGHT_COLOR_CLOCKWORK 	"#BE8700"
 
-//These ones aren't a direct colour like the ones above, because nothing would fit
+/* These ones aren't a direct colour like the ones above, because nothing would fit */
 /// Warm orange color, leaning strongly towards yellow. rgb(250, 160, 25)
-#define LIGHT_COLOR_FIRE       "#FAA019"
+#define LIGHT_COLOR_FIRE "#FAA019"
 /// Very warm yellow, leaning slightly towards orange. rgb(196, 138, 24)
-#define LIGHT_COLOR_LAVA       "#C48A18"
+#define LIGHT_COLOR_LAVA "#C48A18"
 /// Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75)
-#define LIGHT_COLOR_FLARE      "#FA644B"
+#define LIGHT_COLOR_FLARE "#FA644B"
 /// Weird color, between yellow and green, very slimy. rgb(175, 200, 75)
 #define LIGHT_COLOR_SLIME_LAMP "#AFC84B"
 /// Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175)
-#define LIGHT_COLOR_TUNGSTEN   "#FAE1AF"
+#define LIGHT_COLOR_TUNGSTEN "#FAE1AF"
 /// Barely visible cyan-ish hue, as the doctor prescribed. rgb(240, 250, 250)
-#define LIGHT_COLOR_HALOGEN    "#F0FAFA"
-
-#define CABLE_COLOR_BLUE 	"blue"
-	#define CABLE_HEX_COLOR_BLUE 	COLOR_STRONG_BLUE
-#define CABLE_COLOR_BROWN	 "brown"
-	#define CABLE_HEX_COLOR_BROWN 	COLOR_ORANGE_BROWN
-#define CABLE_COLOR_CYAN 	"cyan"
-	#define CABLE_HEX_COLOR_CYAN 	COLOR_CYAN
-#define CABLE_COLOR_GREEN 	"green"
-	#define CABLE_HEX_COLOR_GREEN 	COLOR_DARK_LIME
-#define CABLE_COLOR_ORANGE 	"orange"
-	#define CABLE_HEX_COLOR_ORANGE 	COLOR_MOSTLY_PURE_ORANGE
-#define CABLE_COLOR_PINK 	"pink"
-	#define CABLE_HEX_COLOR_PINK 	COLOR_LIGHT_PINK
-#define CABLE_COLOR_RED 	"red"
-	#define CABLE_HEX_COLOR_RED 	COLOR_RED
-#define CABLE_COLOR_WHITE 	"white"
-	#define CABLE_HEX_COLOR_WHITE 	COLOR_WHITE
-#define CABLE_COLOR_YELLOW 	"yellow"
-	#define CABLE_HEX_COLOR_YELLOW 	COLOR_YELLOW
+#define LIGHT_COLOR_HALOGEN "#F0FAFA"
+
+//The GAGS greyscale_colors for each department's computer/machine circuits
+#define CIRCUIT_COLOR_GENERIC "#1A7A13"
+#define CIRCUIT_COLOR_COMMAND "#1B4594"
+#define CIRCUIT_COLOR_SECURITY "#9A151E"
+#define CIRCUIT_COLOR_SCIENCE "#BC4A9B"
+#define CIRCUIT_COLOR_SERVICE "#92DCBA"
+#define CIRCUIT_COLOR_MEDICAL "#00CCFF"
+#define CIRCUIT_COLOR_ENGINEERING "#F8D700"
+#define CIRCUIT_COLOR_SUPPLY "#C47749"
+
+/// Colors for pride week
+#define COLOR_PRIDE_RED "#FF6666"
+#define COLOR_PRIDE_ORANGE "#FC9F3C"
+#define COLOR_PRIDE_YELLOW "#EAFF51"
+#define COLOR_PRIDE_GREEN "#41FC66"
+#define COLOR_PRIDE_BLUE "#42FFF2"
+#define COLOR_PRIDE_PURPLE "#5D5DFC"
+
+/// The default color for admin say, used as a fallback when the preference is not enabled
+#define DEFAULT_ASAY_COLOR COLOR_MOSTLY_PURE_RED
+
+#define DEFAULT_HEX_COLOR_LEN 6
+
+// Color filters
+/// Icon filter that creates ambient occlusion
+#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, color="#04080FAA")
+/// Icon filter that creates gaussian blur
+#define GAUSSIAN_BLUR(filter_size) filter(type="blur", size=filter_size)
+
+/*
+ * Antag Specific Colors
+*/
+
+#define COLOR_CHANGELING_CHEMICALS "#DD66DD"
+#define COLOR_DARKSPAWN_PSI "#7264FF"
+
+#define CABLE_COLOR_BLUE "blue"
+	#define CABLE_HEX_COLOR_BLUE COLOR_STRONG_BLUE
+#define CABLE_COLOR_BROWN "brown"
+	#define CABLE_HEX_COLOR_BROWN COLOR_ORANGE_BROWN
+#define CABLE_COLOR_CYAN "cyan"
+	#define CABLE_HEX_COLOR_CYAN COLOR_CYAN
+#define CABLE_COLOR_GREEN "green"
+	#define CABLE_HEX_COLOR_GREEN COLOR_DARK_LIME
+#define CABLE_COLOR_ORANGE "orange"
+	#define CABLE_HEX_COLOR_ORANGE COLOR_MOSTLY_PURE_ORANGE
+#define CABLE_COLOR_PINK "pink"
+	#define CABLE_HEX_COLOR_PINK COLOR_LIGHT_PINK
+#define CABLE_COLOR_RED "red"
+	#define CABLE_HEX_COLOR_RED COLOR_RED
+#define CABLE_COLOR_WHITE "white"
+	#define CABLE_HEX_COLOR_WHITE COLOR_WHITE
+#define CABLE_COLOR_YELLOW "yellow"
+	#define CABLE_HEX_COLOR_YELLOW COLOR_YELLOW
+
+#define COLOR_CARP_PURPLE "#aba2ff"
+#define COLOR_CARP_PINK "#da77a8"
+#define COLOR_CARP_GREEN "#70ff25"
+#define COLOR_CARP_GRAPE "#df0afb"
+#define COLOR_CARP_SWAMP "#e5e75a"
+#define COLOR_CARP_TURQUOISE "#04e1ed"
+#define COLOR_CARP_BROWN "#ca805a"
+#define COLOR_CARP_TEAL "#20e28e"
+#define COLOR_CARP_LIGHT_BLUE "#4d88cc"
+#define COLOR_CARP_RUSTY "#dd5f34"
+#define COLOR_CARP_RED "#fd6767"
+#define COLOR_CARP_YELLOW "#f3ca4a"
+#define COLOR_CARP_BLUE "#09bae1"
+#define COLOR_CARP_PALE_GREEN "#7ef099"
+#define COLOR_CARP_SILVER "#fdfbf3"
+#define COLOR_CARP_DARK_BLUE "#3a384d"
+
+#define COLOR_GNOME_RED_ONE "#f10b0b"
+#define COLOR_GNOME_RED_TWO "#bc5347"
+#define COLOR_GNOME_RED_THREE "#b40f1a"
+#define COLOR_GNOME_BLUE_ONE "#2e8ff7"
+#define COLOR_GNOME_BLUE_TWO "#312bd6"
+#define COLOR_GNOME_BLUE_THREE "#4e409a"
+#define COLOR_GNOME_GREEN_ONE "#28da1c"
+#define COLOR_GNOME_GREEN_TWO "#50a954"
+#define COLOR_GNOME_YELLOW "#f6da3c"
+#define COLOR_GNOME_ORANGE "#d56f2f"
+#define COLOR_GNOME_BROWN_ONE "#874e2a"
+#define COLOR_GNOME_BROWN_TWO "#543d2e"
+#define COLOR_GNOME_PURPLE "#ac1dd7"
+#define COLOR_GNOME_WHITE "#e8e8e8"
+#define COLOR_GNOME_GREY "#a9a9a9"
+#define COLOR_GNOME_BLACK "#303030"
+
+#define SOFA_BROWN "#a75400"
+#define SOFA_MAROON "#830000"
 
 GLOBAL_LIST_INIT(cable_colors, list(
 	CABLE_COLOR_BLUE = CABLE_HEX_COLOR_BLUE,
@@ -242,3 +341,8 @@ GLOBAL_LIST_INIT(cable_colors, list(
 	CABLE_COLOR_YELLOW = CABLE_HEX_COLOR_YELLOW,
 	CABLE_COLOR_BROWN = CABLE_HEX_COLOR_BROWN
 ))
+
+// Yog Colors
+
+#define COLOR_INPUT_DISABLED "#F0F0F0"
+#define COLOR_INPUT_ENABLED "#D3B5B5"

code/__DEFINES/cult.dm

@@ -26,7 +26,7 @@
 #define DEFAULT_TOOLTIP "6:-29,5:-2"
 //misc
 #define SOULS_TO_REVIVE 3
-#define BLOODCULT_EYE "f00"
+#define BLOODCULT_EYE "#FF0000"
 //soulstone & construct themes
 #define THEME_CULT "cult"
 #define THEME_WIZARD "wizard"

code/__DEFINES/misc.dm

@@ -307,13 +307,6 @@ GLOBAL_LIST_INIT(donor_pdas, list(PDA_COLOR_NORMAL, PDA_COLOR_TRANSPARENT, PDA_C
 #define LUMA_G 0.715
 #define LUMA_B 0.072
 
-//different types of atom colorations
-#define ADMIN_COLOUR_PRIORITY 		1 //only used by rare effects like greentext coloring mobs and when admins varedit color
-#define TEMPORARY_COLOUR_PRIORITY 	2 //e.g. purple effect of the revenant on a mob, black effect when mob electrocuted
-#define WASHABLE_COLOUR_PRIORITY 	3 //color splashed onto an atom (e.g. paint on turf)
-#define FIXED_COLOUR_PRIORITY 		4 //color inherent to the atom (e.g. blob color)
-#define COLOUR_PRIORITY_AMOUNT 4 //how many priority levels there are.
-
 //Endgame Results
 #define NUKE_NEAR_MISS 1
 #define NUKE_MISS_STATION 2
@@ -442,10 +435,6 @@ GLOBAL_LIST_INIT(donor_pdas, list(PDA_COLOR_NORMAL, PDA_COLOR_TRANSPARENT, PDA_C
 // Used by PDA and cartridge code to reduce repetitiveness of spritesheets
 #define PDAIMG(what) {"<span class="pda16x16 [#what]"></span>"}
 
-//Filters
-#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, color="#04080FAA")
-#define GAUSSIAN_BLUR(filter_size) filter(type="blur", size=filter_size)
-
 #define STANDARD_GRAVITY 1 //Anything above this is high gravity, anything below no grav
 #define GRAVITY_DAMAGE_TRESHOLD 3 //Starting with this value gravity will start to damage mobs
 

code/__HELPERS/dna.dm

@@ -10,4 +10,9 @@
 #define GET_MUTATION_STABILIZER(A) ((A.stabilizer_coeff < 0) ? 1 : A.stabilizer_coeff)
 #define GET_MUTATION_SYNCHRONIZER(A) ((A.synchronizer_coeff < 0) ? 1 : A.synchronizer_coeff)
 #define GET_MUTATION_POWER(A) ((A.power_coeff < 0) ? 1 : A.power_coeff)
-#define GET_MUTATION_ENERGY(A) ((A.energy_coeff < 0) ? 1 : A.energy_coeff)
+#define GET_MUTATION_ENERGY(A) ((A.energy_coeff < 0) ? 1 : A.energy_coeff)
+
+///Getter macro used to get the length of a identity block
+#define GET_UI_BLOCK_LEN(blocknum) (GLOB.identity_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE)
+///Ditto, but for a feature.
+#define GET_UF_BLOCK_LEN(blocknum) (GLOB.features_block_lengths["[blocknum]"] || DNA_BLOCK_SIZE)