Merge pull request #1033 from MrCat15352/spacies_riol

ADD: Spacies riol

code/__DEFINES/inventory.dm

@@ -87,7 +87,11 @@
 #define SNOUTED_VARIATION (1<<4) //Ex of naming: a state called "nameof_thing" can be named "nameof_thing_snouted"
 #define VOX_VARIATION (1<<5)
 #define KEPORI_VARIATION (1<<6)
-
+// [CELADON-ADD] - TAJARA
+#define TAJARA_VARIATION (1<<7)
+// [CELADON-ADD] - CELADON_RIOL
+#define RIOL_VARIATION (1<<8)
+// [/CELADON-ADD]
 
 #define NOT_DIGITIGRADE 0
 #define FULL_DIGITIGRADE 1

code/__DEFINES/mobs.dm

@@ -142,6 +142,8 @@
 #define BODYTYPE_VOX (1<<7) //Big Vox
 // [CELADON-ADD] - TAJARA
 #define BODYTYPE_TAJARA (1<<8) //Fluffy Ass
+// [CELADON-ADD] - RIOL
+#define BODYTYPE_RIOL (1<<9)
 // [/CELADON-ADD]
 
 // Health/damage defines

code/__DEFINES/~mod_celadon/riol.dm

@@ -0,0 +1,33 @@
+// Дополнение к code/__DEFINES/DNA.dm
+// #define DNA_SKIN_TONE_NOSE_BLOCK 3
+
+// #define SKINNOSECOLORS 1001
+#define SKINRIOLCOLORS 1008
+#define EARSRIOLCOLORS 1009
+#define HEADRIOLCOLORS 1010
+#define NOSERIOLCOLORS 1011
+#define CHESTRIOLCOLORS 1012
+#define BODYRIOLCOLORS 1013
+#define TAILRIOLCOLORS 1014
+
+// Дополнение к code/__DEFINES/contracts.dm
+#define BAN_HURTRIOL "hurtriol"
+
+
+// Хелпер как в code/__DEFINES/is_helpers.dm
+#define isriol(A) (is_species(A, /datum/species/riol))
+
+
+// Дополнение к code/__DEFINES/mobs.dm
+#define SPECIES_RIOL "riol"
+
+
+// Дополнение к code/__DEFINES/preferences.dm
+// #define RANDOM_SKIN_TONE_NOSE "random_skin_tone_nose"
+#define RANDOM_SKIN_TONE_RIOL "random_skin_tone_riol"
+
+
+// Дополнение к code/__DEFINES/species_clothing_defines.dm
+#define RIOL_MASK_PATH 'mod_celadon/_storge_icons/icons/clothing/onmob_mask_riol.dmi'
+#define RIOL_HEAD_PATH 'mod_celadon/_storge_icons/icons/clothing/onmob_head_riol.dmi'
+#define RIOL_SUIT_PATH 'mod_celadon/_storge_icons/icons/clothing/onmob_suit_riol.dmi'

code/__HELPERS/global_lists.dm

@@ -60,6 +60,20 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails_animated/tajara, GLOB.tajara_animated_tail_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tajara_hairs, GLOB.tajara_hairs_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tajara_ears, GLOB.tajara_ears_list)
+	// [CELADON-ADD] - CELADON_RIOL
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_chest_markings, 		GLOB.riol_chest_markings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_body_markings, 			GLOB.riol_body_markings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_facial_hairs, 			GLOB.riol_facial_hairs_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_nose_markings, 			GLOB.riol_nose_markings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_ears_markings, 			GLOB.riol_ears_markings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_head_markings, 			GLOB.riol_head_markings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_tail_markings, 			GLOB.riol_tail_markings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_tail_markings_animated, GLOB.riol_animated_tail_markings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_legs, 					GLOB.riol_legs_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/riol, 					GLOB.riol_tail_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails_animated/riol, 		GLOB.riol_animated_tail_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_hairs, 					GLOB.riol_hairs_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_ears, 					GLOB.riol_ears_list)
 	// [/CELADON-ADD]
 
 	//Species

