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

Merge pull request #1252 from VOREStation/aro-vwag

Browse Source 
One more vwag tweak
This commit is contained in:
Arokha Sieyes
2017-03-26 22:05:27 -04:00
committed by GitHub
parent 5e8d8e082f 12d8d9f570
commit b88c04f96c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote_vr.dm
+10 -6
View File
@@ -2,9 +2,11 @@
switch(act)
if ("vwag")
toggle_tail_vr()
m_type = 1
message = "[wagging ? "starts" : "stops"] wagging their tail."
if(toggle_tail_vr(message = 1))
m_type = 1
message = "[wagging ? "starts" : "stops"] wagging their tail."
else
return 1
if ("mlem")
message = "mlems [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] tongue up over [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] nose. Mlem."
m_type = 1
@@ -55,10 +57,11 @@
return 0
/mob/living/carbon/human/proc/toggle_tail_vr(var/setting)
/mob/living/carbon/human/proc/toggle_tail_vr(var/setting,var/message = 0)
if(!tail_style || !tail_style.ani_state)
src << "<span class='warning'>You don't have a tail that supports this.</span>"
return
if(message)
src << "<span class='warning'>You don't have a tail that supports this.</span>"
return 0
if(setting != null)
wagging = setting
@@ -66,3 +69,4 @@
wagging = !wagging
update_tail_showing()
return 1