cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
This commit is contained in:
PsiOmegaDelta
2015-12-20 11:22:08 +01:00
parent 1190f5fe4b 1cb2239938
commit 5d3d0c5dc3
10 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/paicard.dm
+1 -1
View File
@@ -320,7 +320,7 @@
qdel(src)
/obj/item/device/paicard/see_emote(mob/living/M, text)
if(pai && pai.client)
if(pai && pai.client && !pai.canmove)
var/rendered = "<span class='message'>[text]</span>"
pai.show_message(rendered, 2)
..()