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

Merge conflict fix.

Browse Source
This commit is contained in:
Segrain
2013-09-14 22:49:11 +03:00
parent e7fe8f3945 b779059f33
commit 35621466e1
21 changed files with 147 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+1 -1
View File
@@ -37,7 +37,7 @@
/obj/structure/stool/MouseDrop(atom/over_object)
if (istype(over_object, /mob/living/carbon/human))
var/mob/living/carbon/human/H = over_object
if (!H.restrained() && !H.stat && in_range(src, over_object))
if (H==usr && !H.restrained() && !H.stat && in_range(src, over_object))
var/obj/item/weapon/stool/S = new/obj/item/weapon/stool()
S.origin = src
src.loc = S