fixing merge conflicts

code/modules/jobs/access.dm

@@ -4,7 +4,7 @@
 	//check if it doesn't require any access at all
 	if(src.check_access(null))
 		return TRUE
-	if(issilicon(M))
+	if(hasSiliconAccessInArea(M))
 		if(ispAI(M))
 			return FALSE
 		return TRUE	//AI can do whatever it wants

code/modules/jobs/job_types/bartender.dm

@@ -28,3 +28,7 @@
 	backpack_contents = list(/obj/item/storage/box/beanbag=1,/obj/item/book/granter/action/drink_fling=1)
 	shoes = /obj/item/clothing/shoes/laceup
 
+/datum/job/bartender/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
+	. = ..()
+	var/datum/action/innate/drink_fling/D = new
+	D.Grant(H)

code/modules/jobs/job_types/mime.dm

@@ -17,6 +17,7 @@
 	display_order = JOB_DISPLAY_ORDER_MIME
 
 /datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M)
+	. = ..()
 	H.apply_pref_name("mime", M.client)
 
 /datum/outfit/job/mime