diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm
index bfe9a2ea4d3..40b0ac8303c 100644
--- a/code/game/objects/items/devices/holowarrant.dm
+++ b/code/game/objects/items/devices/holowarrant.dm
@@ -40,8 +40,8 @@
//hit other people with it
/obj/item/device/holowarrant/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
- user.visible_message("You show the warrant to [M]. ", \
- "[user] holds up a warrant projector and shows the contents to [M]. ")
+ user.visible_message("[user] holds up a warrant projector and shows the contents to [M]. ", \
+ "You show the warrant to [M]. ")
M.examinate(src)
//sync with database
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index bc75e87f75e..3c46bd2974e 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -295,7 +295,7 @@
if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP)
return ..()
- if(M.isSynthetic() && M == user)
+ if(M.isSynthetic() && M == user && !(M.get_species() == "Hunter-Killer"))
user << "You can't repair damage to your own body - it's against OH&S."
return
if(S.brute_dam == 0)
diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm
index d796848a252..65c82dcc2c6 100644
--- a/code/modules/detectivework/tools/rag.dm
+++ b/code/modules/detectivework/tools/rag.dm
@@ -111,7 +111,7 @@
user.do_attack_animation(src)
M.IgniteMob()
else if(reagents.total_volume)
- if(user.zone_sel.selecting == "mouth")
+ if(user.zone_sel.selecting == "mouth" && !(M.wear_mask && M.wear_mask.item_flags & AIRTIGHT))
user.do_attack_animation(src)
user.visible_message(
"\The [user] smothers [target] with [src]!",
diff --git a/html/changelogs/printer16-bugfix1.yml b/html/changelogs/printer16-bugfix1.yml
new file mode 100644
index 00000000000..b5b62cbeb76
--- /dev/null
+++ b/html/changelogs/printer16-bugfix1.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
+# balance
+#################################
+
+# 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:
+ - bugfix: "Hunter killers can repair themselves now."