cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4390 from Anewbe/species_blood_tweaks

Browse Source 
Makes species bleed out faster or slower
This commit is contained in:
Neerti
2017-12-06 00:43:59 -05:00
committed by GitHub
parent 8816f12925 c95206c9f3
commit fab9a877cc
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/carbon/human/species/species.dm
View File

@@ -39,6 +39,7 @@
var/virus_immune var/virus_immune
var/short_sighted // Permanent weldervision. var/short_sighted // Permanent weldervision.
var/blood_volume = 560 // Initial blood volume. var/blood_volume = 560 // Initial blood volume.
var/bloodloss_rate = 1 // Multiplier for how fast a species bleeds out. Higher = Faster
var/hunger_factor = 0.05 // Multiplier for hunger. var/hunger_factor = 0.05 // Multiplier for hunger.
var/taste_sensitivity = TASTE_NORMAL // How sensitive the species is to minute tastes. var/taste_sensitivity = TASTE_NORMAL // How sensitive the species is to minute tastes.

4
code/modules/mob/living/carbon/human/species/station/station.dm
View File

@@ -35,12 +35,14 @@
ambiguous_genders = TRUE ambiguous_genders = TRUE
gluttonous = 1 gluttonous = 1
slowdown = 0.5 slowdown = 0.5
total_health = 125
brute_mod = 0.85 brute_mod = 0.85
burn_mod = 0.85 burn_mod = 0.85
metabolic_rate = 0.85 metabolic_rate = 0.85
item_slowdown_mod = 0.5 item_slowdown_mod = 0.5
mob_size = MOB_LARGE mob_size = MOB_LARGE
blood_volume = 840 blood_volume = 840
bloodloss_rate = 0.75
num_alternate_languages = 3 num_alternate_languages = 3
secondary_langs = list(LANGUAGE_UNATHI) secondary_langs = list(LANGUAGE_UNATHI)
name_language = LANGUAGE_UNATHI name_language = LANGUAGE_UNATHI
@@ -235,6 +237,8 @@
flash_mod = 1.2 flash_mod = 1.2
chemOD_mod = 0.9 chemOD_mod = 0.9
bloodloss_rate = 1.5
ambiguous_genders = TRUE ambiguous_genders = TRUE
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED

3
code/modules/organs/blood.dm
View File

@@ -143,6 +143,9 @@ var/const/CE_STABLE_THRESHOLD = 0.5
var/blood_max = 0 var/blood_max = 0
var/blood_loss_divisor = 30 //lower factor = more blood loss var/blood_loss_divisor = 30 //lower factor = more blood loss
// Some species bleed out differently
blood_loss_divisor /= species.bloodloss_rate
// Some modifiers can make bleeding better or worse. Higher multiplers = more bleeding. // Some modifiers can make bleeding better or worse. Higher multiplers = more bleeding.
var/blood_loss_modifier_multiplier = 1.0 var/blood_loss_modifier_multiplier = 1.0
for(var/datum/modifier/M in modifiers) for(var/datum/modifier/M in modifiers)