mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
Adds belly-specific toggle setting for entrance logs (#6991)
This commit is contained in:
@@ -123,6 +123,7 @@
|
|||||||
var/cycle_sloshed = FALSE // Has vorgan entrance made a wet slosh this cycle? Soundspam prevention for multiple items entered.
|
var/cycle_sloshed = FALSE // Has vorgan entrance made a wet slosh this cycle? Soundspam prevention for multiple items entered.
|
||||||
var/egg_cycles = 0 // Process egg mode after 10 cycles.
|
var/egg_cycles = 0 // Process egg mode after 10 cycles.
|
||||||
var/recycling = FALSE // Recycling mode.
|
var/recycling = FALSE // Recycling mode.
|
||||||
|
var/entrance_logs = TRUE // Belly-specific entry message toggle.
|
||||||
|
|
||||||
/obj/belly/proc/GetFullnessFromBelly()
|
/obj/belly/proc/GetFullnessFromBelly()
|
||||||
if(!affects_vore_sprites)
|
if(!affects_vore_sprites)
|
||||||
|
|||||||
@@ -315,7 +315,8 @@
|
|||||||
"speedy_mob_processing",
|
"speedy_mob_processing",
|
||||||
"egg_name",
|
"egg_name",
|
||||||
"recycling",
|
"recycling",
|
||||||
"is_feedable", //CHOMP end of variables from CHOMP
|
"is_feedable",
|
||||||
|
"entrance_logs", //CHOMP end of variables from CHOMP
|
||||||
"egg_type",
|
"egg_type",
|
||||||
"save_digest_mode",
|
"save_digest_mode",
|
||||||
"eating_privacy_local",
|
"eating_privacy_local",
|
||||||
@@ -384,7 +385,7 @@
|
|||||||
//CHOMPEdit end
|
//CHOMPEdit end
|
||||||
|
|
||||||
//Generic entered message
|
//Generic entered message
|
||||||
if(!owner.mute_entry) //CHOMPEdit
|
if(!owner.mute_entry && entrance_logs) //CHOMPEdit
|
||||||
to_chat(owner,"<span class='notice'>[thing] slides into your [lowertext(name)].</span>")
|
to_chat(owner,"<span class='notice'>[thing] slides into your [lowertext(name)].</span>")
|
||||||
|
|
||||||
//Sound w/ antispam flag setting
|
//Sound w/ antispam flag setting
|
||||||
@@ -1718,7 +1719,8 @@
|
|||||||
dupe.sound_volume = sound_volume
|
dupe.sound_volume = sound_volume
|
||||||
dupe.egg_name = egg_name
|
dupe.egg_name = egg_name
|
||||||
dupe.recycling = recycling
|
dupe.recycling = recycling
|
||||||
dupe.is_feedable = is_feedable //CHOMP end of variables from CHOMP
|
dupe.is_feedable = is_feedable
|
||||||
|
dupe.entrance_logs = entrance_logs //CHOMP end of variables from CHOMP
|
||||||
|
|
||||||
dupe.belly_fullscreen = belly_fullscreen
|
dupe.belly_fullscreen = belly_fullscreen
|
||||||
dupe.disable_hud = disable_hud
|
dupe.disable_hud = disable_hud
|
||||||
|
|||||||
@@ -212,6 +212,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
|
|||||||
"egg_type" = selected.egg_type,
|
"egg_type" = selected.egg_type,
|
||||||
"egg_name" = selected.egg_name, //CHOMPAdd
|
"egg_name" = selected.egg_name, //CHOMPAdd
|
||||||
"recycling" = selected.recycling, //CHOMPAdd
|
"recycling" = selected.recycling, //CHOMPAdd
|
||||||
|
"entrance_logs" = selected.entrance_logs, //CHOMPAdd
|
||||||
"nutrition_percent" = selected.nutrition_percent,
|
"nutrition_percent" = selected.nutrition_percent,
|
||||||
"digest_brute" = selected.digest_brute,
|
"digest_brute" = selected.digest_brute,
|
||||||
"digest_burn" = selected.digest_burn,
|
"digest_burn" = selected.digest_burn,
|
||||||
@@ -870,7 +871,14 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
|
|||||||
if(new_recycling == 0)
|
if(new_recycling == 0)
|
||||||
new_belly.recycling = FALSE
|
new_belly.recycling = FALSE
|
||||||
if(new_recycling == 1)
|
if(new_recycling == 1)
|
||||||
new_belly.recycling = TRUE //CHOMPAdd End
|
new_belly.recycling = TRUE
|
||||||
|
|
||||||
|
if(isnum(belly_data["entrance_logs"]))
|
||||||
|
var/new_entrance_logs = belly_data["entrance_logs"]
|
||||||
|
if(new_entrance_logs == 0)
|
||||||
|
new_belly.entrance_logs = FALSE
|
||||||
|
if(new_entrance_logs == 1)
|
||||||
|
new_belly.entrance_logs = TRUE //CHOMPAdd End
|
||||||
|
|
||||||
if(istext(belly_data["selective_preference"]))
|
if(istext(belly_data["selective_preference"]))
|
||||||
var/new_selective_preference = belly_data["selective_preference"]
|
var/new_selective_preference = belly_data["selective_preference"]
|
||||||
@@ -2517,6 +2525,9 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
|
|||||||
if("b_feedable") //CHOMPAdd
|
if("b_feedable") //CHOMPAdd
|
||||||
host.vore_selected.is_feedable = !host.vore_selected.is_feedable
|
host.vore_selected.is_feedable = !host.vore_selected.is_feedable
|
||||||
. = TRUE
|
. = TRUE
|
||||||
|
if("b_entrance_logs") //CHOMPAdd
|
||||||
|
host.vore_selected.entrance_logs = !host.vore_selected.entrance_logs
|
||||||
|
. = TRUE
|
||||||
if("b_bulge_size")
|
if("b_bulge_size")
|
||||||
var/new_bulge = tgui_input_number(user, "Choose the required size prey must be to show up on examine, ranging from 25% to 200% Set this to 0 for no text on examine.", "Set Belly Examine Size.", max_value = 200, min_value = 0)
|
var/new_bulge = tgui_input_number(user, "Choose the required size prey must be to show up on examine, ranging from 25% to 200% Set this to 0 for no text on examine.", "Set Belly Examine Size.", max_value = 200, min_value = 0)
|
||||||
if(new_bulge == null)
|
if(new_bulge == null)
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ const digestModeToPreyMode = {
|
|||||||
* show_liq, liq_interacts, liq_reagent_gen, liq_reagent_type, liq_reagent_name,
|
* show_liq, liq_interacts, liq_reagent_gen, liq_reagent_type, liq_reagent_name,
|
||||||
* liq_reagent_transfer_verb, liq_reagent_nutri_rate, liq_reagent_capacity, liq_sloshing, liq_reagent_addons,
|
* liq_reagent_transfer_verb, liq_reagent_nutri_rate, liq_reagent_capacity, liq_sloshing, liq_reagent_addons,
|
||||||
* show_liq_fullness, liq_messages, liq_msg_toggle1, liq_msg_toggle2, liq_msg_toggle3, liq_msg_toggle4,
|
* show_liq_fullness, liq_messages, liq_msg_toggle1, liq_msg_toggle2, liq_msg_toggle3, liq_msg_toggle4,
|
||||||
* liq_msg_toggle5, liq_msg1, liq_msg2, liq_msg3, liq_msg4, liq_msg5, sound_volume, egg_name, recycling,
|
* liq_msg_toggle5, liq_msg1, liq_msg2, liq_msg3, liq_msg4, liq_msg5, sound_volume, egg_name, recycling, entrance_logs,
|
||||||
* custom_reagentcolor, custom_reagentalpha, liquid_overlay, max_liquid_level, mush_overlay, mush_color, mush_alpha, max_mush, min_mush, item_mush_val
|
* custom_reagentcolor, custom_reagentalpha, liquid_overlay, max_liquid_level, mush_overlay, mush_color, mush_alpha, max_mush, min_mush, item_mush_val
|
||||||
*
|
*
|
||||||
* To the tabs section of VoreSelectedBelly return
|
* To the tabs section of VoreSelectedBelly return
|
||||||
@@ -688,6 +688,7 @@ const VoreSelectedBellyOptions = (props, context) => {
|
|||||||
egg_type,
|
egg_type,
|
||||||
egg_name,
|
egg_name,
|
||||||
recycling,
|
recycling,
|
||||||
|
entrance_logs,
|
||||||
selective_preference,
|
selective_preference,
|
||||||
save_digest_mode,
|
save_digest_mode,
|
||||||
eating_privacy_local,
|
eating_privacy_local,
|
||||||
@@ -892,6 +893,16 @@ const VoreSelectedBellyOptions = (props, context) => {
|
|||||||
content={recycling ? 'Enabled' : 'Disabled'}
|
content={recycling ? 'Enabled' : 'Disabled'}
|
||||||
/>
|
/>
|
||||||
</LabeledList.Item>
|
</LabeledList.Item>
|
||||||
|
<LabeledList.Item label="Entrance Logs">
|
||||||
|
<Button
|
||||||
|
onClick={() =>
|
||||||
|
act('set_attribute', { attribute: 'b_entrance_logs' })
|
||||||
|
}
|
||||||
|
icon={entrance_logs ? 'toggle-on' : 'toggle-off'}
|
||||||
|
selected={entrance_logs}
|
||||||
|
content={entrance_logs ? 'Enabled' : 'Disabled'}
|
||||||
|
/>
|
||||||
|
</LabeledList.Item>
|
||||||
<LabeledList.Item label="Selective Mode Preference">
|
<LabeledList.Item label="Selective Mode Preference">
|
||||||
<Button
|
<Button
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user