Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Conflicts:
	html/changelog.html
This commit is contained in:
Mloc-Argent
2013-12-13 19:13:43 +00:00
19 changed files with 140 additions and 67 deletions
@@ -423,6 +423,8 @@
set desc = "Flips a non-reinforced table"
set category = "Object"
set src in oview(1)
if(ismouse(usr))
return
if (!can_touch(usr))
return
if(!flip(get_cardinal_dir(usr,src)))