cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +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/_onclick/click.dm
+1 -1
View File
@@ -280,7 +280,7 @@
user.listed_turf = null
else
user.listed_turf = T
user.client.statpanel = T.name
user.client.statpanel = "Turf"
return
/mob/proc/TurfAdjacent(var/turf/T)