Skip to content

Commit

Permalink
followup
Browse files Browse the repository at this point in the history
  • Loading branch information
MosleyTheMalO committed Oct 8, 2023
1 parent 7b5ecc7 commit 0770dfc
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 18 deletions.
1 change: 1 addition & 0 deletions code/__HELPERS/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@
"vag_accessible" = FALSE,
"butt_accessible" = FALSE,
"anus_accessible" = FALSE,
"belly_accessible" = FALSE,

"ipc_screen" = snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None",
"ipc_antenna" = "None",
Expand Down
4 changes: 4 additions & 0 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
"vag_accessible" = FALSE,
"butt_accessible" = FALSE,
"anus_accessible" = FALSE,
"belly_accessible" = FALSE,
"cock_stuffing" = FALSE,
"balls_stuffing" = FALSE,
"vag_stuffing" = FALSE,
Expand Down Expand Up @@ -995,6 +996,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Min Size:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=belly_min_size;task=input'>[features["belly_min_size"] ? features["belly_min_size"] : "Disabled" ]</a>"
dat += "<b>Belly Visibility:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=belly_visibility;task=input'>[features["belly_visibility"]]</a>"
dat += "<b>Egg Stuffing:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=belly_stuffing'>[features["belly_stuffing"] == TRUE ? "Yes" : "No"]</a>"
dat += "<b>Belly Always Accessible:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=belly_accessible'>[features["belly_accessible"] ? "Yes" : "No"]</a>"
dat += "</td>"
if(all_quirks.Find("Dullahan"))
dat += APPEARANCE_CATEGORY_COLUMN
Expand Down Expand Up @@ -3452,6 +3454,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
features["butt_accessible"] = !features["butt_accessible"]
if("anus_accessible")
features["anus_accessible"] = !features["anus_accessible"]
if("belly_accessible")
features["belly_accessible"] = !features["belly_accessible"]
if("widescreenpref")
widescreenpref = !widescreenpref
user.client.view_size.setDefault(getScreenSize(widescreenpref))
Expand Down
3 changes: 3 additions & 0 deletions code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
"vag_accessible" = FALSE,
"butt_accessible" = FALSE,
"anus_accessible" = FALSE,
"belly_accessible" = FALSE,
"inert_eggs" = FALSE,
"ipc_screen" = "Sunburst",
"ipc_antenna" = "None",
Expand Down Expand Up @@ -1042,6 +1043,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["feature_belly_size"] >> features["belly_size"]
S["feature_belly_color"] >> features["belly_color"]
S["feature_belly_visibility"] >> features["belly_visibility"]
S["feature_belly_accessible"] >> features["belly_accessible"]
//anus features
S["feature_has_anus"] >> features["has_anus"]
S["feature_anus_color"] >> features["anus_color"]
Expand Down Expand Up @@ -1456,6 +1458,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["feature_belly_size"], features["belly_size"])
WRITE_FILE(S["feature_belly_visibility"], features["belly_visibility"])
WRITE_FILE(S["feature_belly_stuffing"], features["belly_stuffing"])
WRITE_FILE(S["feature_belly_accessible"], features["belly_accessible"])

WRITE_FILE(S["feature_has_anus"], features["has_anus"])
WRITE_FILE(S["feature_anus_color"], features["anus_color"])
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Time before sending the user to cryo
/datum/config_entry/number/autocryo_time_trigger
config_entry_value = 24000
default = 24000
min_val = 600
integer = TRUE

Expand All @@ -9,7 +9,7 @@

// Time before deleting a disconnected ghost
/datum/config_entry/number/ghost_check_time
config_entry_value = 10 MINUTES
default = 10 MINUTES
min_val = 600
integer = TRUE

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/datum/config_entry/string/discordbotcommandprefix
config_entry_value = "?"
default = "?"

/datum/config_entry/string/chat_new_game_notifications
config_entry_value = null
default = null

/datum/config_entry/string/verification_channel

/datum/config_entry/string/verification_command
config_entry_value = "verify"
default = "verify"

