Merge remote-tracking branch 'refs/remotes/VOREStation/master'

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm

code/modules/client/preferences.dm

@@ -39,9 +39,9 @@ datum/preferences
 	var/g_facial = 0					//Face hair color
 	var/b_facial = 0					//Face hair color
 	var/s_tone = 0						//Skin tone
-	var/r_skin = 0						//Skin color
-	var/g_skin = 0						//Skin color
-	var/b_skin = 0						//Skin color
+	var/r_skin = 238					//Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default.
+	var/g_skin = 206					//Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default.
+	var/b_skin = 179					//Skin color // Vorestation edit, so color multi sprites can aren't BLACK AS THE VOID by default.
 	var/r_eyes = 0						//Eye color
 	var/g_eyes = 0						//Eye color
 	var/b_eyes = 0						//Eye color

code/modules/mob/living/carbon/human/human_defines_vr.dm

@@ -0,0 +1,4 @@
+/mob/living/carbon/human
+	r_skin = 238 // TO DO: Set defaults for other races.
+	g_skin = 206
+	b_skin = 179

code/modules/mob/living/carbon/human/species/station/prometheans.dm

@@ -27,7 +27,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 	breath_type = null
 	poison_type = null
 
-	gluttonous =            2
+//	gluttonous =            2 // Vorestation edit. Redundant feature.
 	virus_immune =          1
 	blood_volume =          600
 	min_age =               1

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -16,7 +16,6 @@
 
 	spawn_flags = SPECIES_CAN_JOIN
 	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR
-//	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR //VOREStation Edit - Skin Color // NEED SPRITES. CAN'T USE IT UNTIL WE HAVE SPRITES.
 
 
 /datum/species/human/get_bodytype(var/mob/living/carbon/human/H)
@@ -32,7 +31,7 @@
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
 	primitive_form = "Stok"
 	darksight = 3
-	gluttonous = 1
+//	gluttonous = 1 // Vorestation edit. Redundant feature.
 	slowdown = 0.5
 	brute_mod = 0.8
 	num_alternate_languages = 2
@@ -94,7 +93,7 @@
 	slowdown = -0.5
 	brute_mod = 1.15
 	burn_mod =  1.15
-	gluttonous = 1
+//	gluttonous = 1 // Vorestation edit. Redundant feature.
 	num_alternate_languages = 2
 	secondary_langs = list("Siik'tajr")
 	name_language = "Siik'tajr"

code/modules/mob/living/carbon/human/species/station/station_vr.dm

@@ -15,6 +15,7 @@
 	secondary_langs = list("Sagaru")
 	name_language = "Sagaru"
 	color_mult = 1
+	egg_type = "Sergal"
 
 	min_age = 17
 	max_age = 80
@@ -61,6 +62,7 @@
 	secondary_langs = list("Skrellian")
 	name_language = "Skrellian"
 	color_mult = 1
+	egg_type = "Akula"
 
 	min_age = 17
 	max_age = 80
@@ -100,6 +102,7 @@
 	secondary_langs = list("Birdsong")
 	name_language = "Birdsong"
 	color_mult = 1
+	egg_type = "Nevrean"
 
 	min_age = 17
 	max_age = 80
@@ -137,6 +140,7 @@
 	num_alternate_languages = 2
 	secondary_langs = list("Siik'tajr")
 	name_language = "Siik'tajr"
+	egg_type = "Tajaran" //Placeholder.
 
 	min_age = 17
 	max_age = 80
@@ -182,6 +186,7 @@
 	num_alternate_languages = 2
 	secondary_langs = list("Siik'tajr")
 	name_language = "Siik'tajr"
+	egg_type = "Tajaran" //Placeholder.
 
 	min_age = 17
 	max_age = 80
@@ -234,6 +239,7 @@
 //	gluttonous = 1
 	num_alternate_languages = 2
 	color_mult = 1
+	egg_type = "Tajaran" //also placeholder. because I see other things using it
 
 	blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \
 	dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \
@@ -252,13 +258,19 @@
 	min_age = 17
 	max_age = 80
 
+//datum/species/vulpkanin //just to write it out, no idea where any of it goes -- Pooj
+//	egg_type = "Vulpkanin"
+
 /datum/species/unathi
+	egg_type = "Unathi"
 	spawn_flags = SPECIES_CAN_JOIN //Species_can_join is the only spawn flag all the races get, so that none of them will be whitelist only if whitelist is enabled.
 
 /datum/species/tajaran
+	egg_type = "Tajaran"
 	spawn_flags = SPECIES_CAN_JOIN
 
 /datum/species/skrell
+	egg_type = "Skrell"
 	spawn_flags = SPECIES_CAN_JOIN
 
 /datum/species/diona
@@ -268,9 +280,11 @@
 	spawn_flags = SPECIES_CAN_JOIN
 
 /datum/species/shapeshifter/promethean
+	egg_type = "Slime"
 	spawn_flags = SPECIES_CAN_JOIN
 
 /datum/species/human
+	egg_type = "Human"
 	color_mult = 1
 	icobase = 'icons/mob/human_races/r_human_vr.dmi'
 	deform = 'icons/mob/human_races/r_def_human_vr.dmi'

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -67,6 +67,7 @@
 /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu
 	name = "Joan's Workbag"
 	desc = "A duffle bag Joan uses to carry her work equipment."
+	slowdown = 0
 
 	New()
 		..()
@@ -85,6 +86,7 @@
 /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/Katarina
 	name = "Katarina's Workbag"
 	desc = "A duffle bag Katarina uses to carry her tools."
+	slowdown = 0
 
 	New()
 		..()

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -79,6 +79,8 @@
 	desc = "A beautifully crafted rapier owned by Joan Risu. It has a thin blade and is used for quick attacks."
 	icon = 'icons/vore/custom_items_vr.dmi'
 	icon_state = "joanaria"
+	icon_override = 'icons/vore/custom_items_vr.dmi'
+	item_state = "joanariamob"
 	origin_tech = "materials=7"
 	force = 15
 	sharp = 1
@@ -201,7 +203,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 	icon_state = "Flag_Nanotrasen"
 
 	icon_override = 'icons/vore/custom_items_vr.dmi'
-	item_state = "Flag_Nanotrasen"
+	item_state = "Flag_Nanotrasen_mob"
 
 	attack_self(mob/user as mob)
 		if(isliving(user))
@@ -220,7 +222,28 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 		icon_state = "flag_federation"
 
 		icon_override = 'icons/vore/custom_items_vr.dmi'
-		item_state = "flag_federation"
+		item_state = "flag_federation_mob"
+
+	xcom
+		name = "Alien Combat Command Banner"
+		desc = "A banner bearing the symbol of a task force fighting an unknown alien power."
+
+		icon = 'icons/vore/custom_items_vr.dmi'
+		icon_state = "flag_xcom"
+
+		icon_override = 'icons/vore/custom_items_vr.dmi'
+		item_state = "flag_xcom_mob"
+
+	advent
+		name = "ALIEN Coalition Banner"
+		desc = "A banner belonging to traitors who work for an unknown alien power."
+
+		icon = 'icons/vore/custom_items_vr.dmi'
+		icon_state = "flag_advent"
+
+		icon_override = 'icons/vore/custom_items_vr.dmi'
+		item_state = "flag_advent_mob"
+
 
 //zodiacshadow: ?
 /obj/item/device/radio/headset/fluff/zodiacshadow