Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161

[MIRROR] 512 forward compatibility merge

code/game/objects/items/tanks/watertank.dm

@@ -439,7 +439,7 @@
 	user.update_inv_back() //for overlays update
 
 //Operator backpack spray
-/obj/item/watertank/operator
+/obj/item/watertank/op
 	name = "backpack water tank"
 	desc = "A New Russian backpack spray for systematic cleansing of carbon lifeforms."
 	icon_state = "waterbackpackjani"
@@ -448,7 +448,7 @@
 	volume = 2000
 	slowdown = 0
 
-/obj/item/watertank/operator/New()
+/obj/item/watertank/op/New()
 	..()
 	reagents.add_reagent("mutagen",350)
 	reagents.add_reagent("napalm",125)
@@ -458,8 +458,7 @@
 	reagents.add_reagent("plasma",250)
 	reagents.add_reagent("condensedcapsaicin",500)
 
-/obj/item/reagent_containers/spray/mister/operator
-	name = "janitor spray nozzle"
+/obj/item/reagent_containers/spray/mister/op
 	desc = "A mister nozzle attached to several extended water tanks. It suspiciously has a compressor in the system and is labelled entirely in New Cyrillic."
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "misterjani"
@@ -470,5 +469,5 @@
 	amount_per_transfer_from_this = 100
 	possible_transfer_amounts = list(75,100,150)
 
-/obj/item/watertank/operator/make_noz()
-	return new /obj/item/reagent_containers/spray/mister/operator(src)
+/obj/item/watertank/op/make_noz()
+	return new /obj/item/reagent_containers/spray/mister/op(src)