Merge pull request #2739 from Aranclanos/ServerCrashFix

Server crash fix.
This commit is contained in:
Mloc
2013-05-06 04:38:08 -07:00

View File

@@ -349,6 +349,7 @@
var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc) var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc)
new_item = new_gun new_item = new_gun
new_item.icon_state = "gun[rand(1,4)]" new_item.icon_state = "gun[rand(1,4)]"
new_item.icon = 'xenoarchaeology.dmi'
//33% chance to be able to reload the gun with human ammunition //33% chance to be able to reload the gun with human ammunition
if(prob(66)) if(prob(66))
@@ -359,8 +360,10 @@
if(prob(33)) if(prob(33))
var/num_bullets = rand(1,new_gun.max_shells) var/num_bullets = rand(1,new_gun.max_shells)
if(num_bullets < new_gun.loaded.len) if(num_bullets < new_gun.loaded.len)
for(var/i = num_bullets, i <= new_gun.loaded.len, i++) new_gun.loaded.Cut()
new_gun.loaded += new new_gun.ammo_type(src) for(var/i = 1, i <= num_bullets, i++)
var/A = text2path(new_gun.ammo_type)
new_gun.loaded += new A(new_gun)
else else
for(var/obj/item/I in new_gun) for(var/obj/item/I in new_gun)
if(new_gun.loaded.len > num_bullets) if(new_gun.loaded.len > num_bullets)