From 56ecfe8ed9832d3f40e83a3eb4da943c316099b4 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Thu, 28 Mar 2013 06:16:53 -0300 Subject: [PATCH 1/2] Fixed issues related to shotguns and their shells. -The description "A weak beanbag shell. This one is spent. This one is spent. This one is spent. This one is spent." made by double barreled shotguns is gone, now the message is only added when the shotgun actually fires and uses the shell -All other kind of shotguns will now add the "This one is spent." message. -Shotguns will stop firing invisible bullets, making them less confusing. Changed the "You break the double barreled shotgun" message to "You open the double barreled shotgun" because it was confusing, the playes (myself included) thought that they actually ruined the pretty gun. --- code/modules/projectiles/guns/projectile/shotgun.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index abb3185baf1..30c22961209 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -18,6 +18,9 @@ load_into_chamber() if(in_chamber) + var/obj/item/ammo_casing/AC = current_shell + AC.desc += " This one is spent." + AC.BB = null //remove the ammunition from the shell return 1 return 0 @@ -86,11 +89,12 @@ var/obj/item/ammo_casing/AC = loaded[1] //load next casing. loaded -= AC //Remove casing from loaded list. - AC.desc += " This one is spent." if(AC.BB) in_chamber = AC.BB //Load projectile into chamber. AC.BB.loc = src //Set projectile loc to gun. + AC.BB = null //Remove the ammunition from the shell + AC.desc += " This one is spent." return 1 return 0 @@ -104,7 +108,7 @@ loaded -= shell shell.loc = get_turf(src.loc) - user << "You break \the [src]." + user << "You open \the [src]." update_icon() attackby(var/obj/item/A as obj, mob/user as mob) From b8caf8768e02ce6dedcfe8a680dc762d90c7a1af Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Thu, 28 Mar 2013 11:17:41 -0300 Subject: [PATCH 2/2] I didn't even knew that you could add the empty shells to other guns, oh well. Same fix for the rest of the projectile guns, now they won't "fire" invisible bullets. --- code/modules/projectiles/guns/projectile.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index fe44c984d4a..283eb9e0af8 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -37,6 +37,7 @@ if(AC.BB) in_chamber = AC.BB //Load projectile into chamber. AC.BB.loc = src //Set projectile loc to gun. + AC.BB = null return 1 return 0