cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hit-reactions

Browse Source
This commit is contained in:
Fox-McCloud
2016-07-07 22:50:53 -04:00
parent 17be7813b8 ecd12bee63
commit 2e3d8bbbc6
899 changed files with 8338 additions and 8181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_spawning.dm
+2 -2
View File
@@ -48,7 +48,7 @@
to_chat(M, "<span class='notice'>Your [Item.name] has been added to your [M.back.name].</span>")
if(ok == 0)
for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
if (S.contents.len < S.storage_slots)
if(S.contents.len < S.storage_slots)
Item.loc = S
ok = 1
to_chat(M, "<span class='notice'>Your [Item.name] has been added to your [S.name].</span>")
@@ -58,7 +58,7 @@
if(newname)
Item.name = newname
if (ok == 0) // Finally, since everything else failed, place it on the ground
if(ok == 0) // Finally, since everything else failed, place it on the ground
Item.loc = get_turf(M.loc)
HackProperties(Item,propadjust)