From b66f050c1a33b40609dc4fbe0f2bed2b2a6e8c9c Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Fri, 28 Jun 2024 00:40:04 -0400 Subject: [PATCH] feedback --- GainStation13/code/mechanics/helplessness.dm | 6 +++--- code/modules/client/preferences.dm | 4 ++-- .../mob/living/carbon/human/species.dm | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/GainStation13/code/mechanics/helplessness.dm b/GainStation13/code/mechanics/helplessness.dm index 12f2f896..d04c12e7 100644 --- a/GainStation13/code/mechanics/helplessness.dm +++ b/GainStation13/code/mechanics/helplessness.dm @@ -5,15 +5,15 @@ return ..() /datum/species/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self) - if(HAS_TRAIT(H, TRAIT_NO_BACKPACK) && slot == ITEM_SLOT_BACK) + if(HAS_TRAIT(H, TRAIT_NO_BACKPACK) && slot == SLOT_BACK) to_chat(H, "You are too fat to wear anything on your back.") return FALSE - if(HAS_TRAIT(H, TRAIT_NO_JUMPSUIT) && slot == ITEM_SLOT_ICLOTHING) + if(HAS_TRAIT(H, TRAIT_NO_JUMPSUIT) && slot == SLOT_W_UNIFORM) to_chat(H, "You are too fat to wear [I].") return FALSE - if(HAS_TRAIT(H, TRAIT_NO_MISC) && (slot == ITEM_SLOT_FEET || slot == ITEM_SLOT_GLOVES || slot == ITEM_SLOT_OCLOTHING)) + if(HAS_TRAIT(H, TRAIT_NO_MISC) && (slot == SLOT_SHOES || slot == SLOT_GLOVES || slot == SLOT_WEAR_SUIT)) to_chat(H, "You are too fat to wear [I].") return FALSE diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index fabf8b6c..939be5df 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1079,8 +1079,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) 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 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]
" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 55bc4714..bb23d9f1 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1362,57 +1362,71 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(preferences.helplessness_no_movement) if(!HAS_TRAIT_FROM(fatty, TRAIT_NO_MOVE, HELPLESSNESS_TRAIT)) if(fatty.fatness >= preferences.helplessness_no_movement) + to_chat(fatty, "You have become too fat to move anymore.") ADD_TRAIT(fatty, TRAIT_NO_MOVE, HELPLESSNESS_TRAIT) else if(fatty.fatness < preferences.helplessness_no_movement) + to_chat(fatty, "You have become thin enough to regain some of your mobility.") REMOVE_TRAIT(fatty, TRAIT_NO_MOVE, HELPLESSNESS_TRAIT) if(preferences.helplessness_clumsy) if(!HAS_TRAIT_FROM(fatty, TRAIT_CLUMSY, HELPLESSNESS_TRAIT)) if(fatty.fatness >= preferences.helplessness_clumsy) + to_chat(fatty, "Your newfound weight has made it hard to manipulate objects.") ADD_TRAIT(fatty, TRAIT_CLUMSY, HELPLESSNESS_TRAIT) else if(fatty.fatness < preferences.helplessness_clumsy) + to_chat(fatty, "You feel like you have lost enough weight to recover your dexterity.") REMOVE_TRAIT(fatty, TRAIT_CLUMSY, HELPLESSNESS_TRAIT) if(preferences.helplessness_nearsighted) if(!HAS_TRAIT_FROM(fatty, TRAIT_NEARSIGHT, HELPLESSNESS_TRAIT)) if(fatty.fatness >= preferences.helplessness_nearsighted) + to_chat(fatty, "Your fat makes it difficult to see the world around you. ") fatty.become_nearsighted(HELPLESSNESS_TRAIT) else if(fatty.fatness < preferences.helplessness_nearsighted) + to_chat(fatty, "You are thin enough to see your enviornment again. ") fatty.cure_nearsighted(HELPLESSNESS_TRAIT) if(preferences.helplessness_hidden_face) if(!HAS_TRAIT_FROM(fatty, TRAIT_DISFIGURED, HELPLESSNESS_TRAIT)) if(fatty.fatness >= preferences.helplessness_hidden_face) + to_chat(fatty, "You have gotten fat enough that your face is now unrecognizable. ") ADD_TRAIT(fatty, TRAIT_DISFIGURED, HELPLESSNESS_TRAIT) else if(fatty.fatness < preferences.helplessness_hidden_face) + to_chat(fatty, "You have lost enough weight to allow people to now recognize your face.") REMOVE_TRAIT(fatty, TRAIT_DISFIGURED, HELPLESSNESS_TRAIT) if(preferences.helplessness_mute) if(!HAS_TRAIT_FROM(fatty, TRAIT_MUTE, HELPLESSNESS_TRAIT)) if(fatty.fatness >= preferences.helplessness_mute) + to_chat(fatty, "Your fat makes it impossible for you to speak.") ADD_TRAIT(fatty, TRAIT_MUTE, HELPLESSNESS_TRAIT) else if(fatty.fatness < preferences.helplessness_mute) + to_chat(fatty, "You are thin enough now to be able to speak again. ") REMOVE_TRAIT(fatty, TRAIT_MUTE, HELPLESSNESS_TRAIT) if(preferences.helplessness_immobile_arms) if(!HAS_TRAIT_FROM(fatty, TRAIT_PARALYSIS_L_ARM, HELPLESSNESS_TRAIT)) if(fatty.fatness >= preferences.helplessness_immobile_arms) + to_chat(fatty, "Your arms are now engulfed in fat, making it impossible to move your arms. ") ADD_TRAIT(fatty, TRAIT_PARALYSIS_L_ARM, HELPLESSNESS_TRAIT) ADD_TRAIT(fatty, TRAIT_PARALYSIS_R_ARM, HELPLESSNESS_TRAIT) + fatty.update_disabled_bodyparts() else if(fatty.fatness < preferences.helplessness_immobile_arms) + to_chat(fatty, "You are able to move your arms again. ") REMOVE_TRAIT(fatty, TRAIT_PARALYSIS_L_ARM, HELPLESSNESS_TRAIT) REMOVE_TRAIT(fatty, TRAIT_PARALYSIS_R_ARM, HELPLESSNESS_TRAIT) + fatty.update_disabled_bodyparts() if(preferences.helplessness_clothing_jumpsuit) @@ -1426,6 +1440,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) fatty.dropItemToGround(jumpsuit) else if(fatty.fatness < preferences.helplessness_clothing_jumpsuit) + to_chat(fatty, "You feel thin enough to put on jumpsuits now. ") REMOVE_TRAIT(fatty, TRAIT_NO_JUMPSUIT, HELPLESSNESS_TRAIT) @@ -1450,6 +1465,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) fatty.dropItemToGround(worn_shoes) else if(fatty.fatness < preferences.helplessness_clothing_misc) + to_chat(fatty, "You feel thin enough to put on suits, shoes, and gloves now. ") REMOVE_TRAIT(fatty, TRAIT_NO_MISC, HELPLESSNESS_TRAIT) @@ -1463,15 +1479,18 @@ GLOBAL_LIST_EMPTY(roundstart_races) fatty.dropItemToGround(back_item) else if(fatty.fatness < preferences.helplessness_clothing_back) + to_chat(fatty, "You feel thin enough to hold items on your back now. ") REMOVE_TRAIT(fatty, TRAIT_NO_BACKPACK, HELPLESSNESS_TRAIT) if(preferences.helplessness_no_buckle) if(!HAS_TRAIT_FROM(fatty, TRAIT_NO_BUCKLE, HELPLESSNESS_TRAIT)) if(fatty.fatness >= preferences.helplessness_no_buckle) + to_chat(fatty, "You feel like you've gotten too big to fit on anything.") ADD_TRAIT(fatty, TRAIT_NO_BUCKLE, HELPLESSNESS_TRAIT) else if(fatty.fatness < preferences.helplessness_no_buckle) + to_chat(fatty, "You feel thin enough to sit on things again. ") REMOVE_TRAIT(fatty, TRAIT_NO_BUCKLE, HELPLESSNESS_TRAIT)