cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update emote.dm

Browse Source
This commit is contained in:
Novacat
2020-07-30 16:07:01 -04:00
committed by GitHub
parent 957a0e8058
commit 74875b3d23
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
-4
View File
@@ -240,11 +240,7 @@
message = "faints."
if(sleeping)
return //Can't faint while asleep
<<<<<<< HEAD
sleeping += 10 //Short-short nap
=======
Sleeping(10)
>>>>>>> 55b2c8d... Merge pull request #7354 from Neerti/status_indicators
m_type = 1
if("cough", "coughs")