cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-14 01:02:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

headpat wagging pref

Browse Source
This commit is contained in:
TotallyNotADog
2022-01-24 14:10:38 -06:00
parent 095a170ced
commit 0085fdd5cc
5 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+5
View File
@@ -1205,6 +1205,8 @@ 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>"
dat += "<b>Automatic Wagging:</b> <a href='?_src_=prefs;preference=auto_wag'>[(cit_toggles & NO_AUTO_WAG) ? "Disabled" : "Enabled"]</a><br>"
dat += "</tr></table>"
dat += "<br>"
dat += "<hr><center>"
@@ -2755,6 +2757,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("ass_slap")
cit_toggles ^= NO_ASS_SLAP
if("auto_wag")
cit_toggles ^= NO_AUTO_WAG
//END CITADEL EDIT
if("ambientocclusion")
code/modules/mob/living/carbon/carbon_defense.dm
+3 -1
View File
@@ -315,7 +315,9 @@
else if (mood.sanity >= SANITY_DISTURBED)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/betterhug, M)
if(HAS_TRAIT(H, TRAIT_DISTANT))
if(H.client?.prefs.cit_toggles & NO_AUTO_WAG) //if they don't wanna wag
if(!(HAS_TRAIT(H, TRAIT_DISTANT))) //because distant = the pet didn't actually happen
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) //so the sound plays as expected
return
else if(H.dna.species.can_wag_tail(H))
if("tail_human" in pref_species.default_features)
code/modules/mob/living/carbon/human/species.dm
+11
View File
@@ -1613,6 +1613,17 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
else if(aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin))
if(target.client?.prefs.cit_toggles & NO_ASS_SLAP)
if(HAS_TRAIT(target, TRAIT_ASSBLASTUSA)) //is their ass ROCK HARD?
var/hit_zone = (user.held_index_to_dir(user.active_hand_index) == "l" ? "l_":"r_") + "arm"
user.adjustStaminaLoss(20, affected_zone = hit_zone)
user.visible_message(\
"<span class='danger'>\The [user] slaps \the [target]'s ass, but their hand bounces off like they hit metal!</span>",\
"<span class='danger'>You slap [user == target ? "your" : "\the [target]'s"] ass, but feel an intense amount of pain as you realise their buns are harder than steel!</span>",\
"You hear a slap."
)
playsound(target.loc, 'sound/weapons/tap.ogg', 50, 1, -1)
user.emote("scream")
return FALSE
to_chat(user,"A force stays your hand, preventing you from slapping \the [target]'s ass!")
return FALSE
user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)