From e25697dc14d7a61003ab0b1dd9e9e58c3b0f0632 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 28 Aug 2019 03:37:35 +0200
Subject: [PATCH 1/2] rocket fix.

---
 .../projectiles/guns/ballistic/launchers.dm     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index f6356dce99..d8e56ca3a5 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -127,15 +127,14 @@
 
 /obj/item/gun/ballistic/rocketlauncher/attackby(obj/item/A, mob/user, params)
 	if(magazine && istype(A, /obj/item/ammo_casing))
-		if(user.temporarilyRemoveItemFromInventory(A))
-			if(!chambered)
-				to_chat(user, "<span class='notice'>You load a new [A] into \the [src].</span>")
-				playsound(src, "gun_insert_full_magazine", 70, 1)
-				chamber_round()
-				update_icon()
-				return TRUE
-		else
-			to_chat(user, "<span class='warning'>You cannot seem to get \the [A] out of your hands!</span>")
+		if(chambered)
+			to_chat(user, "<span class='notice'>[src] already has a [magazine_wording] chambered.</span>")
+			return
+		if(magazine.attackby(A, silent = TRUE))
+			to_chat(user, "<span class='notice'>You load a new [A] into \the [src].</span>")
+			playsound(src, "gun_insert_full_magazine", 70, 1)
+			chamber_round()
+			update_icon()
 
 /obj/item/gun/ballistic/rocketlauncher/update_icon()
 	icon_state = "[initial(icon_state)]-[chambered ? "1" : "0"]"

From 18b023b1272771a3445d9d8c8fc2b670723d5dfb Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 28 Aug 2019 04:47:53 +0200
Subject: [PATCH 2/2] arg

---
 code/modules/projectiles/guns/ballistic/launchers.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index d8e56ca3a5..12006440d2 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -130,7 +130,7 @@
 		if(chambered)
 			to_chat(user, "<span class='notice'>[src] already has a [magazine_wording] chambered.</span>")
 			return
-		if(magazine.attackby(A, silent = TRUE))
+		if(magazine.attackby(A, user, silent = TRUE))
 			to_chat(user, "<span class='notice'>You load a new [A] into \the [src].</span>")
 			playsound(src, "gun_insert_full_magazine", 70, 1)
 			chamber_round()