the interactions (#20)

This commit is contained in:
Enric Gabriel
2020-07-04 17:04:58 -03:00
committed by GitHub
parent f61bd354d9
commit ad48e8a05c
84 changed files with 3537 additions and 7 deletions
+73 -2
View File
@@ -82,6 +82,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/be_random_body = 0 //whether we'll have a random body every round
var/gender = MALE //gender of character (well duh)
var/age = 30 //age of character
//SKYRAT CHANGES BEGIN
var/erppref = "Ask"
var/nonconpref = "Ask"
var/vorepref = "Ask"
var/extremepref = "No" //This is for extreme shit, maybe even literal shit, better to keep it on no by default
var/extremeharm = "No" //If "extreme content" is enabled, this option serves as a toggle for the related interactions to cause damage or not
var/language = ""
//SKYRAT CHANGES END
var/underwear = "Nude" //underwear type
var/undie_color = "FFF"
var/undershirt = "Nude" //undershirt type
@@ -164,7 +172,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
)
var/custom_speech_verb = "default" //if your say_mod is to be something other than your races
var/custom_tongue = "default" //if your tongue is to be something other than your races
var/language = ""
var/list/custom_names = list()
var/preferred_ai_core_display = "Blue"
@@ -369,7 +376,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<table><tr><td width='340px' height='300px' valign='top'>"
dat += "<h2>Flavor Text</h2>"
dat += "<a href='?_src_=prefs;preference=flavor_text;task=input'><b>Set Examine Text</b></a><br>"
dat += "<a href='?_src_=prefs;preference=flavor_text;task=input'><b>Set Examine Text</b></a>" //skyrat - <br> moved one line down
if(length(features["flavor_text"]) <= 40)
if(!length(features["flavor_text"]))
dat += "\[...\]"
@@ -396,6 +403,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[features["ooc_notes"]]"
else
dat += "[TextPreview(features["ooc_notes"])]...<BR>"
//SKYRAT EDIT
dat += "<a href='?_src_=prefs;preference=skyrat_ooc_notes;task=input'>Set OOC Notes</a><br>"
dat += "ERP : <a href='?_src_=prefs;preference=erp_pref'>[erppref]</a><br>"
dat += "Non-Con : <a href='?_src_=prefs;preference=noncon_pref'>[nonconpref]</a><br>"
dat += "Vore : <a href='?_src_=prefs;preference=vore_pref'>[vorepref]</a><br>"
//END OF SKYRAT EDIT
dat += "<h2>Body</h2>"
dat += "<b>Gender:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=gender;task=input'>[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]</a><BR>"
if(gender != NEUTER && pref_species.sexes)
@@ -606,6 +619,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
mutant_category++
if(mutant_category >= MAX_MUTANT_ROWS)
dat += "</td>"
mutant_category = 0
if(pref_species.mutant_bodyparts["mam_ears"])
if(!mutant_category)
@@ -1086,6 +1100,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(4) // Content preferences
dat += "<table><tr><td width='340px' height='300px' valign='top'>"
dat += "<h2>Fetish content prefs</h2>"
dat += "<b>Allow Lewd Verbs:</b> <a href='?_src_=prefs;preference=verb_consent'>[(toggles & VERB_CONSENT) ? "Yes":"No"]</a><br>" // Skyrat - ERP Mechanic Addition
dat += "<b>Mute Lewd Verb Sounds:</b> <a href='?_src_=prefs;preference=mute_lewd_verb_sounds'>[(toggles & LEWD_VERB_SOUNDS) ? "Yes":"No"]</a><br>" // Skyrat - ERP Mechanic Addition
dat += "<b>Arousal:</b><a href='?_src_=prefs;preference=arousable'>[arousable == TRUE ? "Enabled" : "Disabled"]</a><BR>"
dat += "<b>Voracious MediHound sleepers:</b> <a href='?_src_=prefs;preference=hound_sleeper'>[(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"]</a><br>"
dat += "<b>Hear Vore Sounds:</b> <a href='?_src_=prefs;preference=toggleeatingnoise'>[(cit_toggles & EATING_NOISES) ? "Yes" : "No"]</a><br>"
@@ -1102,6 +1118,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Hypno:</b> <a href='?_src_=prefs;preference=never_hypno'>[(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"]</a><br>"
dat += "<b>Aphrodisiacs:</b> <a href='?_src_=prefs;preference=aphro'>[(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"]</a><br>"
dat += "<b>Ass Slapping:</b> <a href='?_src_=prefs;preference=ass_slap'>[(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"]</a><br>"
//SKYRAT EDIT
dat += "<b>Extreme ERP verbs :</b> <a href='?_src_=prefs;preference=extremepref'>[extremepref]</a><br>" // https://youtu.be/0YrU9ASVw6w
if(extremepref != "No")
dat += "<b><span style='color: #e60000;'Harmful ERP verbs :</b> <a href='?_src_=prefs;preference=extremeharm'>[extremeharm]</a><br>"
//END OF SKYRAT EDIT
dat += "</tr></table>"
dat += "<br>"
if(5) // Custom keybindings
@@ -2453,6 +2474,50 @@ GLOBAL_LIST_EMPTY(preferences_datums)
damagescreenshake = 1
if("nameless")
nameless = !nameless
//Skyrat begin
if("erp_pref")
switch(erppref)
if("Yes")
erppref = "Ask"
if("Ask")
erppref = "No"
if("No")
erppref = "Yes"
if("noncon_pref")
switch(nonconpref)
if("Yes")
nonconpref = "Ask"
if("Ask")
nonconpref = "No"
if("No")
nonconpref = "Yes"
if("vore_pref")
switch(vorepref)
if("Yes")
vorepref = "Ask"
if("Ask")
vorepref = "No"
if("No")
vorepref = "Yes"
//Skyrat edit - *someone* offered me actual money for this shit
if("extremepref") //i hate myself for doing this
switch(extremepref) //why the fuck did this need to use cycling instead of input from a list
if("Yes") //seriously this confused me so fucking much
extremepref = "Ask"
if("Ask")
extremepref = "No"
extremeharm = "No"
if("No")
extremepref = "Yes"
if("extremeharm")
switch(extremeharm)
if("Yes") //this is cursed code
extremeharm = "No"
if("No")
extremeharm = "Yes"
if(extremepref == "No")
extremeharm = "No"
//END CITADEL EDIT
if("publicity")
if(unlock_content)
@@ -2573,6 +2638,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("hear_midis")
toggles ^= SOUND_MIDI
if("verb_consent") // Skyrat - ERP Mechanic Addition
toggles ^= VERB_CONSENT // Skyrat - ERP Mechanic Addition
if("mute_lewd_verb_sounds") // Skyrat - ERP Mechanic Addition
toggles ^= LEWD_VERB_SOUNDS // Skyrat - ERP Mechanic Addition
if("lobby_music")
toggles ^= SOUND_LOBBY
if((toggles & SOUND_LOBBY) && user.client && isnewplayer(user))