From 32204aabaf357731ea42b34d7e1ad017da319f58 Mon Sep 17 00:00:00 2001
From: Ron <ron_timmy1@yahoo.com>
Date: Wed, 31 May 2017 04:43:46 -0400
Subject: [PATCH] Borg Hypospray Change (#2547)

This makes the borg hypospray take 3 seconds to inject someone.

Associated thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=8197
---
 .../reagents/reagent_containers/borghydro.dm  |  8 +++--
 html/changelogs/Printer16-BorgHypo.yml        | 36 +++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/Printer16-BorgHypo.yml

diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index aa04a75bcbe..b766c74a71f 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -1,5 +1,5 @@
 /obj/item/weapon/reagent_containers/borghypo
-	name = "cyborg hypospray"
+	name = "cyborg chemical injector"
 	desc = "An advanced chemical synthesizer and injection system, designed for heavy-duty medical equipment."
 	icon = 'icons/obj/syringe.dmi'
 	item_state = "hypo"
@@ -70,8 +70,10 @@
 			return
 
 	if (M.can_inject(user, 1))
-		user << "<span class='notice'>You inject [M] with the injector.</span>"
-		M << "<span class='notice'>You feel a tiny prick!</span>"
+		visible_message("<span class='notice'>[user] starts to inject [M] with their hypospray!</span>", "<span class='notice'>You start to inject [M] with your hypospray!</span>")
+		if(do_mob(user, M, 3 SECONDS))
+			M << "<span class='notice'>You feel a tiny prick!</span>"
+			user <<"<span class='notice'>You inject [M] with your hypospray!</span>"
 
 		if(M.reagents)
 			var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
diff --git a/html/changelogs/Printer16-BorgHypo.yml b/html/changelogs/Printer16-BorgHypo.yml
new file mode 100644
index 00000000000..7b17c1a358d
--- /dev/null
+++ b/html/changelogs/Printer16-BorgHypo.yml
@@ -0,0 +1,36 @@
+################################
+# 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: Printer16
+
+# 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: 
+  - tweak: "Injecting someone with a borg hypospray now takes 3 seconds."