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

increased the maximum size you can re-stack metal/glass up to.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@550 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2010-12-06 17:21:25 +00:00
parent b5715eed1f
commit d5c2356340
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/glass.dm
+8 -8
View File
@@ -30,11 +30,11 @@ SHARDS
/obj/item/weapon/sheet/glass/attackby(obj/item/weapon/W, mob/user)
if ( istype(W, /obj/item/weapon/sheet/glass) )
var/obj/item/weapon/sheet/glass/G = W
if (G.amount >= 5)
if (G.amount >= 50)
return
if (G.amount + src.amount > 5)
src.amount = G.amount + src.amount - 5
G.amount = 5
if (G.amount + src.amount > 50)
src.amount = G.amount + src.amount - 50
G.amount = 50
else
G.amount += src.amount
//SN src = null
@@ -140,11 +140,11 @@ SHARDS
/obj/item/weapon/sheet/rglass/attackby(obj/item/weapon/sheet/rglass/W as obj, mob/user as mob)
if (!( istype(W, /obj/item/weapon/sheet/rglass) ))
return
if (W.amount >= 5)
if (W.amount >= 50)
return
if (W.amount + src.amount > 5)
src.amount = W.amount + src.amount - 5
W.amount = 5
if (W.amount + src.amount > 50)
src.amount = W.amount + src.amount - 50
W.amount = 50
else
W.amount += src.amount
del(src)
code/game/objects/items/weapons/metals_rods.dm
+14 -14
View File
@@ -57,11 +57,11 @@ LATTICE
del(src)
return
if (istype(W, /obj/item/weapon/rods))
if (W:amount == 6)
if (W:amount == 60)
return
if (W:amount + src:amount > 6)
src.amount = W:amount + src:amount - 6
W:amount = 6
if (W:amount + src:amount > 60)
src.amount = W:amount + src:amount - 60
W:amount = 60
else
W:amount += src:amount
//SN src = null
@@ -125,11 +125,11 @@ LATTICE
/obj/item/weapon/sheet/metal/attackby(obj/item/weapon/sheet/metal/W as obj, mob/user as mob)
if (!( istype(W, /obj/item/weapon/sheet/metal) ))
return
if (W.amount >= 5)
if (W.amount >= 50)
return
if (W.amount + src.amount > 5)
src.amount = W.amount + src.amount - 5
W.amount = 5
if (W.amount + src.amount > 50)
src.amount = W.amount + src.amount - 50
W.amount = 50
else
W.amount += src.amount
//SN src = null
@@ -348,11 +348,11 @@ LATTICE
/obj/item/weapon/sheet/r_metal/attackby(obj/item/weapon/sheet/r_metal/W as obj, mob/user as mob)
if (!( istype(W, /obj/item/weapon/sheet/r_metal) ))
return
if (W.amount >= 5)
if (W.amount >= 50)
return
if (W.amount + src.amount > 5)
src.amount = W.amount + src.amount - 5
W.amount = 5
if (W.amount + src.amount > 50)
src.amount = W.amount + src.amount - 50
W.amount = 50
else
W.amount += src.amount
//SN src = null
@@ -395,10 +395,10 @@ LATTICE
src.amount -= 2
new /obj/item/weapon/table_parts/reinforced( usr.loc )
if("metal")
if (src.amount < 2)
if (src.amount < 1)
usr << text("\red You haven't got enough metal to build the metal sheets!")
return
src.amount -= 2
src.amount -= 1
var/obj/item/weapon/sheet/C = new /obj/item/weapon/sheet( usr.loc )
C.amount = 2
if("core")