From ecf23a205e862667290953693c2e5286f33cc91d Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 15 Sep 2024 22:31:19 -0400 Subject: [PATCH] size fixed (mostly) --- GainStation13/code/mechanics/fatness.dm | 2 +- .../modules/client/preferences/preferences.dm | 1 + code/__HELPERS/roundend.dm | 7 + .../configuration/entries/fetish_content.dm | 4 +- code/game/machinery/cryopod.dm | 6 + code/modules/client/preferences.dm | 185 +++++++++++++++++- code/modules/client/preferences_savefile.dm | 72 +++---- config/entries/fetish_content.txt | 4 +- hyperstation/code/modules/mob/mob_helpers.dm | 2 +- hyperstation/code/modules/resize/resizing.dm | 3 +- tgstation.dme | 1 - 11 files changed, 239 insertions(+), 48 deletions(-) diff --git a/GainStation13/code/mechanics/fatness.dm b/GainStation13/code/mechanics/fatness.dm index c2357413cf..6c1f844b03 100644 --- a/GainStation13/code/mechanics/fatness.dm +++ b/GainStation13/code/mechanics/fatness.dm @@ -189,7 +189,7 @@ GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/mainten if(client?.prefs?.weight_gain_extreme && !normalized) var/xwg_size = sqrt(fatness/FATNESS_LEVEL_BLOB) xwg_size = min(xwg_size, RESIZE_MACRO) - xwg_size = max(xwg_size, custom_body_size*0.01) + xwg_size = max(xwg_size, custom_body_size) if(xwg_size > RESIZE_BIG) //check if the size needs capping otherwise don't bother searching the list if(!is_type_in_list(get_area(src), GLOB.uncapped_resize_areas)) //if the area is not int the uncapped whitelist and new size is over the cap xwg_size = RESIZE_BIG diff --git a/GainStation13/code/modules/client/preferences/preferences.dm b/GainStation13/code/modules/client/preferences/preferences.dm index a7a5a9a95a..c50a4cf39e 100644 --- a/GainStation13/code/modules/client/preferences/preferences.dm +++ b/GainStation13/code/modules/client/preferences/preferences.dm @@ -64,6 +64,7 @@ ///What is the max weight that the person wishes to be? If set to FALSE, there will be no max weight var/max_weight = FALSE + var/body_size = 1 //Body Size in percent var/starting_weight = 0 //how thicc you wanna be at start var/permanent_fat = 0 //If it isn't the consequences of your own actions var/wg_rate = 0.5 diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 95e36ba1a5..d7d429281c 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -5,6 +5,13 @@ #define SERVER_LAST_ROUND "server last round" /datum/controller/subsystem/ticker/proc/gather_roundend_feedback() + //GS13 Process permanent fat + for(var/mob/m in GLOB.player_list) + if(iscarbon(m)) + var/mob/living/carbon/C = m + if(C) + C.perma_fat_save(C) + gather_antag_data() record_nuke_disk_location() var/json_file = file("[GLOB.log_directory]/round_end_data.json") diff --git a/code/controllers/configuration/entries/fetish_content.dm b/code/controllers/configuration/entries/fetish_content.dm index f15b815eb1..373d45e3f9 100644 --- a/code/controllers/configuration/entries/fetish_content.dm +++ b/code/controllers/configuration/entries/fetish_content.dm @@ -26,13 +26,13 @@ //Body size configs, the feature will be disabled if both min and max have the same value. /datum/config_entry/number/body_size_min - default = 0.9 + default = 0.5 //GS13 EDIT min_val = 0.1 //to avoid issues with zeros and negative values. max_val = RESIZE_DEFAULT_SIZE integer = FALSE /datum/config_entry/number/body_size_max - default = 1.25 + default = 2.0 //GS13 EDIT min_val = RESIZE_DEFAULT_SIZE integer = FALSE diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 0a037513f6..59d292f4e6 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -280,6 +280,12 @@ GLOBAL_LIST_EMPTY(cryopod_computers) var/mob/living/mob_occupant = occupant var/list/crew_member = list() + //GS13 Process permanent fat + if(iscarbon(mob_occupant)) + var/mob/living/carbon/C = mob_occupant + if(C) + C.perma_fat_save(C) + crew_member["name"] = mob_occupant.real_name if(mob_occupant.mind) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3c6faac42e..f3ed079c8d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -314,6 +314,43 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(!path) dat += "
Please create an account to save your preferences
" + // GS13 EDIT + if (body_size == null) + body_size = 1 + if (starting_weight == null) + starting_weight = 0 + if (wg_rate == null) + wg_rate = 0.5 + if (wl_rate == null) + wl_rate = 0.5 + if(isnull(stuckage)) + stuckage = 0 + if(isnull(max_weight)) + max_weight = 0 + if(isnull(chair_breakage)) + chair_breakage = 0 + + if(isnull(helplessness_no_movement)) + helplessness_no_movement = 0 + if(isnull(helplessness_clumsy)) + helplessness_clumsy = 0 + if(isnull(helplessness_clothing_back)) + helplessness_clothing_back = 0 + if(isnull(helplessness_clothing_jumpsuit)) + helplessness_clothing_jumpsuit = 0 + if(isnull(helplessness_hidden_face)) + helplessness_hidden_face = 0 + if(isnull(helplessness_mute)) + helplessness_mute = 0 + if(isnull(helplessness_no_buckle)) + helplessness_no_buckle = 0 + if(isnull(helplessness_nearsighted)) + helplessness_nearsighted = 0 + if(isnull(helplessness_clothing_misc)) + helplessness_clothing_misc = 0 + if(isnull(helplessness_immobile_arms)) + helplessness_immobile_arms = 0 + dat += "" dat += "
" @@ -518,6 +555,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Custom Species Name:[custom_species ? custom_species : "None"]
" dat += "Random Body:Randomize!
" dat += "Always Random Body:[be_random_body ? "Yes" : "No"]
" + //GS13 EDIT + dat += "Starting weight : [starting_weight]
" + dat += "Weight Gain Rate : [wg_rate]
" + dat += "Weight Loss Rate : [wl_rate]
" dat += "
Cycle background:[bgstate]
" dat += "" @@ -547,7 +588,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "#[features["mcolor3"]] Change
" mutant_colors = TRUE - dat += "Sprite Size: [features["body_size"]*100]%
" + dat += "Sprite Size: [(body_size * 100)]%
" //GS13 Edit if(!(NOEYES in pref_species.species_traits)) dat += "

