diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 3ed02fe7d3a..336b6bf4f72 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -235,6 +235,7 @@
t1 += "[printedmessage]
"
P.info = t1
P.name = "Transcript"
+ usr.put_in_hands(P)
canprint = 0
sleep(300)
canprint = 1
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index bc743231363..7565ff30a91 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -415,7 +415,7 @@
var/atype = alert(usr, "Do you want to fill or empty \the [RG] at \the [src]?", "Fill or Empty", "Fill", "Empty", "Cancel")
if(!usr.Adjacent(src)) return
- if(RG.loc != usr || (usr.l_hand != RG && usr.r_hand != RG)) return
+ if(RG.loc != usr) return
if(busy)
usr << "Someone's already using \the [src]."
return
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 4b72efafe33..28cbca4e4dc 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -148,3 +148,13 @@
prefix = ""
if((target.mob in messagemobs) || display_remote)
target << "" + create_text_tag("looc", "LOOC:", target) + " [prefix][display_name][admin_stuff]: [msg]"
+
+/client/verb/stop_all_sounds()
+ set name = "Stop all sounds"
+ set desc = "Stop all sounds that are currently playing."
+ set category = "OOC"
+
+ if(!mob)
+ return
+
+ mob << sound(null)
\ No newline at end of file
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index 300c7d7788e..86a9895dd8c 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -278,6 +278,9 @@
if(H.stat == DEAD) // He's dead, Jim
return null
+ if(isipc(H))
+ return null
+
if(H in ignored)
return null
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 835b766b116..8825eb889c0 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -310,6 +310,7 @@
/mob/living/silicon/robot/drone/proc/transfer_personality(var/client/player)
if(!player) return
+ stat = 0
src.ckey = player.ckey
if(player.mob && player.mob.mind)
diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm
index 0ea03104021..a03139b4855 100644
--- a/code/modules/paperwork/papershredder.dm
+++ b/code/modules/paperwork/papershredder.dm
@@ -8,13 +8,13 @@
var/max_paper = 10
var/paperamount = 0
var/list/shred_amounts = list(
- /obj/item/weapon/photo = 1,
+ /obj/item/weapon/photo = -1,
/obj/item/weapon/shreddedp = 1,
/obj/item/weapon/paper = 1,
/obj/item/weapon/newspaper = 3,
- /obj/item/weapon/card/id = 3,
+ /obj/item/weapon/card/id = -1,
/obj/item/weapon/paper_bundle = 3
- )
+ )// use -1 if it doesn't generate paper
/obj/machinery/papershredder/attackby(var/obj/item/W, var/mob/user)
if (istype(W, /obj/item/weapon/storage))
@@ -43,7 +43,8 @@
if(paperamount == max_paper)
user << "\The [src] is full; please empty it before you continue."
return
- paperamount += paper_result
+ if (paper_result > 0)
+ paperamount += paper_result
user.drop_from_inventory(W)
qdel(W)
playsound(src.loc, 'sound/items/pshred.ogg', 75, 1)
diff --git a/html/changelogs/Printer16-BugFixes1.yml b/html/changelogs/Printer16-BugFixes1.yml
new file mode 100644
index 00000000000..a17452a94f7
--- /dev/null
+++ b/html/changelogs/Printer16-BugFixes1.yml
@@ -0,0 +1,14 @@
+author: Printer16
+
+delete-after: True
+
+changes:
+ - bugfix: "You can now reboot maintenance drones."
+ - bugfix: "Universal recorder transcripts are now printed into your hand."
+ - rscadd: "Added a stop all sounds verb located in the OOC tab."
+ - bugfix: "Shredding ID cards no longer generates paper."
+ - bugfix: "Borgs can now fill up buckets/beakers/other containers by using the sink."
+ - tweak: "The AI help menu has been updated."
+ - tweak: "Updated the NanoUI map."
+ - bugfix: "Medbots no longer try to heal IPCs."
+
diff --git a/ingame_manuals/malf_ai.html b/ingame_manuals/malf_ai.html
index 65424f24ed3..78fdc2f62c7 100644
--- a/ingame_manuals/malf_ai.html
+++ b/ingame_manuals/malf_ai.html
@@ -18,5 +18,6 @@ Software are abilities that have to be unlocked via research menu (Hardware tab)
Networking - Hacking-oriented abilities. T1 ability is Basic Encryption Hack, which allows you to hack more APCs. Higher tiers allow faking centcom messages, and even setting alert level. T4 ability is System Override, that rapidly hacks remaining APCs and gives you access to station self destruct sequence.
Interdiction - Sabotage-oriented abilities. T1 ability allows you to recall emergency shuttle. Higher level abilities allow you to unlock cyborgs even without access to robotics console, and T4 ability allows you to hack other AIs to slave them under your control.
Manipulation - Physical-oriented abilities. T1 ability allows you to break few lights, and rarely even APCs. T2 ability allows you to apply upgrade of your choice to camera, or reactivate broken camera. T3 ability allows you to create weak forcefield, that holds air, but won't last for long. And T4 ability allows you to overload machines, detonating them in weak explosion.
+Synthetic Takeover - Abilities revolving around you and your minions. T1 ability allows you to reset your cyborgs module. T2 ability allows you to hack IPCs. T3 ability allows you to make your cyborgs stronger And T4 ability allows you to take over the stations electronics and unlocks a human to cyborg converting machine.
End
If you still have some questions, either check the wiki, ask on IRC, or adminhelp and ask your friendly administration staff.
\ No newline at end of file
diff --git a/nano/images/Aurora-3.png b/nano/images/Aurora-3.png
index b420e6ca470..02ff40ff811 100644
Binary files a/nano/images/Aurora-3.png and b/nano/images/Aurora-3.png differ
diff --git a/nano/images/Aurora-4.png b/nano/images/Aurora-4.png
index debe76a4c0f..87dd9170a03 100644
Binary files a/nano/images/Aurora-4.png and b/nano/images/Aurora-4.png differ
diff --git a/nano/images/Aurora-6.png b/nano/images/Aurora-6.png
index 2b05e54d6b0..c28237360ce 100644
Binary files a/nano/images/Aurora-6.png and b/nano/images/Aurora-6.png differ