From 9e3667540c3a93db3299e2e40222047e17beab8d Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 11 Feb 2015 20:42:50 -0500 Subject: [PATCH] Fixes merge 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 2f8d7ffb33..e69d60d528 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -64,12 +64,13 @@ switch(handle_casings) if(EJECT_CASINGS) //eject casing onto ground. chambered.loc = get_turf(src) - if(CYCLE_CASINGS) //cycle the casubg back to the end. + chambered = null + if(CYCLE_CASINGS) //cycle the casing back to the end. if(ammo_magazine) ammo_magazine.stored_ammo += chambered else loaded += chambered - chambered = null + chambered = null //Attempts to load A into src, depending on the type of thing being loaded and the load_method //Maybe this should be broken up into separate procs for each load method?