cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w_class

Browse Source
This commit is contained in:
monster860
2016-07-10 09:29:12 -04:00
parent 3df85518e1 9b778f21c6
commit 009dcaa2d8
958 changed files with 9561 additions and 8816 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+1 -1
View File
@@ -92,7 +92,7 @@
sharp = 0
edge = 0
/obj/item/weapon/claymore/fluff/IsShield()
/obj/item/weapon/claymore/fluff/hit_reaction()
return 0
/obj/item/weapon/crowbar/fluff/zelda_creedy_1 // Zomgponies: Griffin Rowley
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)