Merge branch 'master' into weapon-removal

code/modules/paperwork/faxmachine.dm

@@ -197,7 +197,7 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 					rank = scan.assignment
 			else if(login_type == LOGIN_TYPE_AI && isAI(usr))
 				authenticated = usr.name
-				rank = "AI"
+				rank = JOB_AI
 			else if(login_type == LOGIN_TYPE_ROBOT && isrobot(usr))
 				authenticated = usr.name
 				var/mob/living/silicon/robot/R = usr

code/modules/paperwork/folders.dm

@@ -25,8 +25,13 @@
 	desc = "A white folder."
 	icon_state = "folder_white"
 
+<<<<<<< HEAD
 /obj/item/folder/blue_captain
 	desc = "A blue folder with Site Manager markings."
+=======
+/obj/item/weapon/folder/blue_captain
+	desc = "A blue folder with " + JOB_SITE_MANAGER + " markings."
+>>>>>>> master
 	icon_state = "folder_captain"
 
 /obj/item/folder/blue_hop

code/modules/paperwork/paper_sticky.dm

@@ -26,7 +26,7 @@
 /obj/item/sticky_pad/attackby(var/obj/item/thing, var/mob/user)
 	if(istype(thing, /obj/item/pen))
 
-		if(jobban_isbanned(user, "Graffiti"))
+		if(jobban_isbanned(user, JOB_GRAFFITI))
 			to_chat(user, SPAN_WARNING("You are banned from leaving persistent information across rounds."))
 			return