diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index f55352b76d..a14f0b7a5c 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -69,7 +69,7 @@
//Set species_restricted list
switch(target_species)
if("Human", "Skrell") //humanoid bodytypes
- species_restricted = list("Human", "Skrell") //skrell/humans can wear each other's suits
+ species_restricted = list("Human", "Skrell", "Promethean") //skrell/humans can wear each other's suits
else
species_restricted = list(target_species)
@@ -91,7 +91,7 @@
//Set species_restricted list
switch(target_species)
if("Skrell")
- species_restricted = list("Human", "Skrell") //skrell helmets fit humans too
+ species_restricted = list("Human", "Skrell", "Promethean") //skrell helmets fit humans too
else
species_restricted = list(target_species)
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index d1b4a06d23..685cef7794 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -11,7 +11,7 @@
// flags_inv = HIDEEARS|BLOCKHAIR
//Species-specific stuff.
- species_restricted = list("Human")
+ species_restricted = list("Human", "Promethean")
sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
@@ -38,7 +38,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
- species_restricted = list("Human", "Skrell")
+ species_restricted = list("Human", "Skrell", "Promethean")
sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Tajara" = 'icons/mob/species/tajaran/suit.dmi',
diff --git a/code/modules/economy/economy_misc.dm b/code/modules/economy/economy_misc.dm
index e6862650e3..78c9e7d012 100644
--- a/code/modules/economy/economy_misc.dm
+++ b/code/modules/economy/economy_misc.dm
@@ -48,12 +48,13 @@
/var/list/economic_species_modifier = list(
- /datum/species/human = 10,
- /datum/species/skrell = 12,
- /datum/species/teshari = 9, // Skrell sponsored,
- /datum/species/tajaran = 7,
- /datum/species/unathi = 7,
- /datum/species/diona = 7
+ /datum/species/human = 10,
+ /datum/species/skrell = 12,
+ /datum/species/teshari = 9, // Skrell sponsored,
+ /datum/species/tajaran = 7,
+ /datum/species/unathi = 7,
+ /datum/species/diona = 7,
+ /datum/species/shapeshifter/promethean = 3
)
//---- The following corporations are friendly with NanoTrasen and loosely enable trade and travel:
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 e239b8118c..c8f8342256 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -14,7 +14,7 @@ var/datum/species/shapeshifter/promethean/prometheans
blood_color = "#05FF9B"
flesh_color = "#05FFFB"
- hunger_factor = DEFAULT_HUNGER_FACTOR //todo
+ hunger_factor = 0.2
reagent_tag = IS_SLIME
mob_size = MOB_SMALL
bump_flag = SLIME
@@ -36,22 +36,21 @@ var/datum/species/shapeshifter/promethean/prometheans
blood_volume = 560
min_age = 1
max_age = 5
- brute_mod = 0.5
+ brute_mod = 0.75
burn_mod = 2
- oxy_mod = 0
- total_health = 120
+ oxy_mod = 0
- cold_level_1 = 260
- cold_level_2 = 200
- cold_level_3 = 120
+ cold_level_1 = 280 //Default 260 - Lower is better
+ cold_level_2 = 220 //Default 200
+ cold_level_3 = 130 //Default 120
- heat_level_1 = 360
- heat_level_2 = 400
- heat_level_3 = 1000
+ heat_level_1 = 320 //Default 360
+ heat_level_2 = 370 //Default 400
+ heat_level_3 = 600 //Default 1000
body_temperature = 310.15
- siemens_coefficient = -1
+ siemens_coefficient = 0.3
rarity_value = 5
unarmed_types = list(/datum/unarmed_attack/slime_glomp)
@@ -83,7 +82,7 @@ var/datum/species/shapeshifter/promethean/prometheans
valid_transform_species = list("Human", "Unathi", "Tajara", "Skrell", "Diona", "Teshari", "Monkey")
monochromatic = 1
- var/heal_rate = 5 // Temp. Regen per tick.
+ var/heal_rate = 0.5 // Temp. Regen per tick.
/datum/species/shapeshifter/promethean/New()
..()
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 e49236af94..92fae53d3c 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -46,7 +46,7 @@
min_age = 32
max_age = 260
- blurb = "A heavily reptillian species, Unathi (or 'Sinta as they call themselves) hail from the \
+ blurb = "A heavily reptillian species, Unathi hail from the \
Uuosa-Eso system, which roughly translates to 'burning mother'.
Coming from a harsh, inhospitable \
planet, they mostly hold ideals of honesty, virtue, proficiency and bravery above all \
else, frequently even their own lives. They prefer warmer temperatures than most species and \
@@ -319,6 +319,7 @@
reagent_tag = IS_DIONA
genders = list(PLURAL)
+
/datum/species/diona/can_understand(var/mob/other)
var/mob/living/carbon/alien/diona/D = other
if(istype(D))
diff --git a/code/modules/organs/subtypes/unbreakable.dm b/code/modules/organs/subtypes/unbreakable.dm
index 9492d330e1..fcd819029e 100644
--- a/code/modules/organs/subtypes/unbreakable.dm
+++ b/code/modules/organs/subtypes/unbreakable.dm
@@ -53,19 +53,19 @@
/obj/item/organ/external/arm/unbreakable/slime
nonsolid = 1
- max_damage = 15
+ max_damage = 5
/obj/item/organ/external/arm/right/unbreakable/slime
nonsolid = 1
- max_damage = 15
+ max_damage = 5
/obj/item/organ/external/leg/unbreakable/slime
nonsolid = 1
- max_damage = 15
+ max_damage = 5
/obj/item/organ/external/leg/right/unbreakable/slime
nonsolid = 1
- max_damage = 15
+ max_damage = 5
/obj/item/organ/external/foot/unbreakable/slime
nonsolid = 1
@@ -85,4 +85,4 @@
/obj/item/organ/external/head/unbreakable/slime
nonsolid = 1
- max_damage = 15
+ max_damage = 5