Merge remote-tracking branch 'upstream/master' into dev

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm

code/WorkInProgress/Chinsky/guestpass.dm

@@ -49,7 +49,7 @@
 	var/list/accesses = list()
 	var/giv_name = "NOT SPECIFIED"
 	var/reason = "NOT SPECIFIED"
-	var/duration = 0
+	var/duration = 5
 
 	var/list/internal_log = list()
 	var/mode = 0  // 0 - making pass, 1 - viewing logs
@@ -117,18 +117,20 @@
 	if (href_list["choice"])
 		switch(href_list["choice"])
 			if ("giv_name")
-				var/nam = input("Person pass is issued to", "Name", name)
+				var/nam = strip_html_simple(input("Person pass is issued to", "Name", giv_name) as text|null)
 				if (nam)
-					giv_name = strip_html_simple(nam)
+					giv_name = nam
 			if ("reason")
-				var/reas = input("Reason why pass is issued", "Reason", reason)
-				reason = strip_html_simple(reas)
+				var/reas = strip_html_simple(input("Reason why pass is issued", "Reason", reason) as text|null)
+				if(reas)
+					reason = reas
 			if ("duration")
-				var/dur = input("Duration (in minutes) during which pass is valid.", "Duration") as num
-				if (dur > 0 && dur < 30)
-					duration = dur
-				else
-					usr << "<span class='warning'>Invalid duration.</span>"
+				var/dur = input("Duration (in minutes) during which pass is valid (up to 30 minutes).", "Duration") as num|null
+				if (dur)
+					if (dur > 0 && dur <= 30)
+						duration = dur
+					else
+						usr << "<span class='warning'>Invalid duration.</span>"
 			if ("access")
 				var/A = text2num(href_list["access"])
 				if (A in accesses)
@@ -147,6 +149,7 @@
 					else
 						giver.loc = src.loc
 						giver = null
+					accesses.Cut()
 				else
 					var/obj/item/I = usr.get_active_hand()
 					if (istype(I, /obj/item/weapon/card/id))

code/WorkInProgress/Mini/atmos_control.dm

@@ -11,7 +11,7 @@
 	circuit = "/obj/item/weapon/circuitboard/atmoscontrol"
 	var/obj/machinery/alarm/current
 	var/overridden = 0 //not set yet, can't think of a good way to do it
-	req_access = list(access_ce)
+	req_access = list(access_atmospherics)
 
 
 /obj/machinery/computer/atmoscontrol/attack_ai(var/mob/user as mob)
@@ -156,12 +156,14 @@
 				src.updateUsrDialog()
 			return
 
-		if(href_list["atmos_unlock"])
-			switch(href_list["atmos_unlock"])
-				if("0")
-					current.air_doors_close(1)
-				if("1")
-					current.air_doors_open(1)
+		//commenting this out because it causes compile errors
+		//I tried fixing it but wasn't sucessful.
+		//if(href_list["atmos_unlock"])
+		//	switch(href_list["atmos_unlock"])
+		//		if("0")
+		//			current.alarm_area.air_doors_close()
+		//		if("1")
+		//			current.alarm_area.air_doors_open()
 
 		if(href_list["atmos_alarm"])
 			if (current.alarm_area.atmosalert(2))

code/WorkInProgress/Sigyn/Softcurity/access.dm

@@ -198,7 +198,7 @@
 			return list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
 		if("Medical Doctor")
 			return list(access_medical, access_morgue, access_surgery)
-		if("Botanist")	// -- TLE
+		if("Gardener")	// -- TLE
 			return list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning.
 		if("Librarian") // -- TLE
 			return list(access_library)
@@ -496,7 +496,7 @@
 			return "Code Gold"
 
 /proc/get_all_jobs()
-	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician",
+	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Gardener", "Quartermaster", "Cargo Technician",
 				"Shaft Miner", "Clown", "Mime", "Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
 				"Atmospheric Technician", "Roboticist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
 				"Research Director", "Scientist", "Head of Security", "Warden", "Detective", "Security Officer")

code/WorkInProgress/computer3/computers/security.dm

@@ -279,7 +279,6 @@ What a mess.*/
 //RECORD FUNCTIONS
 			if("Search Records")
 				var/t1 = input("Search String: (Partial Name or ID or Fingerprints or Rank)", "Secure. records", null, null)  as text
-				world << "input [t1]"
 				if ((!( t1 ) || usr.stat || !( authenticated ) || usr.restrained() || !interactable()))
 					return
 				Perp = new/list()

code/WorkInProgress/computer3/laptop.dm

@@ -78,7 +78,7 @@
 		..(L,built)
 
 	verb/close_computer()
-		set name = "close laptop"
+		set name = "Close Laptop"
 		set category = "Object"
 		set src in view(1)