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

Runtime & Goonchat fixes (#4820)

Browse Source 
* Fix goonchat banned-cookie misdetection

* Runtime fixes

* Fix #4813

* Fix #4818

* Whoops.

* Actual emote runtime fix
This commit is contained in:
tigercat2000
2016-06-29 11:12:16 -04:00
committed by Fox McCloud
parent 1043875d81
commit 282e8088b2
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/Emote_system/emote.dm
+6 -3
View File
@@ -428,13 +428,16 @@ VampyrBytes
//Emote Cooldown System (it's so simple!)
/datum/emote/proc/handle_emote_CD(var/mob/user)
if(user.emote_cd == 2) return 1 // Cooldown emotes were disabled by an admin, prevent use
if(user.emote_cd == 1) return 1 // Already on CD, prevent use
if(user.emote_cd == 2) // Cooldown emotes were disabled by an admin, prevent use
return 1
if(user.emote_cd == 1) // Already on CD, prevent use
return 1
user.emote_cd = 1 // Starting cooldown
spawn(cooldown)
if(user.emote_cd == 2) return 1 // Don't reset if cooldown emotes were disabled by an admin during the cooldown
if(!user || user.emote_cd == 2) // Don't reset if cooldown emotes were disabled by an admin during the cooldown
return 1
user.emote_cd = 0 // Cooldown complete, ready for more!
return 0 // Proceed with emote