From 28fd492ac5ceff75cffe6bb347aa6c3616e774d5 Mon Sep 17 00:00:00 2001
From: BurgerLUA <BurgerLUA@users.noreply.github.com>
Date: Fri, 14 Dec 2018 15:57:28 -0800
Subject: [PATCH] Added (#5750)

---
 .../crates_lockers/closets/secure/medical.dm  |  1 +
 .../reagents/reagent_containers/inhaler.dm    | 11 ++----
 html/changelogs/burgerbb-dumb.yml             | 38 +++++++++++++++++++
 3 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/burgerbb-dumb.yml

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 0033a625090..133d05e1347 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -172,6 +172,7 @@
 		new /obj/item/weapon/storage/box/spraybottles(src)
 		new /obj/item/weapon/storage/box/inhalers(src)
 		new /obj/item/weapon/storage/box/inhalers_auto(src)
+		new /obj/item/weapon/storage/box/autoinjectors(src)
 		new /obj/item/weapon/storage/box/syringes(src)
 		new /obj/item/weapon/storage/box/beakers(src)
 		new /obj/item/weapon/storage/box/beakers(src)
diff --git a/code/modules/reagents/reagent_containers/inhaler.dm b/code/modules/reagents/reagent_containers/inhaler.dm
index 81c2a49cbf9..9f8c1cab940 100644
--- a/code/modules/reagents/reagent_containers/inhaler.dm
+++ b/code/modules/reagents/reagent_containers/inhaler.dm
@@ -44,6 +44,8 @@
 			playsound(src.loc, 'sound/items/stimpack.ogg', 50, 1)
 			user.visible_message("<span class='notice'>[user] accidentally sticks the [src] in [H]'s eyes!</span>","<span class='notice'>You accidentally stick the [src] in [H]'s eyes!</span>")
 			to_chat(user,"<span class='notice'>[trans] units injected. [reagents.total_volume] units remaining in \the [src].</span>")
+			used = TRUE
+			update_icon()
 		return
 
 	if (!user.IsAdvancedToolUser())
@@ -77,23 +79,19 @@
 		admin_inject_log(user, H, src, contained, temp, trans)
 		playsound(src.loc, 'sound/items/stimpack.ogg', 50, 1)
 		to_chat(user,"<span class='notice'>[trans] units injected. [reagents.total_volume] units remaining in \the [src].</span>")
+		used = TRUE
 
 	update_icon()
 
 	return TRUE
 
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/afterattack(var/mob/M, var/mob/user, proximity)
-	if(..())
-		used = TRUE
-
 /obj/item/weapon/reagent_containers/inhaler/attack(mob/M as mob, mob/user as mob)
 	if(is_open_container())
 		to_chat(user,"<span class='notice'>You must secure the reagents inside \the [src] before using it!</span>")
 		return FALSE
-
 	. = ..()
 
-/obj/item/weapon/reagent_containers/inhaler/autoinjector/attack_self(mob/user as mob)
+/obj/item/weapon/reagent_containers/inhaler/attack_self(mob/user as mob)
 	if(is_open_container())
 		if(reagents && reagents.reagent_list.len)
 			to_chat(user,"<span class='notice'>With a quick twist of \the [src]'s lid, you secure the reagents inside.</span>")
@@ -105,7 +103,6 @@
 		to_chat(user,"<span class='notice'>The reagents inside \the [src] are already secured.</span>")
 	return
 
-
 /obj/item/weapon/reagent_containers/inhaler/update_icon()
 	if(reagents.total_volume > 0 && !is_open_container())
 		icon_state = initial(icon_state)
diff --git a/html/changelogs/burgerbb-dumb.yml b/html/changelogs/burgerbb-dumb.yml
new file mode 100644
index 00000000000..54b1f6ad207
--- /dev/null
+++ b/html/changelogs/burgerbb-dumb.yml
@@ -0,0 +1,38 @@
+################################
+# 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
+#   balance
+#################################
+
+# Your name.  
+author: BurgerBB
+
+# 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: 
+  - experiment: "CORRECTION: The gamemode Ninja and the gamemode wizard will only be in secret rotation if there are LESS than 15 players."
+  - bugfix: "Fixed autoinjectors not being in chemistry. Fixed autoinhalers not working."