diff --git a/GainStation13/code/modules/client/preferences/preferences.dm b/GainStation13/code/modules/client/preferences/preferences.dm index c50a4cf39e..38206706a8 100644 --- a/GainStation13/code/modules/client/preferences/preferences.dm +++ b/GainStation13/code/modules/client/preferences/preferences.dm @@ -57,6 +57,8 @@ ///Does the person wish to be involved with non-con weight gain events? var/noncon_weight_gain = FALSE + ///Does the person want to get into confrontation? + var/trouble_seeker = FALSE //Does the person wish to be fed from bots? var/bot_feeding = FALSE diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 5602cee2fd..5d9c7d15a8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1383,6 +1383,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "

Weight prefs

" dat += "Maximum Weight:[max_weight == FALSE ? "None" : max_weight]
" dat += "NonCon - Weight Gain:[noncon_weight_gain == TRUE ? "Enabled" : "Disabled"]
" + dat += "Show that you want to be confronted:[trouble_seeker == TRUE ? "Enabled" : "Disabled"]
" dat += "Bot Feeding:[bot_feeding == TRUE ? "Enabled" : "Disabled"]
" dat += "Blueberry Inflation:[blueberry_inflation == TRUE ? "Enabled" : "Disabled"]
" @@ -3401,6 +3402,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) weight_gain_permanent = !weight_gain_permanent if("noncon_weight_gain") noncon_weight_gain = !noncon_weight_gain + if("trouble_seeker") + trouble_seeker = !trouble_seeker if("bot_feeding") bot_feeding = !bot_feeding if("stuckage") diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 479212b290..46fae6d82c 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -933,6 +933,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["wg_rate"] >> wg_rate S["wl_rate"] >> wl_rate S["noncon_weight_gain"] >> noncon_weight_gain + S["trouble_seeker"] >> trouble_seeker S["bot_feeding"] >> bot_feeding S["max_weight"] >> max_weight S["helplessness_no_movement"] >> helplessness_no_movement @@ -1216,6 +1217,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car 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["trouble_seeker"], trouble_seeker) WRITE_FILE(S["bot_feeding"], bot_feeding) WRITE_FILE(S["max_weight"], max_weight) WRITE_FILE(S["helplessness_no_movement"], helplessness_no_movement) diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 8d0b5db663..ba41c0231a 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -172,6 +172,8 @@ //GS13 EDIT START if(client?.prefs?.noncon_weight_gain) msg += "Non-con fattening is allowed\n" + if(client?.prefs?.trouble_seeker) + msg += "[t_He] seems to want to be confronted.\n" //GS13 EDIT END var/trait_exam = common_trait_examine() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index d727d9cfff..a8d4bef939 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -429,6 +429,8 @@ //GS13 EDIT START if(client?.prefs?.noncon_weight_gain) . += "\nNon-con fattening is allowed\n" + if(client?.prefs?.trouble_seeker) + . += "[t_He] seems to want to be confronted.\n" //GS13 EDIT END var/trait_exam = common_trait_examine()