cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3748 from VampyrBytes/Emotess

Browse Source 
fixes emotess
This commit is contained in:
TheDZD
2016-03-03 20:16:36 -05:00
parent b95c24ef34 c3c23a5497
commit c84ac16d58
2 changed files with 112 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+76 -70
View File
@@ -9,9 +9,6 @@
param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
act = copytext(act,1,length(act))
var/muzzled = is_muzzled()
if(sdisabilities & MUTE || silent)
muzzled = 1
@@ -30,12 +27,12 @@
var/on_CD = 0
switch(act)
//Cooldown-inducing emotes
if("ping","buzz","beep", "yes", "no")
if("ping", "pings", "buzz", "buzzes", "beep", "beeps", "yes", "no")
if (species.name == "Machine") //Only Machines can beep, ping, and buzz
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
else //Everyone else fails, skip the emote attempt
return
if("squish")
if("squish", "squishes")
var/found_slime_bodypart = 0
if(species.name == "Slime People") //Only Slime People can squish
@@ -50,7 +47,7 @@
if(!found_slime_bodypart) //Everyone else fails, skip the emote attempt
return
if("scream", "fart", "flip", "snap")
if("scream", "screams", "fart", "farts", "flip", "flips", "snap", "snaps")
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
//Everything else, including typos of the above emotes
else
@@ -64,7 +61,7 @@
return custom_emote(m_type, message) //DO YOU KNOW WHY SHIT BREAKS? BECAUSE SO MUCH OLDCODE CALLS mob.emote("me",1,"whatever_the_fuck_it_wants_to_emote")
//WHO THE FUCK THOUGHT THAT WAS A GOOD FUCKING IDEA!?!?
if("ping")
if("ping", "pings")
var/M = null
if(param)
for (var/mob/A in view(null, null))
@@ -81,7 +78,7 @@
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 1
if("buzz")
if("buzz", "buzzes")
var/M = null
if(param)
for (var/mob/A in view(null, null))
@@ -98,7 +95,7 @@
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
m_type = 1
if("beep")
if("beep", "beeps")
var/M = null
if(param)
for (var/mob/A in view(null, null))
@@ -115,7 +112,7 @@
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
m_type = 1
if("squish")
if("squish", "squishes")
var/M = null
if(param)
for (var/mob/A in view(null, null))
@@ -166,7 +163,7 @@
playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0)
m_type = 1
if("wag")
if("wag", "wags")
if(body_accessory)
if(body_accessory.try_restrictions(src))
message = "<B>[src]</B> starts wagging \his tail."
@@ -181,7 +178,7 @@
else
return
if("swag")
if("swag", "swags")
if(species.bodyflags & TAIL_WAGGING || body_accessory)
message = "<B>[src]</B> stops wagging \his tail."
src.stop_tail_wagging(1)
@@ -193,15 +190,15 @@
message = "<B>[src]</B> is strumming the air and headbanging like a safari chimp."
m_type = 1
if ("blink")
if ("blink", "blinks")
message = "<B>[src]</B> blinks."
m_type = 1
if ("blink_r")
if ("blink_r", "blinks_r")
message = "<B>[src]</B> blinks rapidly."
m_type = 1
if ("bow")
if ("bow", "bows")
if (!src.buckled)
var/M = null
if (param)
@@ -218,7 +215,7 @@
message = "<B>[src]</B> bows."
m_type = 1
if ("salute")
if ("salute", "salutes")
if (!src.buckled)
var/M = null
if (param)
@@ -235,7 +232,7 @@
message = "<B>[src]</b> salutes."
m_type = 1
if ("choke")
if ("choke", "chokes")
if(miming)
message = "<B>[src]</B> clutches \his throat desperately!"
m_type = 1
@@ -247,7 +244,7 @@
message = "<B>[src]</B> makes a strong noise."
m_type = 2
if ("burp")
if ("burp", "burps")
if(miming)
message = "<B>[src]</B> opens their mouth rather obnoxiously."
m_type = 1
@@ -258,20 +255,20 @@
else
message = "<B>[src]</B> makes a peculiar noise."
m_type = 2
if ("clap")
if ("clap", "claps")
if (!src.restrained())
message = "<B>[src]</B> claps."
m_type = 2
if(miming)
m_type = 1
if ("flap")
if ("flap", "flaps")
if (!src.restrained())
message = "<B>[src]</B> flaps \his wings."
m_type = 2
if(miming)
m_type = 1
if ("flip")
if ("flip", "flips")
m_type = 1
if (!src.restrained())
var/M = null
@@ -296,14 +293,14 @@
message = "<B>[src]</B> does a flip!"
src.SpinAnimation(5,1)
if ("aflap")
if ("aflap", "aflaps")
if (!src.restrained())
message = "<B>[src]</B> flaps \his wings ANGRILY!"
m_type = 2
if(miming)
m_type = 1
if ("drool")
if ("drool", "drools")
message = "<B>[src]</B> drools."
m_type = 1
@@ -311,7 +308,7 @@
message = "<B>[src]</B> raises an eyebrow."
m_type = 1
if ("chuckle")
if ("chuckle", "chuckles")
if(miming)
message = "<B>[src]</B> appears to chuckle."
m_type = 1
@@ -323,22 +320,22 @@
message = "<B>[src]</B> makes a noise."
m_type = 2
if ("twitch")
if ("twitch", "twitches")
message = "<B>[src]</B> twitches violently."
m_type = 1
if ("twitch_s")
if ("twitch_s", "twitches_s")
message = "<B>[src]</B> twitches."
m_type = 1
if ("faint")
if ("faint", "faints")
message = "<B>[src]</B> faints."
if(src.sleeping)
return //Can't faint while asleep
src.sleeping += 10 //Short-short nap
m_type = 1
if ("cough")
if ("cough", "coughs")
if(miming)
message = "<B>[src]</B> appears to cough!"
m_type = 1
@@ -350,27 +347,27 @@
message = "<B>[src]</B> makes a strong noise."
m_type = 2
if ("frown")
if ("frown", "frowns")
message = "<B>[src]</B> frowns."
m_type = 1
if ("nod")
if ("nod", "nods")
message = "<B>[src]</B> nods."
m_type = 1
if ("blush")
if ("blush", "blushes")
message = "<B>[src]</B> blushes."
m_type = 1
if ("wave")
if ("wave", "waves")
message = "<B>[src]</B> waves."
m_type = 1
if ("quiver")
if ("quiver", "quivers")
message = "<B>[src]</B> quivers."
m_type = 1
if ("gasp")
if ("gasp", "gasps")
if(miming)
message = "<B>[src]</B> appears to be gasping!"
m_type = 1
@@ -382,11 +379,11 @@
message = "<B>[src]</B> makes a weak noise."
m_type = 2
if ("deathgasp")
if ("deathgasp", "deathgasps")
message = "<B>[src]</B> [species.death_message]"
m_type = 1
if ("giggle")
if ("giggle", "giggles")
if(miming)
message = "<B>[src]</B> giggles silently!"
m_type = 1
@@ -398,7 +395,7 @@
message = "<B>[src]</B> makes a noise."
m_type = 2
if ("glare")
if ("glare", "glares")
var/M = null
if (param)
for (var/mob/A in view(null, null))
@@ -413,7 +410,7 @@
else
message = "<B>[src]</B> glares."
if ("stare")
if ("stare", "stares")
var/M = null
if (param)
for (var/mob/A in view(null, null))
@@ -428,7 +425,7 @@
else
message = "<B>[src]</B> stares."
if ("look")
if ("look", "looks")
var/M = null
if (param)
for (var/mob/A in view(null, null))
@@ -445,11 +442,11 @@
message = "<B>[src]</B> looks."
m_type = 1
if ("grin")
if ("grin", "grins")
message = "<B>[src]</B> grins."
m_type = 1
if ("cry")
if ("cry", "cries")
if(miming)
message = "<B>[src]</B> cries."
m_type = 1
@@ -461,7 +458,7 @@
message = "<B>[src]</B> makes a weak noise. \He frowns."
m_type = 2
if ("sigh")
if ("sigh", "sighs")
if(miming)
message = "<B>[src]</B> sighs."
m_type = 1
@@ -473,7 +470,7 @@
message = "<B>[src]</B> makes a weak noise."
m_type = 2
if ("laugh")
if ("laugh", "laughs")
if(miming)
message = "<B>[src]</B> acts out a laugh."
m_type = 1
@@ -485,13 +482,13 @@
message = "<B>[src]</B> makes a noise."
m_type = 2
if ("mumble")
if ("mumble", "mumbles")
message = "<B>[src]</B> mumbles!"
m_type = 2
if(miming)
m_type = 1
if ("grumble")
if ("grumble", "grumbles")
if(miming)
message = "<B>[src]</B> grumbles!"
m_type = 1
@@ -502,7 +499,7 @@
message = "<B>[src]</B> makes a noise."
m_type = 2
if ("groan")
if ("groan", "groans")
if(miming)
message = "<B>[src]</B> appears to groan!"
m_type = 1
@@ -514,7 +511,7 @@
message = "<B>[src]</B> makes a loud noise."
m_type = 2
if ("moan")
if ("moan", "moans")
if(miming)
message = "<B>[src]</B> appears to moan!"
m_type = 1
@@ -536,7 +533,7 @@
message = "<B>[src]</B> says, \"[M], please. They had a family.\" [src.name] takes a drag from a cigarette and blows their name out in smoke."
m_type = 2
if ("point")
if ("point", "points")
if (!src.restrained())
var/atom/M = null
if (param)
@@ -551,20 +548,20 @@
pointed(M)
m_type = 1
if ("raise")
if ("raise", "raises")
if (!src.restrained())
message = "<B>[src]</B> raises a hand."
m_type = 1
if("shake")
if("shake", "shakes")
message = "<B>[src]</B> shakes \his head."
m_type = 1
if ("shrug")
if ("shrug", "shrugs")
message = "<B>[src]</B> shrugs."
m_type = 1
if ("signal")
if ("signal", "signals")
if (!src.restrained())
var/t1 = round(text2num(param))
if (isnum(t1))
@@ -574,25 +571,25 @@
message = "<B>[src]</B> raises [t1] finger\s."
m_type = 1
if ("smile")
if ("smile", "smiles")
message = "<B>[src]</B> smiles."
m_type = 1
if ("shiver")
if ("shiver", "shivers")
message = "<B>[src]</B> shivers."
m_type = 2
if(miming)
m_type = 1
if ("pale")
if ("pale", "pales")
message = "<B>[src]</B> goes pale for a second."
m_type = 1
if ("tremble")
if ("tremble", "trembles")
message = "<B>[src]</B> trembles in fear!"
m_type = 1
if ("sneeze")
if ("sneeze", "sneezes")
if (miming)
message = "<B>[src]</B> sneezes."
m_type = 1
@@ -604,13 +601,13 @@
message = "<B>[src]</B> makes a strange noise."
m_type = 2
if ("sniff")
if ("sniff", "sniffs")
message = "<B>[src]</B> sniffs."
m_type = 2
if(miming)
m_type = 1
if ("snore")
if ("snore", "snores")
if (miming)
message = "<B>[src]</B> sleeps soundly."
m_type = 1
@@ -622,7 +619,7 @@
message = "<B>[src]</B> makes a noise."
m_type = 2
if ("whimper")
if ("whimper", "whimpers")
if (miming)
message = "<B>[src]</B> appears hurt."
m_type = 1
@@ -634,25 +631,25 @@
message = "<B>[src]</B> makes a weak noise."
m_type = 2
if ("wink")
if ("wink", "winks")
message = "<B>[src]</B> winks."
m_type = 1
if ("yawn")
if ("yawn", "yawns")
if (!muzzled)
message = "<B>[src]</B> yawns."
m_type = 2
if(miming)
m_type = 1
if ("collapse")
if ("collapse", "collapses")
Paralyse(2)
message = "<B>[src]</B> collapses!"
m_type = 2
if(miming)
m_type = 1
if("hug")
if("hug", "hugs")
m_type = 1
if (!src.restrained())
var/M = null
@@ -687,7 +684,7 @@
else
message = "<B>[src]</B> holds out \his hand to [M]."
if("dap")
if("dap", "daps")
m_type = 1
if (!src.restrained())
var/M = null
@@ -701,7 +698,7 @@
else
message = "<B>[src]</B> sadly can't find anybody to give daps to, and daps \himself. Shameful."
if("slap")
if("slap", "slaps")
m_type = 1
if (!src.restrained())
var/M = null
@@ -718,7 +715,7 @@
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
src.adjustFireLoss(4)
if ("scream")
if ("scream", "screams")
if (miming)
message = "<B>[src]</B> acts out a scream!"
m_type = 1
@@ -741,7 +738,7 @@
m_type = 2
if ("snap")
if ("snap", "snaps")
if(prob(95))
m_type = 2
var/mob/living/carbon/human/H = src
@@ -766,7 +763,7 @@
// Needed for M_TOXIC_FART
if("fart")
if("fart", "farts")
if(reagents.has_reagent("simethicone"))
return
// playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
@@ -827,7 +824,16 @@
if ("help")
src << "blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough,\ncry, custom, deathgasp, drool, eyebrow, frown, gasp, giggle, groan, grumble, handshake, hug-(none)/mob, glare-(none)/mob,\ngrin, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, raise, salute, shake, shiver, shrug,\nsigh, signal-#1-10, smile, sneeze, sniff, snore, stare-(none)/mob, tremble, twitch, twitch_s, whimper,\nwink, yawn"
var/emotelist = "aflap(s), airguitar, blink(s), blink(s)_r, blush(es), bow(s)-(none)/mob, burp(s), choke(s), chuckle(s), clap(s), collapse(s), cough(s),cry, cries, custom, dap(s)(none)/mob," \
+ " deathgasp(s), drool(s), eyebrow,fart(s), faint(s), flap(s), flip(s), frown(s), gasp(s), giggle(s), glare(s)-(none)/mob, grin(s), groan(s), grumble(s), handshake-mob, hug(s)-(none)/mob," \
+ " glare(s)-(none)/mob, grin(s), johnny, laugh(s), look(s)-(none)/mob, moan(s), mumble(s), nod(s), pale(s), point(s)-atom, quiver(s), raise(s), salute(s)-(none)/mob, scream(s), shake(s)," \
+ " shiver(s), shrug(s), sigh(s), signal(s)-#1-10,slap(s)-(none)/mob, smile(s),snap(s), sneeze(s), sniff(s), snore(s), stare(s)-(none)/mob, swag(s), tremble(s), twitch(es), twitch(es)_s," \
+ " wag(s), wave(s), whimper(s), wink(s), yawn(s)"
if(species.name == "Machine")
emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob"
else if(species.name == "Slime People")
emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob"
src << emotelist
else
src << "\blue Unusable emote '[act]'. Say *help for a list."
html/changelogs/VampyrBytes-pr-3748.yml
+36
View File
@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# spellcheck (typo fixes)
# experiment
#################################
# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog.
author: VampyrBytes
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixes emotes ending with s needing 2. Emotes now work with grammatical options eg ping or pings, squish or squishes"
- tweak: "Updated emote help with missing emotes. Help will also show any species specific emotes for your current species"