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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	code/WorkInProgress/Mini/customitems.dm
This commit is contained in:
Tastyfish
2012-01-12 01:48:33 -05:00
parent e5abd35dae a8e8af6242
commit b5c8b89a4d
24 changed files with 111 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Mini/customitems.dm
+1 -1
View File
@@ -37,4 +37,4 @@
break
if (ok == 0) // Finally, since everything else failed, place it on the ground
Item.loc = get_turf(M.loc)
Item.loc = get_turf(M.loc)