From d762024d681e0113b06bff87e62fd60e21317e7a Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Sun, 5 May 2013 21:12:15 -0300 Subject: [PATCH 1/2] Fixed the server crash, it was an infinite loop when a revolver spawned in the xenoarcheology. It added bullets (tried, because it didn't work either) over and over nonstop. Commented out the sprite selection on the revolvers in the xenoarcheology spawn code, it selected wrong names and they ended up being invisible. Now they will have the default sprite, the black revolver. --- code/modules/research/xenoarchaeology/finds/finds.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index c9ee155c56..fedeab8fc2 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -348,7 +348,7 @@ //revolver var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc) new_item = new_gun - new_item.icon_state = "gun[rand(1,4)]" + //new_item.icon_state = "gun[rand(1,4)]" comenting this out because there aren't sprites named like that //33% chance to be able to reload the gun with human ammunition if(prob(66)) @@ -359,8 +359,10 @@ if(prob(33)) var/num_bullets = rand(1,new_gun.max_shells) if(num_bullets < new_gun.loaded.len) - for(var/i = num_bullets, i <= new_gun.loaded.len, i++) - new_gun.loaded += new new_gun.ammo_type(src) + new_gun.loaded.Cut() + for(var/i = 1, i <= num_bullets, i++) + var/A = text2path(new_gun.ammo_type) + new_gun.loaded += new A(new_gun) else for(var/obj/item/I in new_gun) if(new_gun.loaded.len > num_bullets) From 731280734600458b2a5a0bdba93ab9bfb9a130f1 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Sun, 5 May 2013 21:21:09 -0300 Subject: [PATCH 2/2] Reverting the comment out on the sprites and added the correct path, the xenoarcheology.dmi --- code/modules/research/xenoarchaeology/finds/finds.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index fedeab8fc2..3cad5daef0 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -348,7 +348,8 @@ //revolver var/obj/item/weapon/gun/projectile/new_gun = new /obj/item/weapon/gun/projectile(src.loc) new_item = new_gun - //new_item.icon_state = "gun[rand(1,4)]" comenting this out because there aren't sprites named like that + 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 if(prob(66))