Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into russian

code/modules/computer3/computers/HolodeckControl.dm

@@ -10,7 +10,7 @@
 
 
 /datum/file/program/holodeck
-	name = "Holodeck Control Console"
+	name = "holodeck control console"
 	desc = "Used to control a nearby holodeck."
 	active_state = "holocontrol"
 	var/area/linkedholodeck = null

code/modules/computer3/computers/camera.dm

@@ -14,7 +14,7 @@
 
 
 /obj/machinery/computer3/security/wooden_tv
-	name				= "security cameras"
+	name				= "security cameras console"
 	desc				= "An old TV hooked into the stations camera network."
 	icon				= 'icons/obj/computer.dmi'
 	icon_state			= "security_det"
@@ -30,7 +30,7 @@
 
 
 /obj/machinery/computer3/security/mining
-	name = "Outpost Cameras"
+	name = "outpost cameras console"
 	desc = "Used to access the various cameras on the outpost."
 	spawn_files 		= list(/datum/file/camnet_key/miningoutpost)
 
@@ -80,14 +80,14 @@
 	name = "Telecomms Network Key"
 	title = "telecommunications satellite"
 	desc = "Connects to telecommunications satellite security cameras."
-	networks = list("Telecomms")		
-		
+	networks = list("Telecomms")
+
 /datum/file/camnet_key/researchoutpost
 	name = "Research Outpost Network Key"
 	title = "research outpost"
 	desc = "Connects to research outpost security cameras."
 	networks = list("Research Outpost")
-		
+
 /datum/file/camnet_key/miningoutpost
 	name = "Mining Outpost Network Key"
 	title = "mining outpost"
@@ -100,67 +100,67 @@
 	title = "research"
 	desc = "Connects to research security cameras."
 	networks = list("Research")
-	
+
 /datum/file/camnet_key/prison
 	name = "Prison Network Key"
 	title = "prison"
 	desc = "Connects to prison security cameras."
 	networks = list("Prison")
-	
+
 /datum/file/camnet_key/interrogation
 	name = "Interrogation Network Key"
 	title = "interrogation"
 	desc = "Connects to interrogation security cameras."
 	networks = list("Interrogation")
-	
+
 /datum/file/camnet_key/supermatter
 	name = "Supermatter Network Key"
 	title = "supermatter"
 	desc = "Connects to supermatter security cameras."
 	networks = list("Supermatter")
-	
+
 /datum/file/camnet_key/singularity
 	name = "Singularity Network Key"
 	title = "singularity"
 	desc = "Connects to singularity security cameras."
 	networks = list("Singularity")
-	
+
 /datum/file/camnet_key/anomalyisolation
 	name = "Anomaly Isolation Network Key"
 	title = "anomalyisolation"
 	desc = "Connects to interrogation security cameras."
 	networks = list("Anomaly Isolation")
-	
+
 /datum/file/camnet_key/toxins
 	name = "Toxins Network Key"
 	title = "toxins"
 	desc = "Connects to toxins security cameras."
 	networks = list("Toxins")
-	
+
 /datum/file/camnet_key/telepad
 	name = "Telepad Network Key"
 	title = "telepad"
 	desc = "Connects to telepad security cameras."
 	networks = list("Telepad")
-	
+
 /datum/file/camnet_key/ert
 	name = "Emergency Response Team Network Key"
 	title = "emergency response team"
 	desc = "Connects to emergency response team security cameras."
 	networks = list("ERT")
-	
+
 /datum/file/camnet_key/centcom
 	name = "Central Command Network Key"
 	title = "central command"
 	desc = "Connects to central command security cameras."
 	networks = list("CentCom")
-	
+
 /datum/file/camnet_key/thunderdome
 	name = "Thunderdome Network Key"
 	title = "thunderdome"
 	desc = "Connects to thunderdome security cameras."
 	networks = list("Thunderdome")
-	
+
 /datum/file/camnet_key/entertainment
 	name = "Entertainment Network Key"
 	title = "entertainment"

code/modules/computer3/computers/communications.dm

