mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
fd0298cb14
* ticks new emote file * makes a lewdmoan emote yesyes * change physique to gender * fixes everything else because im dumb * Update modular_skyrat/modules/modular_items/lewd_items/code/emote.dm (Remove miming check) Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * allows the lewdmoan to vary in pitch Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * uses get_sound() instead of play_lewd_sound Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * uhhh makes a var of get_sound, for lewdness * creates lewdness in /datum/emote/living/lewd * slightly makes the emote louder, because yes * FIXES THE DUMB MOTHERFUCKING ERROR * i forgot dont bully me pls * Update modular_skyrat/modules/modular_items/lewd_items/code/emote.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_skyrat/master_files/code/datums/emotes.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_skyrat/modules/modular_items/lewd_items/code/emote.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * test test does this make it invisible for non-erpers? * Update code/datums/emotes.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update code/datums/emotes.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * added pref_to_check in the visible and audible msg procs * Update modular_skyrat/modules/modular_items/lewd_items/code/emote.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_skyrat/modules/modular_items/lewd_items/code/emote.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update code/datums/emotes.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update code/modules/mob/mob.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update code/modules/mob/mob.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_skyrat/modules/modular_items/lewd_items/code/emote.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_skyrat/modules/modular_items/lewd_items/code/emote.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Apply suggestions from code review * Update modular_skyrat/modules/modular_items/lewd_items/code/emote.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * adds pref checks to silicon messages too * changes user.client to M.client * adds pref_to_check to drake override * Update code/datums/emotes.dm * Apply suggestions from code review * Apply suggestions from code review * Update modular_skyrat/modules/modular_items/lewd_items/code/emote.dm --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
41 lines
1.3 KiB
Plaintext
41 lines
1.3 KiB
Plaintext
/datum/emote
|
|
/// If we should check a preference for this emote
|
|
var/pref_to_check
|
|
|
|
/datum/emote/living/lewd
|
|
pref_to_check = /datum/preference/toggle/erp
|
|
|
|
// Can we play this emote to viewers?
|
|
/datum/emote/proc/pref_check_emote(mob/user)
|
|
if(isnull(pref_to_check))
|
|
return TRUE
|
|
if(!user.client?.prefs.read_preference(pref_to_check))
|
|
return FALSE
|
|
|
|
/datum/emote/living/lewd/can_run_emote(mob/living/carbon/user, status_check = TRUE, intentional)
|
|
return ..() && user.client?.prefs?.read_preference(pref_to_check)
|
|
|
|
/datum/emote/living/lewd/lewdmoan
|
|
key = "lewdmoan"
|
|
key_third_person = "lewdmoans"
|
|
message = "moans lewdly!"
|
|
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
|
|
vary = TRUE
|
|
sound_volume = 35
|
|
|
|
/datum/emote/living/lewd/lewdmoan/get_sound(mob/living/carbon/user)
|
|
if(!istype(user))
|
|
return
|
|
|
|
if(user.gender == MALE)
|
|
return pick('modular_skyrat/modules/modular_items/lewd_items/sounds/final_m1.ogg',
|
|
'modular_skyrat/modules/modular_items/lewd_items/sounds/final_m2.ogg',
|
|
'modular_skyrat/modules/modular_items/lewd_items/sounds/final_m3.ogg',
|
|
|
|
)
|
|
else
|
|
return pick('modular_skyrat/modules/modular_items/lewd_items/sounds/final_f1.ogg',
|
|
'modular_skyrat/modules/modular_items/lewd_items/sounds/final_f2.ogg',
|
|
'modular_skyrat/modules/modular_items/lewd_items/sounds/final_f3.ogg',
|
|
)
|