Merge remote-tracking branch 'upstream/master' into rename-organs

code/modules/mob/living/carbon/human/species/slime.dm

@@ -20,7 +20,7 @@
 	cold_level_3 = 200
 	coldmod = 3
 
-	brain_mod = 2.5
+	brain_mod = 1.5
 
 	male_cough_sounds = list('sound/effects/slime_squish.ogg')
 	female_cough_sounds = list('sound/effects/slime_squish.ogg')

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -13,7 +13,7 @@
 	braintype = "Robot"
 	lawupdate = 0
 	density = 0
-	req_access = list(access_engine, access_robotics)
+	req_one_access = list(access_engine, access_robotics)
 	ventcrawler = 2
 	magpulse = 1
 	mob_size = MOB_SIZE_SMALL

code/modules/mob/living/silicon/robot/robot.dm

@@ -65,7 +65,8 @@ var/list/robot_verbs_default = list(
 
 	var/wiresexposed = 0
 	var/locked = 1
-	var/list/req_access = list(access_robotics)
+	var/list/req_one_access = list(access_robotics)
+	var/list/req_access
 	var/ident = 0
 	//var/list/laws = list()
 	var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list())
@@ -891,6 +892,7 @@ var/list/robot_verbs_default = list(
 /mob/living/silicon/robot/proc/allowed(obj/item/I)
 	var/obj/dummy = new /obj(null) // Create a dummy object to check access on as to avoid having to snowflake check_access on every mob
 	dummy.req_access = req_access
+	dummy.req_one_access = req_one_access
 
 	if(dummy.check_access(I))
 		qdel(dummy)
@@ -1302,7 +1304,7 @@ var/list/robot_verbs_default = list(
 	designation = "SpecOps"
 	lawupdate = 0
 	scrambledcodes = 1
-	req_access = list(access_cent_specops)
+	req_one_access = list(access_cent_specops)
 	ionpulse = 1
 	magpulse = 1
 	pdahide = 1
@@ -1352,7 +1354,7 @@ var/list/robot_verbs_default = list(
 	designation = "ERT"
 	lawupdate = 0
 	scrambledcodes = 1
-	req_access = list(access_cent_specops)
+	req_one_access = list(access_cent_specops)
 	ionpulse = 1
 
 	force_modules = list("Engineering", "Medical", "Security")