code/__HELPERS/mobs.dm

@@ -113,6 +113,31 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/tajara_hairs, GLOB.tajara_hairs_list)
 	if(!GLOB.tajara_ears_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/tajara_ears, GLOB.tajara_ears_list)
+	// [CELADON-ADD] - CELADON_RIOL
+	if(!GLOB.riol_chest_markings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_chest_markings, GLOB.riol_chest_markings_list)
+	if(!GLOB.riol_body_markings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_body_markings, GLOB.riol_body_markings_list)
+	if(!GLOB.riol_facial_hairs_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_facial_hairs, GLOB.riol_facial_hairs_list)
+	if(!GLOB.riol_nose_markings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_nose_markings, GLOB.riol_nose_markings_list)
+	if(!GLOB.riol_ears_markings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_ears_markings, GLOB.riol_ears_markings_list)
+	if(!GLOB.riol_head_markings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_head_markings, GLOB.riol_head_markings_list)
+	if(!GLOB.riol_tail_markings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_tail_markings, GLOB.riol_tail_markings_list)
+	if(!GLOB.riol_legs_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_legs, GLOB.riol_legs_list)
+	if(!GLOB.riol_tail_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/riol, GLOB.riol_tail_list)
+	if(!GLOB.riol_animated_tail_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/tails_animated/riol, GLOB.riol_animated_tail_list)
+	if(!GLOB.riol_hairs_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_hairs, GLOB.riol_hairs_list)
+	if(!GLOB.riol_ears_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/riol_ears, GLOB.riol_ears_list)
 	// [/CELADON-ADD]
 
 	//For now we will always return none for tail_human and ears.
@@ -135,7 +160,7 @@
 		"kepori_feathers" = pick(GLOB.kepori_feathers_list),
 		"kepori_tail_feathers" = pick(GLOB.kepori_tail_feathers_list),
 		"legs" = "Normal Legs",
-			// [CELADON-EDIT] - TAJARA - токс цвета ремув
+			// [CELADON-EDIT] - TAJARA - токс цвета ремув - изменения базы
 		// "mcolor" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		// "mcolor2" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		// CELADON-EDIT - ORIGINAL
@@ -148,6 +173,13 @@
 		"tajara_nose_markings_color" = pick("FFFFFF","7F7F7F", "7BBB7B", "7B7BBB", "BB7B7B", "7BBBBB", "BB7BBB", "BBBB7B"),
 		"tajara_chest_markings_color" = pick("FFFFFF","7F7F7F", "7BBB7B", "7B7BBB", "BB7B7B", "7BBBBB", "BB7BBB", "BBBB7B"),
 		"tajara_body_markings_color" = pick("FFFFFF","7F7F7F", "7BBB7B", "7B7BBB", "BB7B7B", "7BBBBB", "BB7BBB", "BBBB7B"),
+		// [CELADON-ADD] - CELADON_RIOL
+		"riol_ears_markings_color" = 	pick("FFFFFF", "7F7F7F", "7BBB7B", "7B7BBB", "BB7B7B", "7BBBBB", "BB7BBB", "BBBB7B"),
+		"riol_head_markings_color" = 	pick("FFFFFF", "7F7F7F", "7BBB7B", "7B7BBB", "BB7B7B", "7BBBBB", "BB7BBB", "BBBB7B"),
+		"riol_nose_markings_color" = 	pick("FFFFFF", "7F7F7F", "7BBB7B", "7B7BBB", "BB7B7B", "7BBBBB", "BB7BBB", "BBBB7B"),
+		"riol_chest_markings_color" = 	pick("FFFFFF", "7F7F7F", "7BBB7B", "7B7BBB", "BB7B7B", "7BBBBB", "BB7BBB", "BBBB7B"),
+		"riol_body_markings_color" = 	pick("FFFFFF", "7F7F7F", "7BBB7B", "7B7BBB", "BB7B7B", "7BBBBB", "BB7BBB", "BBBB7B"),
+		"riol_tail_markings_color" = 	pick("FFFFFF", "7F7F7F", "7BBB7B", "7B7BBB", "BB7B7B", "7BBBBB", "BB7BBB", "BBBB7B"),
 		// [/CELADON-ADD]
 		"moth_fluff" = pick(GLOB.moth_fluff_list),
 		"moth_markings" = pick(GLOB.moth_markings_list),