Eye Type

" @@ -1306,7 +1347,56 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Ass Slapping: [(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"]
" dat += "Automatic Wagging: [(cit_toggles & NO_AUTO_WAG) ? "Disabled" : "Enabled"]
" dat += "" - if(GS13_PREFS_TAB) + + if(GS13_PREFS_TAB) + dat += "" + + dat +="" + + dat +="" + if(KEYBINDINGS_TAB) // Custom keybindings dat += "Keybindings:[(hotkeys) ? "Hotkeys" : "Input"]
" @@ -2716,9 +2806,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) gender = chosengender if("body_size") - var/new_body_size = input(user, "Choose your desired sprite size: ([CONFIG_GET(number/body_size_min)]-[CONFIG_GET(number/body_size_max)]%)\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: ([CONFIG_GET(number/body_size_min) * 100]-[CONFIG_GET(number/body_size_max) * 100]%)\nWarning: This may make your character look distorted. Additionally, any size under 100% takes a 10% maximum health penalty", "Character Preference", (body_size * 100)) as num|null if(new_body_size) - features["body_size"] = clamp(new_body_size * 0.01, CONFIG_GET(number/body_size_min), CONFIG_GET(number/body_size_max)) + body_size = clamp((new_body_size / 100), CONFIG_GET(number/body_size_min), CONFIG_GET(number/body_size_max)) //GS13 EDIT 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 @@ -2777,6 +2867,22 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(selected_body_sprite) chosen_limb_id = selected_body_sprite //this gets sanitized before loading + // GS13 + if("fatness") + var/new_fatness = input(user, "Choose your amount of fat at start :\n(0-8000), Fat changes appearance and move speed. \nThresholds are 170, 250, 330, 440, 840, 1240, 1840, 2540, 3440. Warning : If using the 'weak legs' trait, being too fat will make you immobile and unable to leave the shuttle without a wheelchair or help", "Character Preference") as num|null + if (new_fatness) + starting_weight = max(min( round(text2num(new_fatness)), 8000),0) + + if("wg_rate") + var/new_wg_rate = input(user, "Choose your weight gain rate from 0.1 (10%) to 2 (200%).\n Decimals such as 0.2 indicate 20% rate.\nDefault recommended rate is 0.5 (50%)", "Character Preference", wg_rate) as num|null + if (new_wg_rate) + wg_rate = max(min(round(text2num(new_wg_rate),0.01),2),0) + + if("wl_rate") + var/new_wl_rate = input(user, "Choose your weight loss rate from 0.1 (10%) to 2 (200%).\n Decimals such as 0.2 indicate 20% rate.\nDefault recommended rate is 0.5 (50%)", "Character Preference", wl_rate) as num|null + if (new_wl_rate) + wl_rate = max(min(round(text2num(new_wl_rate),0.01),2),0) + if("marking_down") // move the specified marking down var/index = text2num(href_list["marking_index"]) @@ -3217,6 +3323,67 @@ GLOBAL_LIST_EMPTY(preferences_datums) cit_toggles ^= NO_AUTO_WAG //END CITADEL EDIT + //GS13 EDIT + if("weight_gain_items") + weight_gain_items = !weight_gain_items + if("weight_gain_chems") + weight_gain_chems = !weight_gain_chems + if("weight_gain_food") + weight_gain_food = !weight_gain_food + if("weight_gain_weapons") + weight_gain_weapons = !weight_gain_weapons + if("weight_gain_magic") + weight_gain_magic = !weight_gain_magic + if("weight_gain_viruses") + weight_gain_viruses = !weight_gain_viruses + if("weight_gain_nanites") + weight_gain_nanites = !weight_gain_nanites + if("weight_gain_extreme") + weight_gain_extreme = !weight_gain_extreme + if("weight_gain_persistent") + weight_gain_persistent = !weight_gain_persistent + if("weight_gain_permanent") + weight_gain_permanent = !weight_gain_permanent + if("noncon_weight_gain") + noncon_weight_gain = !noncon_weight_gain + if("bot_feeding") + bot_feeding = !bot_feeding + if("stuckage") + stuckage = chose_weight("Choose the level of fatness where your weight will hinder your ability to go through airlocks? None will disable this alltogether", user) + if("chair_breakage") + chair_breakage = chose_weight("Choose the level of fatness where your weight will be too much for chairs to handle? None will disable this alltogether", user) + if("fatness_vulnerable") + fatness_vulnerable = !fatness_vulnerable + if("extreme_fatness_vulnerable") + extreme_fatness_vulnerable = !extreme_fatness_vulnerable + + if("blueberry_inflation") + blueberry_inflation = !blueberry_inflation + if("max_fatness") + max_weight = chose_weight("Choose your max fatness level, your weight will not go beyond this. None will let you gain without a limit", user) + + if("helplessness_no_movement") + helplessness_no_movement = chose_weight("Choose the level of fatness that you would like to be made completely able to move at. None will disable this alltogether", user) + if("helplessness_clumsy") + helplessness_clumsy = chose_weight("Choose the level of fatness that you would like to be made clumsy at. None will disable this alltogether", user) + if("helplessness_nearsighted") + helplessness_nearsighted = chose_weight("Choose the level of fatness that you would like to be made nearsighted at. None will disable this alltogether", user) + if("helplessness_hidden_face") + helplessness_hidden_face = chose_weight("Choose the level of fatness that you would like to have you face hidden at. None will disable this alltogether", user) + if("helplessness_mute") + helplessness_mute = chose_weight("Choose the level of fatness that you would like to be made unable to speak at. None will disable this alltogether", user) + if("helplessness_immobile_arms") + helplessness_immobile_arms = chose_weight("Choose the level of fatness that you would like to be made unable to use your arms at. None will disable this alltogether", user) + if("helplessness_clothing_jumpsuit") + helplessness_clothing_jumpsuit = chose_weight("Choose the level of fatness that you would like to be made unable to wear jumpsuits at. None will disable this alltogether", user) + if("helplessness_clothing_misc") + helplessness_clothing_misc = chose_weight("Choose the level of fatness that you would like to be made unable to wear other non-jumpsuit clothing at. None will disable this alltogether", user) + if("helplessness_clothing_back") + helplessness_clothing_back = chose_weight("Choose the level of fatness that you would like to be made unable to wear anything on your back at. None will disable this alltogether", user) + if("helplessness_no_buckle") + helplessness_no_buckle = chose_weight("Choose the level of fatness that you would like to be made unable to be buckled to anything at. None will disable this alltogether", user) + + //GS13 EDIT END if("ambientocclusion") ambientocclusion = !ambientocclusion @@ -3398,11 +3565,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) else if(firstspace == name_length) real_name += "[pick(GLOB.last_names)]" +/* GS13 EDIT //reset size if applicable if(character.dna.features["body_size"]) var/initial_old_size = character.dna.features["body_size"] character.dna.features["body_size"] = RESIZE_DEFAULT_SIZE character.dna.update_body_size(initial_old_size) +*/ + if(body_size) + character.custom_body_size = body_size character.real_name = nameless ? "[real_name] #[rand(10000, 99999)]" : real_name character.name = character.real_name @@ -3458,9 +3629,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) character.dna.nameless = character.nameless character.dna.custom_species = character.custom_species + /* GS13 EDIT var/old_size = RESIZE_DEFAULT_SIZE if(isdwarf(character)) character.dna.features["body_size"] = RESIZE_DEFAULT_SIZE + */ if((parent && parent.can_have_part("meat_type")) || pref_species.mutant_bodyparts["meat_type"]) character.type_of_meat = GLOB.meat_types[features["meat_type"]] @@ -3477,7 +3650,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) character.give_genitals(TRUE) //character.update_genitals() is already called on genital.update_appearance() - character.dna.update_body_size(old_size) + //GS13 EDIT character.dna.update_body_size(old_size) + if(character.custom_body_size) + character.resize(character.custom_body_size) //speech stuff if(custom_tongue != "default") diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index db2f1a331e..f1c972bff1 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -745,7 +745,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["body_is_always_random"] >> be_random_body S["gender"] >> gender S["body_model"] >> features["body_model"] - S["body_size"] >> features["body_size"] + S["body_size"] >> body_size S["age"] >> age S["hair_color"] >> hair_color S["facial_hair_color"] >> facial_hair_color @@ -927,6 +927,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["weight_gain_extreme"] >> weight_gain_extreme S["weight_gain_persistent"] >> weight_gain_persistent S["weight_gain_permanent"] >> weight_gain_permanent + S["starting_weight"] >> starting_weight + S["permanent_fat"] >> permanent_fat S["wg_rate"] >> wg_rate S["wl_rate"] >> wl_rate S["noncon_weight_gain"] >> noncon_weight_gain @@ -1031,7 +1033,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car var/static/size_max if(!size_max) size_max = CONFIG_GET(number/body_size_max) - features["body_size"] = sanitize_num_clamp(features["body_size"], size_min, size_max, RESIZE_DEFAULT_SIZE, 0.01) + body_size = sanitize_num_clamp(body_size, size_min, size_max, RESIZE_DEFAULT_SIZE, 0.01) var/static/list/B_sizes if(!B_sizes) @@ -1163,7 +1165,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["body_is_always_random"] , be_random_body) WRITE_FILE(S["gender"] , gender) WRITE_FILE(S["body_model"] , features["body_model"]) - WRITE_FILE(S["body_size"] , features["body_size"]) + WRITE_FILE(S["body_size"] , body_size) WRITE_FILE(S["age"] , age) WRITE_FILE(S["hair_color"] , hair_color) WRITE_FILE(S["facial_hair_color"] , facial_hair_color) @@ -1193,6 +1195,38 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["bark_speed"] , bark_speed) WRITE_FILE(S["bark_pitch"] , bark_pitch) WRITE_FILE(S["bark_variance"] , bark_variance) + //GS13 PREFS + WRITE_FILE(S["starting_weight"] , starting_weight) + WRITE_FILE(S["weight_gain_food"], weight_gain_food) + WRITE_FILE(S["weight_gain_items"], weight_gain_items) + WRITE_FILE(S["weight_gain_magic"], weight_gain_magic) + WRITE_FILE(S["weight_gain_viruses"], weight_gain_viruses) + WRITE_FILE(S["weight_gain_nanites"], weight_gain_nanites) + WRITE_FILE(S["weight_gain_chems"], weight_gain_chems) + WRITE_FILE(S["weight_gain_weapons"], weight_gain_weapons) + WRITE_FILE(S["weight_gain_extreme"], weight_gain_extreme) + WRITE_FILE(S["weight_gain_persistent"], weight_gain_persistent) + WRITE_FILE(S["weight_gain_permanent"], weight_gain_permanent) + WRITE_FILE(S["wg_rate"], wg_rate) + WRITE_FILE(S["wl_rate"], wl_rate) + WRITE_FILE(S["noncon_weight_gain"], noncon_weight_gain) + WRITE_FILE(S["bot_feeding"], bot_feeding) + WRITE_FILE(S["max_weight"], max_weight) + WRITE_FILE(S["helplessness_no_movement"], helplessness_no_movement) + WRITE_FILE(S["helplessness_clumsy"], helplessness_clumsy) + WRITE_FILE(S["helplessness_nearsighted"], helplessness_nearsighted) + WRITE_FILE(S["helplessness_hidden_face"], helplessness_hidden_face) + WRITE_FILE(S["helplessness_mute"], helplessness_mute) + WRITE_FILE(S["helplessness_immobile_arms"], helplessness_immobile_arms) + WRITE_FILE(S["helplessness_clothing_jumpsuit"], helplessness_clothing_jumpsuit) + WRITE_FILE(S["helplessness_clothing_misc"], helplessness_clothing_misc) + WRITE_FILE(S["helplessness_clothing_back"], helplessness_clothing_back) + WRITE_FILE(S["helplessness_no_buckle"], helplessness_no_buckle) + WRITE_FILE(S["stuckage"], stuckage) + WRITE_FILE(S["chair_breakage"], chair_breakage) + WRITE_FILE(S["fatness_vulnerable"], fatness_vulnerable) + WRITE_FILE(S["extreme_fatness_vulnerable"], extreme_fatness_vulnerable) + WRITE_FILE(S["blueberry_inflation"], blueberry_inflation) // records WRITE_FILE(S["security_records"] , security_records) @@ -1256,38 +1290,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["feature_hide_belly"], features["hide_belly"]) WRITE_FILE(S["feature_inflatable_belly"], features["inflatable_belly"]) - //GS13 PREFS - WRITE_FILE(S["weight_gain_food"], weight_gain_food) - WRITE_FILE(S["weight_gain_items"], weight_gain_items) - WRITE_FILE(S["weight_gain_magic"], weight_gain_magic) - WRITE_FILE(S["weight_gain_viruses"], weight_gain_viruses) - WRITE_FILE(S["weight_gain_nanites"], weight_gain_nanites) - WRITE_FILE(S["weight_gain_chems"], weight_gain_chems) - WRITE_FILE(S["weight_gain_weapons"], weight_gain_weapons) - WRITE_FILE(S["weight_gain_extreme"], weight_gain_extreme) - WRITE_FILE(S["weight_gain_persistent"], weight_gain_persistent) - WRITE_FILE(S["weight_gain_permanent"], weight_gain_permanent) - WRITE_FILE(S["wg_rate"], wg_rate) - WRITE_FILE(S["wl_rate"], wl_rate) - WRITE_FILE(S["noncon_weight_gain"], noncon_weight_gain) - WRITE_FILE(S["bot_feeding"], bot_feeding) - WRITE_FILE(S["max_weight"], max_weight) - WRITE_FILE(S["helplessness_no_movement"], helplessness_no_movement) - WRITE_FILE(S["helplessness_clumsy"], helplessness_clumsy) - WRITE_FILE(S["helplessness_nearsighted"], helplessness_nearsighted) - WRITE_FILE(S["helplessness_hidden_face"], helplessness_hidden_face) - WRITE_FILE(S["helplessness_mute"], helplessness_mute) - WRITE_FILE(S["helplessness_immobile_arms"], helplessness_immobile_arms) - WRITE_FILE(S["helplessness_clothing_jumpsuit"], helplessness_clothing_jumpsuit) - WRITE_FILE(S["helplessness_clothing_misc"], helplessness_clothing_misc) - WRITE_FILE(S["helplessness_clothing_back"], helplessness_clothing_back) - WRITE_FILE(S["helplessness_no_buckle"], helplessness_no_buckle) - WRITE_FILE(S["stuckage"], stuckage) - WRITE_FILE(S["chair_breakage"], chair_breakage) - WRITE_FILE(S["fatness_vulnerable"], fatness_vulnerable) - WRITE_FILE(S["extreme_fatness_vulnerable"], extreme_fatness_vulnerable) - WRITE_FILE(S["blueberry_inflation"], blueberry_inflation) - WRITE_FILE(S["feature_ooc_notes"], features["ooc_notes"]) WRITE_FILE(S["feature_color_scheme"], features["color_scheme"]) diff --git a/config/entries/fetish_content.txt b/config/entries/fetish_content.txt index b3448b3b30..edc22d1d6d 100644 --- a/config/entries/fetish_content.txt +++ b/config/entries/fetish_content.txt @@ -17,8 +17,8 @@ BUTT_MIN_SIZE_PREFS 1 BUTT_MAX_SIZE_PREFS 10 ## Body size configs, the feature will be disabled if both min and max have the same value. -BODY_SIZE_MIN 0.9 -BODY_SIZE_MAX 1.25 +BODY_SIZE_MIN 0.5 +BODY_SIZE_MAX 2.0 ## Allowed visibility toggles diff --git a/hyperstation/code/modules/mob/mob_helpers.dm b/hyperstation/code/modules/mob/mob_helpers.dm index de5372ffb7..50edbc330e 100644 --- a/hyperstation/code/modules/mob/mob_helpers.dm +++ b/hyperstation/code/modules/mob/mob_helpers.dm @@ -8,7 +8,7 @@ mob/proc/checkloadappearance() if(alert(H, "You should only load a character that has not currently died in the round. Do you accept this?", "Warning", "Yes", "No") == "Yes" && world.time <= (H.time_initialized + 900)) H.client?.prefs?.copy_to(H) if (H.custom_body_size) //Do they have a custom size set? - H.resize(H.custom_body_size * 0.01) + H.resize(H.custom_body_size) H.real_name = H.client?.prefs?.real_name H.mind.name = H.real_name //Makes sure to change their mind name to their real name. SSquirks.AssignQuirks(H, H.client, TRUE, FALSE, H.job, FALSE)//This Assigns the selected character's quirks diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index a330d32d6d..3d6a7859aa 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -4,7 +4,7 @@ /mob/living var/size_multiplier = 1 //multiplier for the mob's icon size atm var/previous_size = 1 - var/custom_body_size = 100 + var/custom_body_size = 1 //Cyanosis - Action that resizes the sprite for the client but nobody else. Say goodbye to attacking yourself when someone's above you lmao var/datum/action/sizecode_resize/small_sprite @@ -102,6 +102,7 @@ /datum/movespeed_modifier/size id = MOVESPEED_ID_SIZE + variable = TRUE /mob/living/proc/resize(var/new_size, var/animate = TRUE) size_multiplier = new_size //This will be passed into update_transform() and used to change health and speed. diff --git a/tgstation.dme b/tgstation.dme index faf117b01d..9c62457f8c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3909,7 +3909,6 @@ #include "GainStation13\code\clothing\haydee_suit.dm" #include "GainStation13\code\clothing\head.dm" #include "GainStation13\code\clothing\suits.dm" -#include "GainStation13\code\datums\bark.dm" #include "GainStation13\code\datums\components\fattening_door.dm" #include "GainStation13\code\datums\diseases\advance\symptoms\berry.dm" #include "GainStation13\code\datums\mutations\fatfang.dm"
" + dat += "

