cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	html/changelog.html
This commit is contained in:
Mloc-Argent
2013-12-13 19:13:43 +00:00
parent a9549ac036 bf1216ea3d
commit b175c6906b
19 changed files with 140 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/folders.dm
+1 -1
View File
@@ -61,7 +61,7 @@
if(href_list["remove"])
var/obj/item/P = locate(href_list["remove"])
if(P)
if(P && P.loc == src)
P.loc = usr.loc
usr.put_in_hands(P)