Skip to content

Commit

Permalink
Merge pull request #28014 from mikomyazaki/spacie_mods
Browse files Browse the repository at this point in the history
Tweaks space-adapted species mods
  • Loading branch information
PsiOmegaDelta authored Jan 26, 2020
2 parents 0b36df1 + e08558e commit 322d24b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions code/__defines/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define SPECIES_FLAG_NO_TANGLE 0x0080 // This species wont get tangled up in weeds
#define SPECIES_FLAG_NO_BLOCK 0x0100 // Unable to block or defend itself from attackers.
#define SPECIES_FLAG_NEED_DIRECT_ABSORB 0x0200 // This species can only have their DNA taken by direct absorption.
#define SPECIES_FLAG_LOW_GRAV_ADAPTED 0x0400 // This species is used to lower than standard gravity, affecting stamina in high-grav

// unused: 0x8000 - higher than this will overflow

Expand Down
6 changes: 6 additions & 0 deletions code/datums/movement/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,12 @@

/mob/living/carbon/human/get_stamina_used_per_step()
var/mod = (1-((get_skill_value(SKILL_HAULING) - SKILL_MIN)/(SKILL_MAX - SKILL_MIN)))
if(species && (species.species_flags & SPECIES_FLAG_LOW_GRAV_ADAPTED))
if(has_gravity(src))
mod *= 1.2
else
mod *= 0.8

return config.minimum_sprint_cost + (config.skill_sprint_cost_range * mod)

/datum/movement_handler/mob/movement/proc/HandleGrabs(var/direction, var/old_turf)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/species/station/human_subspecies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
)

appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE_SPCR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR
species_flags = SPECIES_FLAG_LOW_GRAV_ADAPTED

hazard_high_pressure = HAZARD_HIGH_PRESSURE * 0.8 // Dangerously high pressure.
warning_high_pressure = WARNING_HIGH_PRESSURE * 0.8 // High pressure warning.
warning_low_pressure = WARNING_LOW_PRESSURE * 0.8 // Low pressure warning.
hazard_low_pressure = HAZARD_LOW_PRESSURE * 0.8 // Dangerously low pressure.

/datum/species/human/vatgrown
name = SPECIES_VATGROWN
Expand Down

0 comments on commit 322d24b

Please sign in to comment.