Weight prefs

" + dat += "Maximum Weight:[max_weight == FALSE ? "None" : max_weight]
" + dat += "NonCon - Weight Gain:[noncon_weight_gain == TRUE ? "Enabled" : "Disabled"]
" + dat += "Bot Feeding:[bot_feeding == TRUE ? "Enabled" : "Disabled"]
" + dat += "Blueberry Inflation:[blueberry_inflation == TRUE ? "Enabled" : "Disabled"]
" + + dat += "

Weight Gain Types

" + dat += "Food:[weight_gain_food == TRUE ? "Enabled" : "Disabled"]
" + dat += "Items:[weight_gain_items == TRUE ? "Enabled" : "Disabled"]
" + dat += "Chems:[weight_gain_chems == TRUE ? "Enabled" : "Disabled"]
" + dat += "Weapons:[weight_gain_weapons == TRUE ? "Enabled" : "Disabled"]
" + dat += "Magic:[weight_gain_magic == TRUE ? "Enabled" : "Disabled"]
" + dat += "Viruses:[weight_gain_viruses == TRUE ? "Enabled" : "Disabled"]
" + dat += "Nanites:[weight_gain_nanites == TRUE ? "Enabled" : "Disabled"]
" + dat += "		" + dat += "

GS13 Gameplay Preferences

