shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

typo

Browse Source
This commit is contained in:
Timothy Teakettle
2020-10-26 20:33:46 +00:00
parent 4e6146898c
commit f468e4940a
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/dna.dm
+8 -6
View File
@@ -699,11 +699,13 @@
//new size detected //new size detected
holder.resize = features["body_size"] / old_size holder.resize = features["body_size"] / old_size
holder.update_transform() holder.update_transform()
var/penalty_threshold = CONFIG_GET(number/threshold_body_size_penalty) if(iscarbon(holder))
if(features["body_size"] < penalty_threshold && old_size >= penalty_threshold) var/mob/living/carbon/C = holder
holder.maxhealth -= 10 //reduce the maxhealth var/penalty_threshold = CONFIG_GET(number/threshold_body_size_penalty)
else if(features["body_size"] < penalty_threshold && old_size >= penalty_threshold)
if(old_size < penalty_threshold && features["body_size"] >= penalty_threshold) C.maxHealth -= 10 //reduce the maxhealth
holder.maxhealth += 10 //give the maxhealth back else
if(old_size < penalty_threshold && features["body_size"] >= penalty_threshold)
C.maxHealth += 10 //give the maxhealth back
code/modules/client/preferences.dm
+2 -2
View File
@@ -2246,7 +2246,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("body_size") if("body_size")
var/new_body_size = input(user, "Choose your desired sprite size: (90-125%)\nWarning: This may make your character look distorted. Additionally, any size under 100% takes a 10% maximum health penalty", "Character Preference", features["body_size"]*100) as num|null var/new_body_size = input(user, "Choose your desired sprite size: (90-125%)\nWarning: This may make your character look distorted. Additionally, any size under 100% takes a 10% maximum health penalty", "Character Preference", features["body_size"]*100) as num|null
if(new_body_size) if(new_body_size)
body_size = clamp(new_body_size * 0.01, CONFIG_GET(number/body_size_min), CONFIG_GET(number/body_size_max)) features["body_size"] = clamp(new_body_size * 0.01, CONFIG_GET(number/body_size_min), CONFIG_GET(number/body_size_max))
if("tongue") if("tongue")
var/selected_custom_tongue = input(user, "Choose your desired tongue (none means your species tongue)", "Character Preference") as null|anything in GLOB.roundstart_tongues var/selected_custom_tongue = input(user, "Choose your desired tongue (none means your species tongue)", "Character Preference") as null|anything in GLOB.roundstart_tongues
@@ -2695,7 +2695,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/old_size = character.dna.features["body_size"] var/old_size = character.dna.features["body_size"]
if(isdwarf(character)) if(isdwarf(character))
character.dna.features["body_size"] = RESIZE_DEFAULT_SIZE character.dna.features["body_size"] = RESIZE_DEFAULT_SIZE
old_size = 1 old_size = RESIZE_DEFAULT_SIZE
if((parent && parent.can_have_part("meat_type")) || pref_species.mutant_bodyparts["meat_type"]) if((parent && parent.can_have_part("meat_type")) || pref_species.mutant_bodyparts["meat_type"])
character.type_of_meat = GLOB.meat_types[features["meat_type"]] character.type_of_meat = GLOB.meat_types[features["meat_type"]]