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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-05-22 16:53:40 -04:00
committed by GitHub
parent 8911fe1de3
commit 5bb9c65bfc
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/emotes/definitions/human.dm
View File

@@ -1,25 +1,5 @@
<<<<<<< HEAD
/decl/emote/human
key = "vomit"
/decl/emote/human/check_user(var/mob/living/carbon/human/user)
return (istype(user))//VOREStation Edit - What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
/decl/emote/human/do_emote(var/mob/living/carbon/human/user)
user.vomit()
||||||| parent of fcce7729ef... Merge pull request #10378 from Novacat/nova-basicfixes
/decl/emote/human
key = "vomit"
/decl/emote/human/check_user(var/mob/living/carbon/human/user)
return (istype(user))//VOREStation Edit - What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
/decl/emote/human/do_emote(var/mob/living/carbon/human/user)
user.vomit()
=======
/decl/emote/human/mob_can_use(var/mob/living/carbon/human/user) /decl/emote/human/mob_can_use(var/mob/living/carbon/human/user)
return ..() && (istype(user))//VOREStation Edit - What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic()) return ..() && (istype(user))//VOREStation Edit - What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
>>>>>>> fcce7729ef... Merge pull request #10378 from Novacat/nova-basicfixes
/decl/emote/human/deathgasp /decl/emote/human/deathgasp
key = "deathgasp" key = "deathgasp"