Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00
parent 4f4fe98240 a6a4deb94c
commit 04d071deda
252 changed files with 6549 additions and 5230 deletions
@@ -213,6 +213,10 @@
 	var/toggled = FALSE
 	var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine

+/obj/item/gun/ballistic/shotgun/automatic/dual_tube/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to pump it.</span>")
+
 /obj/item/gun/ballistic/shotgun/automatic/dual_tube/Initialize()
 	. = ..()
 	if (!alternate_magazine)