" + dat += "Stuckage (at what weight will you get stuck in doors?):[stuckage == FALSE ? "Disabled" : stuckage]
" + dat += "Chair Breakage (at what weight will you break chairs?):[chair_breakage == FALSE ? "Disabled" : chair_breakage]
" + dat += "

" + dat += "This preference will allow items that work based on weight to work to you, usually to your detriment.
" + dat += "Fatness Vulnerability:[fatness_vulnerable == TRUE ? "Enabled" : "Disabled"]
" + dat += "

" + dat += "This preference functions similar to the one before but allows for items with more drastic effects. Do not enable this if you aren't okay with more drastic things happening to your character.
" + dat += "Extreme Fatness Vulnerability:[extreme_fatness_vulnerable == TRUE ? "Enabled" : "Disabled"]
" + dat += "

" + dat += "Extreme Weight Gain (Sprite Size scales with weight):[weight_gain_extreme == TRUE ? "Enabled" : "Disabled"]
" + dat += "Persistent Fat (endround/cryo weight becomes your new start weight):[weight_gain_persistent == TRUE ? "Enabled" : "Disabled"]
" + dat += "Permanent Weight (hard to remove and persistent weight):[weight_gain_permanent == TRUE ? "Enabled" : "Disabled"]
" + dat += "		" + dat += "

