Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/modules/mob/living/carbon/brain/MMI.dm

@@ -12,7 +12,7 @@
 	var/construction_time = 75
 	//these vars are so the mecha fabricator doesn't shit itself anymore. --NEO
 
-	req_access = list(access_robotics)
+	req_access = list(ACCESS_ROBOTICS)
 
 	//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
 

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

@@ -188,7 +188,7 @@
 	this.icon_state = pick(iconL)
 	this.blood_DNA = list()
 	this.blood_DNA[dna.unique_enzymes] = dna.b_type
-	this.blood_owner = src
+//	this.blood_owner = src
 
 	if(virus2)
 		this.virus2 = virus2.getcopy()

code/modules/mob/living/silicon/ai/move.dm

@@ -1,5 +1,5 @@
-/var/const/SHARED_TYPES_WEIGHT = 5
-/var/const/CAMERA_PROXIMITY_PREFERENCE = 0.2
+#define SHARED_TYPES_WEIGHT 5
+#define CAMERA_PROXIMITY_PREFERENCE 0.2
 // the smaller this is, the more a straight line will be preferred over a closer camera when changing cameras
 // if you set this to 0 the game will crash. don't do that.
 // if you set it to be negative the algorithm will do completely nonsensical things (like choosing the camera that's