cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4254 from Meisaka/enoughwiththesss

Browse Source 
Make silicon/AI/robot/drone/pAI emotes sane again.
This commit is contained in:
TheDZD
2016-04-23 10:20:39 -04:00
parent 5a22c50007 8cf5534a3d
commit e09f708f2c
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/emote.dm
+8 -7
View File
@@ -5,9 +5,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))
//Emote Cooldown System (it's so simple!)
// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
var/on_CD = 0
@@ -15,7 +12,8 @@
//Cooldown-inducing emotes
if("scream", "screams")
on_CD = handle_emote_CD(50) //longer cooldown
if("ping","buzz","beep","yes","no") //halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
if("ping","pings","buzz","buzzs","buzzes","beep","beeps","yes","no")
//halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
//Everything else, including typos of the above emotes
else
@@ -26,7 +24,7 @@
//--FalseIncarnate
switch(act)
if("ping")
if("ping","pings")
var/M = null
if(param)
for (var/mob/A in view(null, null))
@@ -43,7 +41,7 @@
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 2
if("buzz")
if("buzz","buzzs","buzzes")
var/M = null
if(param)
for (var/mob/A in view(null, null))
@@ -60,7 +58,7 @@
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
m_type = 2
if("beep")
if("beep","beeps")
var/M = null
if(param)
for (var/mob/A in view(null, null))
@@ -116,4 +114,7 @@
playsound(src.loc, 'sound/goonstation/voice/robot_scream.ogg', 80, 0)
m_type = 2
if("help")
to_chat(src, "yes, no, beep, ping, buzz")
..(act, m_type, message)
code/modules/mob/living/silicon/pai/emote.dm
+1 -5
View File
@@ -1,6 +1,2 @@
/mob/living/silicon/pai/emote(var/act, var/m_type=1, var/message = null)
switch(act)
if ("help")
to_chat(src, "ping, beep, buzz.")
..(act, m_type, message)
..(act, m_type, message)
code/modules/mob/living/silicon/robot/emote.dm
+13 -16
View File
@@ -5,15 +5,12 @@
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))
//Emote Cooldown System (it's so simple!)
// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
var/on_CD = 0
switch(act)
//Cooldown-inducing emotes
if("law","flip","halt") //halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
if("law","flip","flips","halt") //halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
//Everything else, including typos of the above emotes
else
@@ -25,7 +22,7 @@
switch(act)
if ("salute")
if ("salute","salutes")
if (!src.buckled)
var/M = null
if (param)
@@ -41,7 +38,7 @@
else
message = "<B>[src]</b> salutes."
m_type = 1
if ("bow")
if ("bow","bows")
if (!src.buckled)
var/M = null
if (param)
@@ -58,16 +55,16 @@
message = "<B>[src]</B> bows."
m_type = 1
if ("clap")
if ("clap","claps")
if (!src.restrained())
message = "<B>[src]</B> claps."
m_type = 2
if ("flap")
if ("flap","flaps")
if (!src.restrained())
message = "<B>[src]</B> flaps its wings."
m_type = 2
if ("aflap")
if ("aflap","aflaps")
if (!src.restrained())
message = "<B>[src]</B> flaps its wings ANGRILY!"
m_type = 2
@@ -76,11 +73,11 @@
message = "<B>[src]</B> twitches violently."
m_type = 1
if ("twitch_s")
if ("twitch_s","twitches")
message = "<B>[src]</B> twitches."
m_type = 1
if ("nod")
if ("nod","nods")
message = "<B>[src]</B> nods."
m_type = 1
@@ -88,7 +85,7 @@
message = "<B>[src]</B> shudders violently for a moment, then becomes motionless, its eyes slowly darkening."
m_type = 1
if ("glare")
if ("glare","glares")
var/M = null
if (param)
for (var/mob/A in view(null, null))
@@ -103,7 +100,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))
@@ -118,7 +115,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))
@@ -154,12 +151,12 @@
else
to_chat(src, "You are not security.")
if ("flip")
if ("flip","flips")
m_type = 1
message = "<B>[src]</B> does a flip!"
src.SpinAnimation(5,1)
if ("help")
to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt")
to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitches, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look,\n law, halt")
..(act, m_type, message)