/datum/config_entry/flag/forced_discord_stay

Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
/datum/config_entry/number/belly_min_size_prefs
config_entry_value = BELLY_SIZE_MIN
default = BELLY_SIZE_MIN
min_val = BELLY_SIZE_MIN
max_val = BELLY_SIZE_MAX

/datum/config_entry/number/belly_max_size_prefs
config_entry_value = BELLY_SIZE_MAX
default = BELLY_SIZE_MAX
min_val = BELLY_SIZE_MIN
max_val = BELLY_SIZE_MAX

/datum/config_entry/number/diameter_ratio_min_size_prefs
config_entry_value = COCK_DIAMETER_RATIO_MIN
default = COCK_DIAMETER_RATIO_MIN

/datum/config_entry/number/diameter_ratio_max_size_prefs
config_entry_value = COCK_DIAMETER_RATIO_MAX
default = COCK_DIAMETER_RATIO_MAX

/datum/config_entry/number/max_pick_ratio //Maximum ratio between pick target/picker user
config_entry_value = 0.5
default = 0.5
min_val = 0
integer = FALSE

/datum/config_entry/number/sex_table_multiplier
config_entry_value = 50
default = 50
min_val = 0

/datum/config_entry/flag/old_size_penalties

/datum/config_entry/number/macro_health_cap
config_entry_value = 3.5 //21 ft
default = 3.5 //21 ft
integer = FALSE
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/datum/config_entry/flag/enable_global_barks

/datum/config_entry/number/max_infinidorms
config_entry_value = 5
default = 5

/datum/config_entry/flag/weighted_station_traits

/datum/config_entry/number/base_save_slots
config_entry_value = DEFAULT_SAVE_SLOTS
default = DEFAULT_SAVE_SLOTS

/datum/config_entry/flag/sm_delamination

Expand All @@ -15,4 +15,4 @@
/datum/config_entry/flag/character_color_limits

/datum/config_entry/number/max_jukebox_songs
config_entry_value = -1
default = -1
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/datum/config_entry/number/min_continue_votes
config_entry_value = 1
default = 1
min_val = 1

/datum/config_entry/number/upload_limit
protection = CONFIG_ENTRY_LOCKED
integer = FALSE
config_entry_value = UPLOAD_LIMIT
default = UPLOAD_LIMIT

/datum/config_entry/number/upload_limit_admin
protection = CONFIG_ENTRY_LOCKED
integer = FALSE
config_entry_value = UPLOAD_LIMIT_ADMIN
default = UPLOAD_LIMIT_ADMIN
6 changes: 6 additions & 0 deletions modular_splurt/code/datums/interactions/lewd/_lewd.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
. = ..()
SEND_SIGNAL(src, COMSIG_MOB_LUST_UPDATED)

/mob/living/toggle_anus_always_accessible(accessibility)
var/obj/item/organ/genital/anus/donut = getorganslot(ORGAN_SLOT_ANUS)
if(donut)
return donut.toggle_accessibility(accessibility)
. = ..()

/mob/living/moan()
var/moaned = lastmoan
var/miming = mind ? mind?.miming : FALSE
Expand Down
2 changes: 2 additions & 0 deletions modular_splurt/code/modules/arousal/organs/anus.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
toggle_visibility(D.features["anus_visibility"], FALSE)
if(D.features["anus_stuffing"])
toggle_visibility(GEN_ALLOW_EGG_STUFFING, FALSE)
if(D.features["anus_accessible"])
toggle_accessibility(TRUE)
. = ..()

/obj/item/organ/genital/anus/toggle_visibility(visibility, update = TRUE)
Expand Down
2 changes: 2 additions & 0 deletions modular_splurt/code/modules/arousal/organs/belly.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@
toggle_visibility(D.features["belly_visibility"], FALSE)
if(D.features["belly_stuffing"])
toggle_visibility(GEN_ALLOW_EGG_STUFFING, FALSE)
if(D.features["belly_accessible"])
toggle_accessibility(TRUE)

/obj/item/organ/genital/belly/climax_modify_size(mob/living/partner, obj/item/organ/genital/source_gen, cum_hole)
if(!(owner.client?.prefs.cit_toggles & BELLY_INFLATION))
Expand Down

0 comments on commit 0770dfc

Please sign in to comment.