diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 089acf56f9..9b3bdde66c 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -697,7 +697,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if("preview" in icon_states(current_species.icobase))
usr << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[current_species.name].png")
dat += "
"
- dat += "Language: [current_species.language]
"
+ dat += "Language: [current_species.species_language]
"
dat += ""
if(current_species.spawn_flags & SPECIES_CAN_JOIN)
dat += "Often present on human stations."
diff --git a/code/modules/lore_codex/lore_data/species.dm b/code/modules/lore_codex/lore_data/species.dm
index 54d72e0718..b4cbec702d 100644
--- a/code/modules/lore_codex/lore_data/species.dm
+++ b/code/modules/lore_codex/lore_data/species.dm
@@ -7,6 +7,8 @@
/datum/lore/codex/page/unathi,
/datum/lore/codex/page/tajaran,
/datum/lore/codex/page/diona,
+ /datum/lore/codex/page/promethean,
+ /datum/lore/codex/page/vatborn,
/datum/lore/codex/category/teshari,
/datum/lore/codex/category/positronic,
/datum/lore/codex/category/drone
@@ -125,6 +127,18 @@
side of a wall, but this comes at a cost. Very loud noises are very painful for Teshari, so be mindful of \
your indoor voice when speaking with one. The Teshari are omnivorous but generally prefer to eat meat wherever possible."
+// Promethean Lore
+/datum/lore/codex/page/promethean/add_content()
+ name = "Promethean"
+ keywords += list("slime", "promethean")
+ data = "Words"
+
+// Vatborn Lore
+/datum/lore/codex/page/vatborn/add_content()
+ name = "Vatborn"
+ keywords += list("vatborn")
+ data = "More Words"
+
// Posi lore
/datum/lore/codex/category/positronic/add_content()
name = "Positronics"
diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm
index ef6bf12729..6e95330bf3 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm
@@ -5,6 +5,7 @@
deform = 'icons/mob/human_races/r_def_vox.dmi'
default_language = LANGUAGE_VOX
language = LANGUAGE_GALCOM
+ species_language = LANGUAGE_VOX
num_alternate_languages = 1
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/strong, /datum/unarmed_attack/bite/strong)
rarity_value = 4
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 00b2185ee9..bb5d989e45 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -47,6 +47,7 @@
// Language/culture vars.
var/default_language = LANGUAGE_GALCOM // Default language is used when 'say' is used without modifiers.
var/language = LANGUAGE_GALCOM // Default racial language, if any.
+ var/species_language = LANGUAGE_GALCOM // Used on the Character Setup screen
var/list/secondary_langs = list() // The names of secondary languages that are available to this species.
var/list/speech_sounds // A list of sounds to potentially play when speaking.
var/list/speech_chance // The likelihood of a speech sound playing.
diff --git a/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
index 89b1fc1bd7..2eeae8ffa7 100644
--- a/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
+++ b/code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
@@ -1,3 +1,4 @@
+/*
/datum/species/human/gravworlder
name = "grav-adapted Human"
name_plural = "grav-adapted Humans"
@@ -13,7 +14,9 @@
radiation_mod = 0.5
brute_mod = 0.85
slowdown = 1
+*/
+/*
/datum/species/human/spacer
name = "space-adapted Human"
name_plural = "space-adapted Humans"
@@ -27,23 +30,25 @@
flash_mod = 1.2
brute_mod = 1.1
burn_mod = 1.1
+*/
/datum/species/human/vatgrown
- name = "vat-grown Human"
- name_plural = "vat-grown Humans"
+ name = "Vatborn"
+ name_plural = "Vatborn"
blurb = "With cloning on the forefront of human scientific advancement, cheap mass production \
- of bodies is a very real and rather ethically grey industry. Vat-grown humans tend to be paler than \
- baseline, with no appendix and fewer inherited genetic disabilities, but a weakened metabolism."
+ of bodies is a very real and rather ethically grey industry. Vat-grown or Vatborn humans tend to be \
+ paler than baseline, with no appendix and fewer inherited genetic disabilities, but a weakened metabolism."
icobase = 'icons/mob/human_races/subspecies/r_vatgrown.dmi'
toxins_mod = 1.1
+ metabolic_rate = 1.15
has_organ = list(
- O_HEART = /obj/item/organ/heart,
- O_LUNGS = /obj/item/organ/lungs,
- O_LIVER = /obj/item/organ/liver,
- O_KIDNEYS = /obj/item/organ/kidneys,
- O_BRAIN = /obj/item/organ/brain,
- O_EYES = /obj/item/organ/eyes
+ O_HEART = /obj/item/organ/internal/heart,
+ O_LUNGS = /obj/item/organ/internal/lungs,
+ O_LIVER = /obj/item/organ/internal/liver,
+ O_KIDNEYS = /obj/item/organ/internal/kidneys,
+ O_BRAIN = /obj/item/organ/internal/brain,
+ O_EYES = /obj/item/organ/internal/eyes
)
/*
@@ -54,4 +59,4 @@
name_plural = "uplifted Chimpanzees"
blurb = "Ook ook."
icobase = 'icons/mob/human_races/subspecies/r_upliftedchimp.dmi'
-*/
+*/
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
index cc656dccba..5ab786f8f6 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -25,6 +25,7 @@ var/datum/species/shapeshifter/promethean/prometheans
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
health_hud_intensity = 2
num_alternate_languages = 3
+ species_language = LANGUAGE_SOL_COMMON
breath_type = null
poison_type = null
diff --git a/code/modules/mob/living/carbon/human/species/station/seromi.dm b/code/modules/mob/living/carbon/human/species/station/seromi.dm
index cca023406e..0a6e1df9a4 100644
--- a/code/modules/mob/living/carbon/human/species/station/seromi.dm
+++ b/code/modules/mob/living/carbon/human/species/station/seromi.dm
@@ -9,6 +9,7 @@
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_SCHECHI, LANGUAGE_SKRELLIAN)
name_language = LANGUAGE_SCHECHI
+ species_language = LANGUAGE_SCHECHI
min_age = 12
max_age = 45
health_hud_intensity = 3
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index 74bc46f8e4..f07ff9b119 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -9,6 +9,7 @@
interests, rampant cyber and bio-augmentation and secretive factions make life on most human \
worlds tumultous at best."
num_alternate_languages = 3
+ species_language = LANGUAGE_SOL_COMMON
secondary_langs = list(LANGUAGE_SOL_COMMON)
name_language = null // Use the first-name last-name generator rather than a language scrambler
min_age = 17
@@ -41,6 +42,7 @@
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_UNATHI)
name_language = LANGUAGE_UNATHI
+ species_language = LANGUAGE_UNATHI
health_hud_intensity = 2.5
min_age = 32
@@ -142,6 +144,7 @@
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_SIIK)
name_language = LANGUAGE_SIIK
+ species_language = LANGUAGE_SIIK
health_hud_intensity = 2.5
min_age = 17
@@ -218,6 +221,7 @@
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_SKRELLIAN, LANGUAGE_SCHECHI)
name_language = LANGUAGE_SKRELLIAN
+ species_language = LANGUAGE_SKRELLIAN
health_hud_intensity = 2
water_movement = -3
@@ -291,6 +295,7 @@
num_alternate_languages = 2
secondary_langs = list(LANGUAGE_ROOTGLOBAL)
name_language = LANGUAGE_ROOTLOCAL
+ species_language = LANGUAGE_ROOTLOCAL
health_hud_intensity = 2.5
item_slowdown_mod = 0.25
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 0e3b1f7695..184eed9852 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -29,7 +29,7 @@
var/gender = NEUTER
// Restrict some styles to specific species
- var/list/species_allowed = list("Human","Promethean")
+ var/list/species_allowed = list("Human","Promethean","Vatborn")
// Whether or not the accessory can be affected by colouration
var/do_colouration = 1
@@ -51,7 +51,7 @@
name = "Bald"
icon_state = "bald"
gender = MALE
- species_allowed = list("Human","Unathi","Promethean")
+ species_allowed = list("Human","Unathi","Promethean","Vatborn")
short
name = "Short Hair" // try to capatilize the names please~
@@ -203,12 +203,12 @@
bobcurl
name = "Bobcurl"
icon_state = "hair_bobcurl"
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human","Promethan","Vatborn","Unathi")
bob
name = "Bob"
icon_state = "hair_bobcut"
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human","Promethan","Vatborn","Unathi")
bobcutalt
name = "Chin Length Bob"
@@ -233,7 +233,7 @@
buzz
name = "Buzzcut"
icon_state = "hair_buzzcut"
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human","Promethan","Vatborn","Unathi")
shavehair
name = "Shaved Hair"
@@ -338,7 +338,7 @@
mohawk
name = "Mohawk"
icon_state = "hair_d"
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human","Promethan","Vatborn","Unathi")
jensen
name = "Adam Jensen Hair"
@@ -355,7 +355,7 @@
spiky
name = "Spiky"
icon_state = "hair_spikey"
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human","Promethan","Vatborn","Unathi")
kusangi
name = "Kusanagi Hair"
@@ -660,7 +660,7 @@
name = "Shaved"
icon_state = "bald"
gender = NEUTER
- species_allowed = list("Human","Unathi","Tajara","Skrell", "Machine","Teshari", "Vox","Promethean")
+ species_allowed = list("Human","Vatborn","Unathi","Tajara","Skrell", "Machine","Teshari", "Vox","Promethean")
watson
name = "Watson Mustache"
@@ -701,7 +701,7 @@
elvis
name = "Elvis Sideburns"
icon_state = "facial_elvis"
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human","Promethan","Vatborn","Unathi")
abe
name = "Abraham Lincoln Beard"
@@ -1336,12 +1336,12 @@
human
name = "Default human skin"
icon_state = "default"
- species_allowed = list("Human")
+ species_allowed = list("Human","Vatborn")
human_tatt01
name = "Tatt01 human skin"
icon_state = "tatt1"
- species_allowed = list("Human")
+ species_allowed = list("Human","Vatborn")
tajaran
name = "Default tajaran skin"
diff --git a/icons/mob/human_races/subspecies/r_vatgrown.dmi b/icons/mob/human_races/subspecies/r_vatgrown.dmi
index 8cb165b127..b2dcbd78ac 100644
Binary files a/icons/mob/human_races/subspecies/r_vatgrown.dmi and b/icons/mob/human_races/subspecies/r_vatgrown.dmi differ
diff --git a/polaris.dme b/polaris.dme
index 66e1fedb0e..57ac914183 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1717,6 +1717,7 @@
#include "code\modules\mob\living\carbon\human\species\outsider\skeleton.dm"
#include "code\modules\mob\living\carbon\human\species\outsider\vox.dm"
#include "code\modules\mob\living\carbon\human\species\station\golem.dm"
+#include "code\modules\mob\living\carbon\human\species\station\human_subspecies.dm"
#include "code\modules\mob\living\carbon\human\species\station\monkey.dm"
#include "code\modules\mob\living\carbon\human\species\station\prometheans.dm"
#include "code\modules\mob\living\carbon\human\species\station\seromi.dm"