@@ -163,7 +195,7 @@
 		"vox_head_quills" = pick(GLOB.vox_head_quills_list),
 		"vox_neck_quills" = pick(GLOB.vox_neck_quills_list),
 		"wings" = "None",
-		// [CELADON-ADD] - TAJARA - ,
+		// [CELADON-ADD] - TAJARA
 		"tajara_ears" = pick(GLOB.tajara_ears_list),
 		"tajara_hairs" = pick(GLOB.tajara_hairs_list),
 		"tajara_ears_markings" = pick(GLOB.tajara_ears_markings_list),
@@ -173,7 +205,19 @@
 		"tajara_chest_markings" = pick(GLOB.tajara_chest_markings_list),
 		"tajara_body_markings" = pick(GLOB.tajara_body_markings_list),
 		"tajara_tail" = pick(GLOB.tajara_tail_list),
-		// [/CELADON-ADD] ,
+		// [CELADON-ADD] - CELADON_RIOL
+		"riol_ears" = pick(GLOB.riol_ears_list),
+		"riol_hairs" = pick(GLOB.riol_hairs_list),
+		"riol_ears_markings" = pick(GLOB.riol_ears_markings_list),
+		"riol_head_markings" = pick(GLOB.riol_head_markings_list),
+		"riol_facial_hairs" = pick(GLOB.riol_facial_hairs_list),
+		"riol_nose_markings" = pick(GLOB.riol_nose_markings_list),
+		"riol_chest_markings" = pick(GLOB.riol_chest_markings_list),
+		"riol_body_markings" = pick(GLOB.riol_body_markings_list),
+		"riol_tail_markings" = pick(GLOB.riol_tail_markings_list),
+		"riol_tail" = pick(GLOB.riol_tail_list),
+		"riol_legs" = pick(GLOB.riol_legs_list),
+		// [/CELADON-ADD]
 	)
 
 // [CELADON-REMOVE] - TAJARA - Не вызовет ошибок, но будет неправильным использованием. Правильно: /datum/species/random_hairstyle()

code/__HELPERS/names.dm

@@ -200,6 +200,9 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex)
 							// [CELADON-ADD] - TAJARA
 							if(prob(5))
 								. += pick(tajara_name(MALE),tajara_name(FEMALE))
+							// [CELADON-ADD] - CELADON_RIOL
+							if(prob(5))
+								. += pick(riol_name(MALE),riol_name(FEMALE))
 							// [/CELADON-ADD]
 							else
 								var/new_name = pick(pick(GLOB.first_names_male,GLOB.first_names_female))

code/_globalvars/bitfields.dm

