From 1dc456fff51e0eff7aa3c71a5f3136bc5f97bde9 Mon Sep 17 00:00:00 2001 From: skull132 Date: Tue, 16 Jun 2015 19:48:46 +0300 Subject: [PATCH] Spawning empty guns You can now spawn projectile weapons with nothing loaded in them. Simply modify the ammo_type of an instance or a class to equal null. Previously, this would have generated runtime errors. --- code/modules/projectiles/guns/projectile.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 7172382e..acf11b97 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -22,8 +22,9 @@ /obj/item/weapon/gun/projectile/New() ..() - for(var/i = 1, i <= max_shells, i++) - loaded += new ammo_type(src) + if(ammo_type) //So that we can have weapons spawn empty. + for(var/i = 1, i <= max_shells, i++) + loaded += new ammo_type(src) update_icon() return