cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-31 08:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #870 from Zattarra/STOMPSHIELDING

Browse Source 
Adds stepping interaction preference toggle.
This commit is contained in:
BongaTheProto
2023-09-23 17:39:22 -05:00
committed by GitHub
parent 9ba875585e cf3f27f3a0
commit a59e9f45da
7 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_splurt/code/modules/client/preferences.dm
+3
View File
@@ -6,6 +6,7 @@
/datum/preferences
max_save_slots = DEFAULT_SAVE_SLOTS
var/unholypref = "No" //Goin 2 hell fo dis one
var/stomppref = TRUE // Please step on me.
var/list/gfluid_blacklist = list() //Stuff you don't want people to cum into you
var/new_character_creator = TRUE // old/new character creator
var/show_in_directory = 1 //Show in Character Directory
@@ -1056,6 +1057,8 @@
//SPLURT EDIT
dat += "<span style='border-radius: 2px;border:1px dotted white;cursor:help;' title='Enables verbs involving farts, shit and piss.'>?</span> "
dat += "<b>Unholy ERP verbs :</b> <a href='?_src_=prefs;preference=unholypref'>[unholypref]</a><br>" //https://www.youtube.com/watch?v=OHKARc-GObU
dat += "<span style='border-radius: 2px;border:1px dotted white;cursor:help;' title='Enables macro / micro stepping and stomping interactions.'>?</span> "
dat += "<b>Stomping Interactions :</b> <a href='?_src_=prefs;preference=stomppref'>[stomppref ? "Yes" : "No"]</a><br>"
//END OF SPLURT EDIT
//SKYRAT EDIT
dat += "<span style='border-radius: 2px;border:1px dotted white;cursor:help;' title='Enables verbs involving ear/brain fucking.'>?</span> "
modular_splurt/code/modules/client/preferences_savefile.dm
+8
View File
@@ -10,6 +10,8 @@
directory_tag = sanitize_inlist(directory_tag, GLOB.char_directory_tags, initial(directory_tag))
directory_erptag = sanitize_inlist(directory_erptag, GLOB.char_directory_erptags, initial(directory_erptag))
directory_ad = strip_html_simple(directory_ad, MAX_FLAVOR_LEN)
// Get stomping preferences.
S["stomp_pref"] >> stomppref
/datum/preferences/proc/splurt_character_pref_save(savefile/S) //TODO: modularize our other savefile edits... maybe?
//Character directory
@@ -18,11 +20,17 @@
WRITE_FILE(S["directory_erptag"], directory_erptag)
WRITE_FILE(S["directory_ad"], directory_ad)
// Stomping preferences.
WRITE_FILE(S["stomp_pref"], stomppref)
/datum/preferences/update_preferences(current_version, savefile/S)
. = ..()
if(current_version < 57.01) //a
new_character_creator = TRUE
if(current_version < 58.01) // Stomp pref.
stomppref = TRUE
/datum/preferences/update_character(current_version, savefile/S)
. = ..()
if(current_version < 53.01)
modular_splurt/code/modules/resize/resizing.dm
+8
View File
@@ -0,0 +1,8 @@
/mob/living/handle_micro_bump_other(mob/living/target)
// If the target is not in combat mode, if the target has the preference off, stop the interaction.
if(target.a_intent != INTENT_HARM && SEND_SIGNAL(target, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE) && target.client.prefs.stomppref == FALSE)
return FALSE
// Do the rest of the function normally.
. = ..()