cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3895 from Baystation12/master

Browse Source 
Merge Dev with Master
This commit is contained in:
DJSnapshot
2013-11-07 16:31:43 -08:00
parent d2fa118fc7 04237f47cb
commit 7665a1a00e
12 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+14 -3
View File
@@ -408,14 +408,22 @@
return 0
return T.straight_table_check(direction)
/obj/structure/table/verb/can_touch(var/mob/user)
if (!user)
return 0
if (user.stat) //zombie goasts go away
return 0
if (issilicon(user))
user << "<span class='notice'>You need hands for this.</span>"
return 0
return 1
/obj/structure/table/verb/do_flip()
set name = "Flip table"
set desc = "Flips a non-reinforced table"
set category = "Object"
set src in oview(1)
if (issilicon(usr))
usr << "<span class='notice'>You need hands for this.</span>"
if (!can_touch(usr))
return
if(!flip(get_cardinal_dir(usr,src)))
usr << "<span class='notice'>It won't budge.</span>"
@@ -446,6 +454,9 @@
set category = "Object"
set src in oview(1)
if (!can_touch(usr))
return
if (!unflipping_check())
usr << "<span class='notice'>It won't budge.</span>"
return