GS13 Helplessness Preferences

" + dat += "Please be careful when using these mechanics as not to use them in a way that negatively impacts those around you. If you are seriously needed for something, especially something station critical, do not use these as an excuse to ignore your duty.

" + dat += "No Movement:[helplessness_no_movement == FALSE ? "Disabled" : helplessness_no_movement]
" + dat += "Clumsy:[helplessness_clumsy == FALSE ? "Disabled" : helplessness_clumsy]
" + dat += "Nearsighted:[helplessness_nearsighted == FALSE ? "Disabled" : helplessness_nearsighted]
" + dat += "Hidden Face:[helplessness_hidden_face == FALSE ? "Disabled" : helplessness_hidden_face]
" + dat += "Mute:[helplessness_mute == FALSE ? "Disabled" : helplessness_mute]
" + dat += "Immobile Arms:[helplessness_immobile_arms == FALSE ? "Disabled" : helplessness_immobile_arms]
" + dat += "Clothing Jumpsuit:[helplessness_clothing_jumpsuit == FALSE ? "Disabled" : helplessness_clothing_jumpsuit]
" + dat += "Clothing, Suit, Boots, and Gloves:[helplessness_clothing_misc == FALSE ? "Disabled" : helplessness_clothing_misc]
" + dat += "Clothing Back:[helplessness_clothing_back == FALSE ? "Disabled" : helplessness_clothing_back]
" + dat += "No Buckle:[helplessness_no_buckle == FALSE ? "Disabled" : helplessness_no_buckle]
" + dat += "