@@ -274,6 +274,8 @@ DEFINE_BITFIELD(storage_flags, list(
 DEFINE_BITFIELD(bodytype, list(
 	// [CELADON-ADD] - TAJARA - ,
 	"BODYTYPE_TAJARA" = BODYTYPE_TAJARA,
+	// [CELADON-ADD] - CELADON_RIOL
+	"BODYTYPE_RIOL" = BODYTYPE_RIOL,
 	// [/CELADON-ADD] ,
 	"BODYTYPE_ORGANIC" = BODYTYPE_ORGANIC,
 	"BODYTYPE_ROBOTIC" = BODYTYPE_ROBOTIC,

code/controllers/subsystem/traumas.dm

@@ -190,6 +190,9 @@ SUBSYSTEM_DEF(traumas)
 
 	init_tajara_mod()
 
+	// [CELADON-ADD] - CELADON_RIOL
+	init_riol_mod()
+
 	// [/CELADON-ADD]
 
 	return ..()

code/datums/components/tackle.dm

@@ -292,6 +292,12 @@
 				defense_mod -= 1
 		// [/CELADON-ADD]
 
+		// [CELADON-ADD] - CELADON_RIOL
+		if(isriol(T))
+			if(!T.getorganslot(ORGAN_SLOT_TAIL))
+				defense_mod -= 1
+		// [/CELADON-ADD]
+
 	// OF-FENSE
 	var/mob/living/carbon/sacker = parent
 

code/game/machinery/scan_gate.dm

@@ -154,6 +154,9 @@
 					// [CELADON-ADD] - TAJARA, LANIUS
 					if(SPECIES_TAJARA)
 						scan_species = /datum/species/tajara
+					// [CELADON-ADD] - CELADON_RIOL, CELADON_LANIUS
+					if(SPECIES_RIOL)
+						scan_species = /datum/species/riol
 					if(SPECIES_LANIUS)
 						scan_species = /datum/species/lanius
 					// [/CELADON-ADD]

code/modules/admin/create_mob.dm

@@ -17,7 +17,7 @@
 	H.underwear = random_underwear(H.gender)
 	H.underwear_color = random_color()
 	H.skin_tone = random_skin_tone()
-	// [CELADON-EDIT] - TAJARA
+	// [CELADON-EDIT] - TAJARA - изменения базы
 	// H.hairstyle = random_hairstyle(H.gender) // CELADON-EDIT - ORIGINAL
 	// H.facial_hairstyle = random_facial_hairstyle(H.gender) // CELADON-EDIT - ORIGINAL
 	H.hairstyle = H.dna.species.random_hairstyle(H.gender)
@@ -64,6 +64,18 @@
 	H.dna.features["tajara_chest_markings"] = pick(GLOB.tajara_chest_markings_list)
 	H.dna.features["tajara_body_markings"] = pick(GLOB.tajara_body_markings_list)
 	H.dna.features["tajara_tail"] = pick(GLOB.tajara_tail_list)
+	// [CELADON-ADD] - CELADON_RIOL
+	H.dna.features["riol_ears"] = pick(GLOB.riol_ears_list)
+	H.dna.features["riol_hairs"] = pick(GLOB.riol_hairs_list)
+	H.dna.features["riol_ears_markings"] = pick(GLOB.riol_ears_markings_list)
+	H.dna.features["riol_head_markings"] = pick(GLOB.riol_head_markings_list)
+	H.dna.features["riol_nose_markings"] = pick(GLOB.riol_nose_markings_list)
+	H.dna.features["riol_facial_hairs"] = pick(GLOB.riol_facial_hairs_list)
+	H.dna.features["riol_chest_markings"] = pick(GLOB.riol_chest_markings_list)
+	H.dna.features["riol_body_markings"] = pick(GLOB.riol_body_markings_list)
+	H.dna.features["riol_tail_markings"] = pick(GLOB.riol_tail_markings_list)
+	H.dna.features["riol_tail"] = pick(GLOB.riol_tail_list)
+	H.dna.features["riol_legs"] = pick(GLOB.riol_legs_list)
 	// [/CELADON-ADD]
 
 	H.update_body()

code/modules/awaymissions/corpse.dm

@@ -194,14 +194,14 @@
 	if(hairstyle)
 		H.hairstyle = hairstyle
 	else
-		// [CELADON-EDIT] - TAJARA
+		// [CELADON-EDIT] - TAJARA - изменения базы
 		// H.hairstyle = random_hairstyle(H.gender) // CELADON-EDIT - ORIGINAL
 		H.hairstyle = H.dna.species.random_hairstyle(H.gender)
 		// [/CELADON-EDIT]
 	if(facial_hairstyle)
 		H.facial_hairstyle = facial_hairstyle
 	else
-		// [CELADON-EDIT] - TAJARA
+		// [CELADON-EDIT] - TAJARA - изменения базы
 		// H.facial_hairstyle = random_facial_hairstyle(H.gender) // CELADON-EDIT - ORIGINAL
 		H.facial_hairstyle = H.dna.species.random_facial_hairstyle(H.gender)
 		// [/CELADON-EDIT]