Fixing uses of reserved word operator.

code/modules/modular_computers/NTNet/NTNRC/conversation.dm

@@ -3,7 +3,7 @@ var/global/ntnrc_uid = 0
 /datum/ntnet_conversation/
 	var/id = null
 	var/title = "Untitled Conversation"
-	var/datum/computer_file/program/chatclient/operator // "Administrator" of this channel. Creator starts as channel's operator,
+	var/datum/computer_file/program/chatclient/operator_admin // "Administrator" of this channel. Creator starts as channel's operator,
 	var/list/messages = list()
 	var/list/clients = list()
 	var/password
@@ -35,7 +35,7 @@ var/global/ntnrc_uid = 0
 	clients.Add(C)
 	add_status_message("[C.username] has joined the channel.")
 	// No operator, so we assume the channel was empty. Assign this user as operator.
-	if(!operator)
+	if(!operator_admin)
 		changeop(C)
 
 /datum/ntnet_conversation/proc/remove_client(var/datum/computer_file/program/chatclient/C)
@@ -45,8 +45,8 @@ var/global/ntnrc_uid = 0
 	add_status_message("[C.username] has left the channel.")
 
 	// Channel operator left, pick new operator
-	if(C == operator)
-		operator = null
+	if(C == operator_admin)
+		operator_admin = null
 		if(clients.len)
 			var/datum/computer_file/program/chatclient/newop = pick(clients)
 			changeop(newop)
@@ -54,12 +54,12 @@ var/global/ntnrc_uid = 0
 
 /datum/ntnet_conversation/proc/changeop(var/datum/computer_file/program/chatclient/newop)
 	if(istype(newop))
-		operator = newop
+		operator_admin = newop
 		add_status_message("Channel operator status transferred to [newop.username].")
 
 /datum/ntnet_conversation/proc/change_title(var/newtitle, var/datum/computer_file/program/chatclient/client)
-	if(operator != client)
+	if(operator_admin != client)
 		return 0 // Not Authorised
 
 	add_status_message("[client.username] has changed channel title from [title] to [newtitle]")
-	title = newtitle
+	title = newtitle

code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm

@@ -28,7 +28,7 @@
 
 	var/datum/ntnet_conversation/channel = ntnet_global.get_chat_channel_by_id(active_channel)
 	var/authed = FALSE
-	if(channel && ((channel.operator == src) || netadmin_mode))
+	if(channel && ((channel.operator_admin == src) || netadmin_mode))
 		authed = TRUE
 	switch(action)
 		if("PRG_speak")
@@ -71,7 +71,7 @@
 				return
 			var/datum/ntnet_conversation/C = new /datum/ntnet_conversation()
 			C.add_client(src)
-			C.operator = src
+			C.operator_admin = src
 			C.title = channel_title
 			active_channel = C.id
 			return TRUE
@@ -172,7 +172,7 @@
 	var/list/data = list()
 	data["can_admin"] = can_run(user, FALSE, access_network)
 	return data
-	
+
 /datum/computer_file/program/chatclient/tgui_data(mob/user)
 	if(!ntnet_global || !ntnet_global.chat_channels)
 		return list()
@@ -218,7 +218,7 @@
 					"msg" = M
 				)))
 			data["messages"] = messages
-			data["is_operator"] = (channel.operator == src) || netadmin_mode
+			data["is_operator"] = (channel.operator_admin == src) || netadmin_mode
 		else
 			data["clients"] = list()
 			data["messages"] = list()
@@ -227,4 +227,4 @@
 		data["authed"] = FALSE
 		data["messages"] = list()
 
-	return data
+	return data