Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm

code/game/objects/structures/crates_lockers/closets.dm

@@ -176,8 +176,10 @@
 			if(src.large)
 				var/obj/item/weapon/grab/G = W
 				src.MouseDrop_T(G.affecting, user)	//act like they were dragged onto the closet
+				user.drop_item()
 			else
 				user << "<span class='notice'>The locker is too small to stuff [W] into!</span>"
+			return
 		if(istype(W,/obj/item/tk_grab))
 			return 0
 

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -81,6 +81,7 @@
 	new /obj/item/device/lightreplacer(src)
 	new /obj/item/weapon/storage/bag/trash(src)
 	new /obj/item/clothing/shoes/galoshes(src)
+	new /obj/item/weapon/watertank/janitor(src)
 
 /*
  * Lawyer

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -45,13 +45,13 @@
 		..()
 		sleep(2)
 		new /obj/item/clothing/under/rank/head_of_personnel(src)
-		new /obj/item/clothing/suit/armor/vest(src)
-		new /obj/item/clothing/head/helmet(src)
+		new /obj/item/clothing/head/hopcap(src)
 		new /obj/item/weapon/cartridge/hop(src)
 		new /obj/item/device/radio/headset/heads/hop(src)
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/weapon/storage/box/ids(src)
-		new /obj/item/weapon/storage/box/ids( src )
+		new /obj/item/weapon/storage/box/ids(src)
+		new /obj/item/clothing/suit/armor/vest(src)
 		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/clothing/glasses/sunglasses(src)

code/game/objects/structures/tables_racks.dm

@@ -538,20 +538,21 @@
 
 
 /obj/structure/table/attackby(obj/item/I, mob/user)
-	if (istype(I, /obj/item/weapon/grab) && get_dist(src, user) < 2)
-		var/obj/item/weapon/grab/G = I
-		if(G.affecting.buckled)
-			user << "<span class='notice'>[G.affecting] is buckled to [G.affecting.buckled]!</span>"
-			return
-		if(G.state < GRAB_AGGRESSIVE)
-			user << "<span class='notice'>You need a better grip to do that!</span>"
-			return
-		if(!G.confirm())
-			return
-		G.affecting.loc = src.loc
-		G.affecting.Weaken(5)
-		G.affecting.visible_message("<span class='danger'>[G.assailant] pushes [G.affecting] onto [src].</span>", \
-									"<span class='userdanger'>[G.assailant] pushes [G.affecting] onto [src].</span>")
+	if (istype(I, /obj/item/weapon/grab))
+		if(get_dist(src, user) < 2)
+			var/obj/item/weapon/grab/G = I
+			if(G.affecting.buckled)
+				user << "<span class='notice'>[G.affecting] is buckled to [G.affecting.buckled]!</span>"
+				return
+			if(G.state < GRAB_AGGRESSIVE)
+				user << "<span class='notice'>You need a better grip to do that!</span>"
+				return
+			if(!G.confirm())
+				return
+			G.affecting.loc = src.loc
+			G.affecting.Weaken(5)
+			G.affecting.visible_message("<span class='danger'>[G.assailant] pushes [G.affecting] onto [src].</span>", \
+										"<span class='userdanger'>[G.assailant] pushes [G.affecting] onto [src].</span>")
 		qdel(I)
 		return