cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting & Fixes for emotes (vhelp doesn't 'break' anymore)

Browse Source
This commit is contained in:
ShadowLarkens
2020-04-30 15:22:33 -07:00
parent e8fa5768c3
commit 46ba095d5a
2 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
code/modules/mob/living/carbon/human/emote.dm
View File

@@ -11,18 +11,19 @@
var/muzzled = is_muzzled()
//var/m_type = 1
for(var/obj/item/organ/O in src.organs)
for (var/obj/item/weapon/implant/I in O)
for(var/obj/item/organ/O in organs)
for(var/obj/item/weapon/implant/I in O)
if(I.implanted)
I.trigger(act, src)
if(stat == DEAD && (act != "deathgasp"))
return
if(attempt_vr(src,"handle_emote_vr",list(act,m_type,message))) return //VOREStation Add - Custom Emote Handler
switch(act)
if(attempt_vr(src, "handle_emote_vr", list(act, m_type, message))) return //VOREStation Add - Custom Emote Handler
switch(act)
if("airguitar")
if(!src.restrained())
if(!restrained())
message = "is strumming the air and headbanging like a safari chimp."
m_type = 1
@@ -35,7 +36,7 @@
var/M = null
if(param)
for (var/mob/A in view(null, null))
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
@@ -76,7 +77,7 @@
message = "[display_msg] at [param]."
else
message = "[display_msg]."
playsound(src.loc, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add
playsound(loc, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add
m_type = 1
//Promethean-only emotes
@@ -86,7 +87,7 @@
to_chat(src, "<span class='warning'>You are not a slime thing!</span>")
return
*/ //VOREStation Removal End
playsound(src.loc, 'sound/effects/slime_squish.ogg', 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add //Credit to DrMinky (freesound.org) for the sound.
playsound(loc, 'sound/effects/slime_squish.ogg', 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add //Credit to DrMinky (freesound.org) for the sound.
message = "squishes."
m_type = 1
@@ -96,7 +97,7 @@
to_chat(src, "<span class='warning'>You are not a Skrell!</span>")
return
playsound(src.loc, 'sound/effects/warble.ogg', 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
playsound(loc, 'sound/effects/warble.ogg', 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
message = "warbles."
m_type = 2
@@ -109,10 +110,10 @@
m_type = 1
if("bow")
if(!src.buckled)
if(!buckled)
var/M = null
if(param)
for (var/mob/A in view(null, null))
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
@@ -133,7 +134,7 @@
if(input2 == "Visible")
m_type = 1
else if(input2 == "Hearable")
if(src.miming)
if(miming)
return
m_type = 2
else
@@ -146,7 +147,7 @@
//if(silent && silent > 0 && findtext(message,"\"",1, null) > 0)
// return //This check does not work and I have no idea why, I'm leaving it in for reference.
if(src.client)
if(client)
if(client.prefs.muted & MUTE_IC)
to_chat(src, "<font color='red'>You cannot send IC messages (muted).</font>")
return
@@ -157,10 +158,10 @@
return custom_emote(m_type, message)
if("salute")
if(!src.buckled)
if(!buckled)
var/M = null
if(param)
for (var/mob/A in view(null, null))
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
@@ -186,22 +187,22 @@
m_type = 2
if("clap")
if(!src.restrained())
if(!restrained())
message = "claps."
playsound(src.loc, 'sound/misc/clapping.ogg')
playsound(loc, 'sound/misc/clapping.ogg')
m_type = 2
if(miming)
m_type = 1
if("flap")
if(!src.restrained())
if(!restrained())
message = "flaps [T.his] wings."
m_type = 2
if(miming)
m_type = 1
if("aflap")
if(!src.restrained())
if(!restrained())
message = "flaps [T.his] wings ANGRILY!"
m_type = 2
if(miming)
@@ -237,9 +238,9 @@
if("faint")
message = "faints."
if(src.sleeping)
if(sleeping)
return //Can't faint while asleep
src.sleeping += 10 //Short-short nap
sleeping += 10 //Short-short nap
m_type = 1
if("cough", "coughs")
@@ -269,7 +270,7 @@
use_sound = pick('sound/effects/mob_effects/f_machine_cougha.ogg','sound/effects/mob_effects/f_machine_coughb.ogg')
else
use_sound = pick('sound/effects/mob_effects/m_machine_cougha.ogg','sound/effects/mob_effects/m_machine_coughb.ogg', 'sound/effects/mob_effects/m_machine_coughc.ogg')
playsound(src.loc, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add
playsound(loc, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add
else
message = "makes a strong noise."
m_type = 2
@@ -321,7 +322,7 @@
if("glare")
var/M = null
if(param)
for (var/mob/A in view(null, null))
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
@@ -336,7 +337,7 @@
if("stare")
var/M = null
if(param)
for (var/mob/A in view(null, null))
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
@@ -351,7 +352,7 @@
if("look")
var/M = null
if(param)
for (var/mob/A in view(null, null))
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
@@ -453,14 +454,14 @@
message = "takes a drag from a cigarette and blows \"[M]\" out in smoke."
m_type = 1
else
message = "says, \"[M], please. He had a family.\" [src.name] takes a drag from a cigarette and blows his name out in smoke."
message = "says, \"[M], please. He had a family.\" [name] takes a drag from a cigarette and blows his name out in smoke."
m_type = 2
if("point")
if(!src.restrained())
if(!restrained())
var/mob/M = null
if(param)
for (var/atom/A as mob|obj|turf|area in view(null, null))
for(var/atom/A as mob|obj|turf|area in view(null, null))
if(param == A.name)
M = A
break
@@ -476,7 +477,7 @@
m_type = 1
if("raise")
if(!src.restrained())
if(!restrained())
message = "raises a hand."
m_type = 1
@@ -489,12 +490,12 @@
m_type = 1
if("signal")
if(!src.restrained())
if(!restrained())
var/t1 = round(text2num(param))
if(isnum(t1))
if(t1 <= 5 && (!src.r_hand || !src.l_hand))
if(t1 <= 5 && (!r_hand || !l_hand))
message = "raises [t1] finger\s."
else if(t1 <= 10 && (!src.r_hand && !src.l_hand))
else if(t1 <= 10 && (!r_hand && !l_hand))
message = "raises [t1] finger\s."
m_type = 1
@@ -542,7 +543,7 @@
use_sound = 'sound/effects/mob_effects/machine_sneeze.ogg'
else
use_sound = 'sound/effects/mob_effects/f_machine_sneeze.ogg'
playsound(src.loc, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add
playsound(loc, use_sound, 50, 0, preference = /datum/client_preference/emote_noises) //VOREStation Add
else
message = "makes a strange noise."
m_type = 2
@@ -597,10 +598,10 @@
if("hug")
m_type = 1
if(!src.restrained())
if(!restrained())
var/M = null
if(param)
for (var/mob/A in view(1, null))
for(var/mob/A in view(1, null))
if(param == A.name)
M = A
break
@@ -614,10 +615,10 @@
if("handshake")
m_type = 1
if(!src.restrained() && !src.r_hand)
if(!restrained() && !r_hand)
var/mob/living/M = null
if(param)
for (var/mob/living/A in view(1, null))
for(var/mob/living/A in view(1, null))
if(param == A.name)
M = A
break
@@ -632,10 +633,10 @@
if("dap")
m_type = 1
if(!src.restrained())
if(!restrained())
var/M = null
if(param)
for (var/mob/A in view(1, null))
for(var/mob/A in view(1, null))
if(param == A.name)
M = A
break
@@ -702,16 +703,16 @@
playsound(loc, 'sound/effects/fingersnap.ogg', 50, 1, -3, preference = /datum/client_preference/emote_noises) //VOREStation Add
if("swish")
src.animate_tail_once()
animate_tail_once()
if("wag", "sway")
src.animate_tail_start()
animate_tail_start()
if("qwag", "fastsway")
src.animate_tail_fast()
animate_tail_fast()
if("swag", "stopsway")
src.animate_tail_stop()
animate_tail_stop()
if("vomit")
if(isSynthetic())
@@ -753,7 +754,7 @@
var/datum/gender/T = gender_datums[get_visible_gender()]
pose = sanitize(input(usr, "This is [src]. [T.he]...", "Pose", null) as text)
pose = sanitize(input(usr, "This is [src]. [T.he]...", "Pose", null) as text)
/mob/living/carbon/human/verb/set_flavor()
set name = "Set Flavour Text"

47
code/modules/mob/living/carbon/human/emote_vr.dm
View File

@@ -3,72 +3,72 @@
/mob/living/carbon/human/proc/handle_emote_vr(var/act,var/m_type=1,var/message = null)
//Reduces emote spamming
if(src.nextemote >= world.time)// || user.stat != CONSCIOUS
if(nextemote >= world.time)// || user.stat != CONSCIOUS
return 1
src.nextemote = world.time + 12
nextemote = world.time + 12
switch(act)
if ("vwag")
if("vwag")
if(toggle_tail_vr(message = 1))
m_type = 1
message = "[wagging ? "starts" : "stops"] wagging their tail."
else
return 1
if ("vflap")
if("vflap")
if(toggle_wing_vr(message = 1))
m_type = 1
message = "[flapping ? "starts" : "stops"] flapping their wings."
else
return 1
if ("mlem")
if("mlem")
message = "mlems [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] tongue up over [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] nose. Mlem."
m_type = 1
if ("awoo")
if("awoo")
m_type = 2
message = "lets out an awoo."
playsound(loc, 'sound/voice/awoo.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
if ("nya")
if("nya")
message = "lets out a nya."
m_type = 2
playsound(loc, 'sound/voice/nya.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
if ("peep")
if("peep")
message = "peeps like a bird."
m_type = 2
playsound(loc, 'sound/voice/peep.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
if ("chirp")
if("chirp")
message = "chirps!"
playsound(src.loc, 'sound/misc/nymphchirp.ogg', 50, 0, preference = /datum/client_preference/emote_noises)
playsound(loc, 'sound/misc/nymphchirp.ogg', 50, 0, preference = /datum/client_preference/emote_noises)
m_type = 2
if ("weh")
if("weh")
message = "lets out a weh."
m_type = 2
playsound(loc, 'sound/voice/weh.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
if ("merp")
if("merp")
message = "lets out a merp."
m_type = 2
playsound(loc, 'sound/voice/merp.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
if ("bark")
if("bark")
message = "lets out a bark."
m_type = 2
playsound(loc, 'sound/voice/bark2.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
if ("hiss")
if("hiss")
message = "lets out a hiss."
m_type = 2
playsound(loc, 'sound/voice/hiss.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
if ("squeak")
if("squeak")
message = "lets out a squeak."
m_type = 2
playsound(loc, 'sound/effects/mouse_squeak.ogg', 50, 1, -1, preference = /datum/client_preference/emote_noises)
if ("nsay")
if("nsay")
nsay()
return TRUE
if ("nme")
if("nme")
nme()
return TRUE
if ("flip")
if("flip")
var/list/involved_parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
//Check if they are physically capable
if(src.sleeping || src.resting || src.buckled || src.weakened || src.restrained() || involved_parts.len < 2)
if(sleeping || resting || buckled || weakened || restrained() || involved_parts.len < 2)
to_chat(src, "<span class='warning'>You can't *flip in your current state!</span>")
return 1
else
@@ -76,14 +76,15 @@
handle_flip_vr()
message = "does a flip!"
m_type = 1
if ("vhelp") //Help for Virgo-specific emotes.
if("vhelp") //Help for Virgo-specific emotes.
to_chat(src, "vwag, vflap, mlem, awoo, nya, peep, chirp, weh, merp, bark, hiss, squeak, nsay, nme, flip")
return TRUE
if (message)
if(message)
custom_emote(m_type,message)
return 1
return TRUE
return 0
return FALSE
/mob/living/carbon/human/proc/handle_flip_vr()