From 9ff32b591484c088dd57053d13d38c457df30dce Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Fri, 7 Oct 2016 21:48:21 -0500
Subject: [PATCH] Weapon Cell Oversight fixes

---
 code/game/objects/items/weapons/stunbaton.dm  |  2 +-
 code/modules/projectiles/guns/energy.dm       |  2 +-
 .../Anewbe - Battery Oversights.yml           | 37 +++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/Anewbe - Battery Oversights.yml

diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 84e0bdf92b4..80d24df2a24 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -167,7 +167,7 @@
 
 //secborg stun baton module
 /obj/item/weapon/melee/baton/robot
-	hitcost = 120
+	hitcost = 500
 
 /obj/item/weapon/melee/baton/robot/attack_self(mob/user)
 	//try to find our power cell
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index c723c7a0bb8..77720e5dae3 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -103,8 +103,8 @@
 	if(power_supply)
 		user.put_in_hands(power_supply)
 		power_supply.update_icon()
-		power_supply = null
 		user.visible_message("[user] removes [power_supply] from [src].", "<span class='notice'>You remove [power_supply] from [src].</span>")
+		power_supply = null
 		playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
 		update_icon()
 		update_held_icon()
diff --git a/html/changelogs/Anewbe - Battery Oversights.yml b/html/changelogs/Anewbe - Battery Oversights.yml
new file mode 100644
index 00000000000..21799060ec4
--- /dev/null
+++ b/html/changelogs/Anewbe - Battery Oversights.yml	
@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: N3X15
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Unloading an energy weapon should now correctly show what was unloaded."
+  - tweak: "Borg stun baton is back to the old cost, for balance reasons."