From 168a0bc8c7d6c56cb128714c12bb2998d6421f0a Mon Sep 17 00:00:00 2001
From: Erki <skull132@users.noreply.github.com>
Date: Fri, 27 Dec 2019 00:43:09 +0200
Subject: [PATCH] Fixes powered crossbow not consuming its energy cell (#7818)

The energy cell doesn't get moved to the crossbow when used on it. The rest works, though.

I also made the message about the rod getting supercharged stand out a bit more.
---
 .../projectiles/guns/launcher/crossbow.dm        | 16 ++++++++++------
 html/changelogs/skull132-crossbows.yml           |  5 +++++
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/skull132-crossbows.yml

diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index 85ea28a9714..d38f0d7e473 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -160,7 +160,7 @@
 
 	if(istype(W, /obj/item/cell))
 		if(!cell)
-			user.drop_from_inventory(cell,src)
+			user.drop_from_inventory(W, src)
 			cell = W
 			to_chat(user, "<span class='notice'>You jam [cell] into [src] and wire it to the firing coil.</span>")
 			superheat_rod(user)
@@ -180,12 +180,16 @@
 		..()
 
 /obj/item/gun/launcher/crossbow/proc/superheat_rod(var/mob/user)
-	if(!user || !cell || !bolt) return
-	if(cell.charge < 500) return
-	if(bolt.throwforce >= 15) return
-	if(!istype(bolt,/obj/item/arrow/rod)) return
+	if(!user || !cell || !bolt)
+		return
+	if(cell.charge < 500)
+		return
+	if(bolt.throwforce >= 15)
+		return
+	if(!istype(bolt,/obj/item/arrow/rod))
+		return
 
-	to_chat(user, "<span class='notice'>[bolt] plinks and crackles as it begins to glow red-hot.</span>")
+	to_chat(user, "<span class='warning'>[bolt] plinks and crackles as it begins to glow red-hot.</span>")
 	bolt.throwforce = 15
 	bolt.icon_state = "metal-rod-superheated"
 	cell.use(500)
diff --git a/html/changelogs/skull132-crossbows.yml b/html/changelogs/skull132-crossbows.yml
new file mode 100644
index 00000000000..7d0d49b7f01
--- /dev/null
+++ b/html/changelogs/skull132-crossbows.yml
@@ -0,0 +1,5 @@
+author: Skull132
+delete-after: True
+
+changes:
+  - bugfix: "Powered crossbow now properly consumes the energy cell when applied."