@@ -42,9 +42,9 @@
 	var/status_display_freq = "1435"
 	var/stat_msg1
 	var/stat_msg2
-	
+
 	var/datum/announcement/priority/crew_announcement = new
-	
+
 	New()
 		..()
 		crew_announcement.newscast = 1
@@ -75,7 +75,7 @@
 				if(access_captain in I.GetAccess())
 					authenticated = 2
 					crew_announcement.announcer = GetNameAndAssignmentFromId(I)
-				
+
 		if("logout" in href_list)
 			authenticated = 0
 			crew_announcement.announcer = ""
@@ -133,15 +133,13 @@
 				if(!input || ..(href, href_list) || !authenticated)
 					return
 				call_shuttle_proc(usr, input)
-				if(emergency_shuttle.online())
+				if(shuttle_master.emergency.timer)
 					post_status("shuttle")
 			state = STATE_DEFAULT
 		if("cancelshuttle" in href_list)
 			state = STATE_DEFAULT
 			if(authenticated)
 				cancel_call_proc(usr)
-				if(emergency_shuttle.online())
-					post_status("shuttle")
 				state = STATE_CANCELSHUTTLE
 		if("messagelist" in href_list)
 			currmsg = 0
@@ -284,9 +282,9 @@
 	proc/main_menu()
 		var/dat = ""
 		if (computer.radio.subspace)
-			if(emergency_shuttle.online() && emergency_shuttle.location())
-				var/timeleft = emergency_shuttle.estimate_arrival_time()
-				dat += "<B>Emergency shuttle</B>\n<BR>\nETA: [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]<BR>"
+			if(shuttle_master.emergency.mode == SHUTTLE_CALL)
+				var/timeleft = shuttle_master.emergency.timeLeft()
+				dat += "<B>Emergency shuttle</B>\n<BR>\nETA: [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]"
 				refresh = 1
 			else
 				refresh = 0

code/modules/computer3/computers/crew.dm

@@ -4,7 +4,7 @@
 	icon_state			= "frame-med"
 
 /datum/file/program/crew
-	name = "Crew Monitoring Console"
+	name = "crew monitoring console"
 	desc = "Used to monitor active health sensors built into most of the crew's uniforms."
 	active_state = "crew"
 	var/list/tracked = list(  )

code/modules/computer3/computers/law.dm

@@ -1,7 +1,7 @@
 
 
 /obj/machinery/computer3/aiupload
-	name = "AI Upload"
+	name = "\improper AI upload console"
 	desc = "Used to upload laws to the AI."
 	icon_state = "frame-rnd"
 	var/mob/living/silicon/ai/current = null
@@ -52,7 +52,7 @@
 
 
 /obj/machinery/computer3/borgupload
-	name = "Cyborg Upload"
+	name = "cyborg upload console"
 	desc = "Used to upload laws to Cyborgs."
 	icon_state = "frame-rnd"
 	var/mob/living/silicon/robot/current = null

code/modules/computer3/computers/security.dm

@@ -565,8 +565,7 @@ What a mess.*/
 
 					if ("Change Criminal Status")
 						if (active2)
-							for(var/mob/living/carbon/human/H in player_list)
-								H.hud_updateflag |= 1 << WANTED_HUD
+
 							switch(href_list["criminal2"])
 								if("none")
 									active2.fields["criminal"] = "None"
@@ -578,6 +577,8 @@ What a mess.*/
 									active2.fields["criminal"] = "Parolled"
 								if("released")
 									active2.fields["criminal"] = "Released"
+						for(var/mob/living/carbon/human/H in mob_list)
+							H.sec_hud_set_security_status()
 
 					if ("Delete Record (Security) Execute")
 						if (active2)

code/modules/computer3/lapvend.dm

@@ -1,5 +1,5 @@
 /obj/machinery/lapvend
-	name = "Laptop Vendor"
+	name = "laptop vendor"
 	desc = "A generic vending machine."
 	icon = 'icons/obj/vending.dmi'
 	icon_state = "robotics"