Digestion Pain Pref (#15944)

This commit is contained in:
SatinIsle
2024-05-05 09:21:45 +10:00
committed by GitHub
parent df263998fa
commit ca9b452316
9 changed files with 68 additions and 29 deletions
@@ -1622,6 +1622,12 @@
/mob/living/carbon/human/can_feel_pain(var/obj/item/organ/check_organ)
if(isSynthetic())
return 0
//RS ADD START
if(!digest_pain && (isbelly(src.loc) || istype(src.loc, /turf/simulated/floor/water/digestive_enzymes)))
var/obj/belly/b = src.loc
if(b.digest_mode == DM_DIGEST || b.digest_mode == DM_SELECT)
return FALSE
//RS ADD END
for(var/datum/modifier/M in modifiers)
if(M.pain_immunity == TRUE)
return 0
@@ -40,6 +40,7 @@
drop_vore = client.prefs_vr.drop_vore
stumble_vore = client.prefs_vr.stumble_vore
slip_vore = client.prefs_vr.slip_vore
digest_pain = client.prefs_vr.digest_pain
resizable = client.prefs_vr.resizable
show_vore_fx = client.prefs_vr.show_vore_fx
+1
View File
@@ -247,6 +247,7 @@
P.slip_vore = src.slip_vore
P.throw_vore = src.throw_vore
P.food_vore = src.food_vore
P.digest_pain = src.digest_pain
P.stumble_vore = src.stumble_vore
P.eating_privacy_global = src.eating_privacy_global
+1
View File
@@ -19,6 +19,7 @@
var/drop_vore = TRUE //Enabled by default since you have to enable drop pred/prey to do this anyway
var/throw_vore = TRUE //Enabled by default since you have to enable drop pred/prey to do this anyway
var/food_vore = TRUE //Enabled by default since you have to enable drop pred/prey to do this anyway
var/digest_pain = TRUE
var/can_be_drop_prey = FALSE
var/can_be_drop_pred = FALSE
var/allow_spontaneous_tf = FALSE // Obviously.
+6
View File
@@ -62,6 +62,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
var/throw_vore = TRUE
var/food_vore = TRUE
var/digest_pain = TRUE
var/resizable = TRUE
var/show_vore_fx = TRUE
var/step_mechanics_pref = FALSE
@@ -185,6 +187,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
food_vore = json_from_file["food_vore"]
throw_vore = json_from_file["throw_vore"]
stumble_vore = json_from_file["stumble_vore"]
digest_pain = json_from_file["digest_pain"]
nutrition_message_visible = json_from_file["nutrition_message_visible"]
nutrition_messages = json_from_file["nutrition_messages"]
weight_message_visible = json_from_file["weight_message_visible"]
@@ -238,6 +241,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
stumble_vore = TRUE
if(isnull(food_vore))
food_vore = TRUE
if(isnull(digest_pain))
digest_pain = TRUE
if(isnull(nutrition_message_visible))
nutrition_message_visible = TRUE
if(isnull(weight_message_visible))
@@ -309,6 +314,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
"stumble_vore" = stumble_vore,
"throw_vore" = throw_vore,
"food_vore" = food_vore,
"digest_pain" = digest_pain,
"nutrition_message_visible" = nutrition_message_visible,
"nutrition_messages" = nutrition_messages,
"weight_message_visible" = weight_message_visible,
+5
View File
@@ -316,6 +316,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
"stumble_vore" = host.stumble_vore,
"throw_vore" = host.throw_vore,
"food_vore" = host.food_vore,
"digest_pain" = host.digest_pain,
"nutrition_message_visible" = host.nutrition_message_visible,
"nutrition_messages" = host.nutrition_messages,
"weight_message_visible" = host.weight_message_visible,
@@ -587,6 +588,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
host.food_vore = !host.food_vore
unsaved_changes = TRUE
return TRUE
if("toggle_digest_pain")
host.digest_pain = !host.digest_pain
unsaved_changes = TRUE
return TRUE
if("switch_selective_mode_pref")
host.selective_preference = tgui_input_list(usr, "What would you prefer happen to you with selective bellymode?","Selective Bellymode", list(DM_DEFAULT, DM_DIGEST, DM_ABSORB, DM_DRAIN))
if(!(host.selective_preference))