diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index ec542208..1493274d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1020,7 +1020,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]
" //GS13 stuff goes here dat += "

GS13 Preferences

" - dat += "NonCon - Weight Gain:[noncon_weight_gain == TRUE ? "Enabled" : "Disabled"]
" + dat += "NonCon - Weight Gain:[noncon_weight_gain == TRUE ? "Enabled" : "Disabled"]
" dat += "

GS13 Weight Gain

" dat += "Weight Gain - Food:[weight_gain_food == TRUE ? "Enabled" : "Disabled"]
" @@ -2560,8 +2560,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("noncon_weight_gain") noncon_weight_gain = !noncon_weight_gain - - if("inflatable_belly") features["inflatable_belly"] = !features["inflatable_belly"] if("hide_belly") diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ff28a645..fd13ec6c 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -369,6 +369,9 @@ if(digitalcamo) msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly inhuman manner.\n" + if(client?.prefs.noncon_weight_gain) + msg += "Non-con fattening is allowed\n" + if (length(msg)) . += "[msg.Join("")]" msg += common_trait_examine() @@ -419,7 +422,7 @@ "\[Add comment\]"), "") else if(isobserver(user) && traitstring) . += "Traits: [traitstring]" - + SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) //This also handles flavor texts now . += "*---------*"