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

Merge pull request #3161 from Tastyfish/observervation

Browse Source 
Interrogation Observervation & some emote pronoun fixes
This commit is contained in:
Fox McCloud
2016-01-08 15:06:35 -05:00
parent 05c68fa9ef 6e90acc4ed
commit aa6e5d8e8a
4 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+4 -4
View File
@@ -189,7 +189,7 @@
if ("choke")
if(miming)
message = "<B>[src]</B> clutches his throat desperately!"
message = "<B>[src]</B> clutches \his throat desperately!"
m_type = 1
else
if (!muzzled)
@@ -218,7 +218,7 @@
m_type = 1
if ("flap")
if (!src.restrained())
message = "<B>[src]</B> flaps his wings."
message = "<B>[src]</B> flaps \his wings."
m_type = 2
if(miming)
m_type = 1
@@ -250,7 +250,7 @@
if ("aflap")
if (!src.restrained())
message = "<B>[src]</B> flaps his wings ANGRILY!"
message = "<B>[src]</B> flaps \his wings ANGRILY!"
m_type = 2
if(miming)
m_type = 1
@@ -485,7 +485,7 @@
message = "<B>[src]</B> takes a drag from a cigarette and blows \"[M]\" out in smoke."
m_type = 1
else
message = "<B>[src]</B> says, \"[M], please. He had a family.\" [src.name] takes a drag from a cigarette and blows his name out in smoke."
message = "<B>[src]</B> says, \"[M], please. They had a family.\" [src.name] takes a drag from a cigarette and blows their name out in smoke."
m_type = 2
if ("point")
code/modules/mob/living/silicon/robot/emote.dm
+2 -2
View File
@@ -64,12 +64,12 @@
m_type = 2
if ("flap")
if (!src.restrained())
message = "<B>[src]</B> flaps his wings."
message = "<B>[src]</B> flaps its wings."
m_type = 2
if ("aflap")
if (!src.restrained())
message = "<B>[src]</B> flaps his wings ANGRILY!"
message = "<B>[src]</B> flaps its wings ANGRILY!"
m_type = 2
if ("twitch")