cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-29 08:09:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5975 from Anewbe/promethean_retuning

Browse Source 
Promethean tuning
This commit is contained in:
Atermonera
2019-02-22 12:48:50 -08:00
committed by GitHub
parent f083fba4da 9e70392d5b
commit abae1a41de
2 changed files with 75 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/prometheans.dm
+37 -63
View File
@@ -58,17 +58,16 @@ var/datum/species/shapeshifter/promethean/prometheans
cloning_modifier = /datum/modifier/cloning_sickness/promethean
cold_level_1 = 280 //Default 260 - Lower is better
cold_level_2 = 220 //Default 200
cold_level_2 = 240 //Default 200
cold_level_3 = 130 //Default 120
heat_level_1 = 320 //Default 360
heat_level_2 = 370 //Default 400
heat_level_3 = 600 //Default 1000
body_temperature = 310.15
body_temperature = T20C // Room temperature
siemens_coefficient = 0.4
rarity_value = 5
rarity_value = 5
genders = list(MALE, FEMALE, NEUTER, PLURAL)
@@ -150,12 +149,13 @@ var/datum/species/shapeshifter/promethean/prometheans
H.gib()
/datum/species/shapeshifter/promethean/handle_environment_special(var/mob/living/carbon/human/H)
var/regen_brute = 1
var/regen_burn = 1
var/regen_tox = 1
var/regen_oxy = 1
var/healing = TRUE // Switches to FALSE if the environment's bad
var/turf/T = H.loc
if(H.fire_stacks < 0) // If you're soaked, you're melting
H.adjustToxLoss(2*heal_rate) // Doubled because 0.5 is miniscule, and fire_stacks are capped in both directions
healing = FALSE
var/turf/T = get_turf(H)
if(istype(T))
var/obj/effect/decal/cleanable/C = locate() in T
if(C && !(H.shoes || (H.wear_suit && (H.wear_suit.body_parts_covered & FEET))))
@@ -165,79 +165,53 @@ var/datum/species/shapeshifter/promethean/prometheans
S.dirt = 0
H.nutrition = min(500, max(0, H.nutrition + rand(15, 30)))
T = get_turf(H) // Swap over to an actual turf, because we need to get the pressure.
if(istype(T)) // Make sure it exists, and is a turf again.
var/datum/gas_mixture/environment = T.return_air()
var/pressure = environment.return_pressure()
var/affecting_pressure = H.calculate_affecting_pressure(pressure)
if(affecting_pressure <= hazard_low_pressure) // Dangerous low pressure stops the regeneration of physical wounds. Body is focusing on keeping them intact rather than sealing.
regen_brute = 0
regen_burn = 0
if(affecting_pressure <= hazard_low_pressure) // If you're in a vacuum, you don't heal
healing = FALSE
if(H.bodytemperature > heat_level_1 || H.bodytemperature < cold_level_1) // If you're too hot or cold, you don't heal
healing = FALSE
if(H.nutrition < 50) // If you're starving, you don't heal
healing = FALSE
// Heal remaining damage.
if(H.fire_stacks >= 0)
if(healing)
if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss())
var/nutrition_cost = 0
var/nutrition_debt = 0
var/starve_mod = 1
if(H.nutrition <= 25)
var/nutrition_cost = 0 // The total amount of nutrition drained every tick, when healing
var/starve_mod = 1 // Lowers healing, increases agony
if(H.nutrition <= 150) // This is when the icon goes red
starve_mod = 0.75
heal_rate *= starve_mod
if(regen_brute)
nutrition_debt = H.getBruteLoss()
H.adjustBruteLoss(-heal_rate * starve_mod)
nutrition_cost += nutrition_debt - H.getBruteLoss()
if(regen_burn)
nutrition_debt = H.getFireLoss()
H.adjustFireLoss(-heal_rate * starve_mod)
nutrition_cost += nutrition_debt - H.getFireLoss()
if(regen_oxy)
nutrition_debt = H.getOxyLoss()
H.adjustOxyLoss(-heal_rate * starve_mod)
nutrition_cost += nutrition_debt - H.getOxyLoss()
if(regen_tox)
nutrition_debt = H.getToxLoss()
H.adjustToxLoss(-heal_rate * starve_mod)
nutrition_cost += nutrition_debt - H.getToxLoss()
if(H.getBruteLoss())
H.adjustBruteLoss(-heal_rate)
nutrition_cost += heal_rate
if(H.getFireLoss())
H.adjustFireLoss(-heal_rate)
nutrition_cost += heal_rate
if(H.getOxyLoss())
H.adjustOxyLoss(-heal_rate)
nutrition_cost += heal_rate
if(H.getToxLoss())
H.adjustToxLoss(-heal_rate)
nutrition_cost += heal_rate
H.nutrition -= (3 * nutrition_cost) //Costs Nutrition when damage is being repaired, corresponding to the amount of damage being repaired.
H.nutrition = max(0, H.nutrition) //Ensure it's not below 0.
var/agony_to_apply = ((1 / starve_mod) * nutrition_cost) //Regenerating damage causes minor pain over time. Small injures will be no issue, large ones will cause problems.
if((H.getHalLoss() + agony_to_apply) <= 70) // Don't permalock, but make it far easier to knock them down.
H.apply_damage(agony_to_apply, HALLOSS)
else
H.adjustToxLoss(2*heal_rate) // Doubled because 0.5 is miniscule, and fire_stacks are capped in both directions
/datum/species/shapeshifter/promethean/get_blood_colour(var/mob/living/carbon/human/H)
return (H ? rgb(H.r_skin, H.g_skin, H.b_skin) : ..())
/datum/species/shapeshifter/promethean/get_flesh_colour(var/mob/living/carbon/human/H)
return (H ? rgb(H.r_skin, H.g_skin, H.b_skin) : ..())
/datum/species/shapeshifter/promethean/get_additional_examine_text(var/mob/living/carbon/human/H)
if(!stored_shock_by_ref["\ref[H]"])
return
var/t_she = "She is"
if(H.identifying_gender == MALE)
t_she = "He is"
else if(H.identifying_gender == PLURAL)
t_she = "They are"
else if(H.identifying_gender == NEUTER)
t_she = "It is"
switch(stored_shock_by_ref["\ref[H]"])
if(1 to 10)
return "[t_she] flickering gently with a little electrical activity."
if(11 to 20)
return "[t_she] glowing gently with moderate levels of electrical activity.\n"
if(21 to 35)
return "<span class='warning'>[t_she] glowing brightly with high levels of electrical activity.</span>"
if(35 to INFINITY)
return "<span class='danger'>[t_she] radiating massive levels of electrical activity!</span>"
html/changelogs/Anewbe - Prometheans.yml
+38
View File
@@ -0,0 +1,38 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Anewbe
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Promethean regeneration has been toned down. It will no longer provide healing if the Promethean is wet, too hungry, too hot, or too cold."
- tweak: "Prometheans are no longer shock resistant. They should now be more possible to catch them alive."
- tweak: "Promethean body temperature is now the default room temperature. They also hit cold_level_2 at a higher temperature."