Merge branch 'master' into weapon-removal

code/modules/persistence/graffiti.dm

@@ -51,7 +51,7 @@
 			qdel(src)
 	else if(thing.sharp)
 
-		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
 

code/modules/persistence/noticeboard.dm

@@ -82,8 +82,13 @@
 			visible_message("<span class='danger'>[user] has dismantled [src]!</span>")
 			dismantle()
 		return
+<<<<<<< HEAD
 	else if(istype(I, /obj/item/paper) || istype(I, /obj/item/photo))
 		if(jobban_isbanned(user, "Graffiti"))
+=======
+	else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo))
+		if(jobban_isbanned(user, JOB_GRAFFITI))
+>>>>>>> master
 			to_chat(user, "<span class='warning'>You are banned from leaving persistent information across rounds.</span>")
 		else
 			if(LAZYLEN(notices) < max_notices && user.unEquip(I, src))
@@ -207,4 +212,4 @@
 	P.info = "Do you people think the anomaly suits are cheap to come by? I'm about a hair trigger away from instituting a log book for the damn things. Only wear them if you're going out for a dig, and for god's sake don't go tramping around in them unless you're field testing something, R"
 	P.stamped = list(/obj/item/stamp/rd)
 	P.add_overlay("paper_stamped_rd")
-	contents += P
+	contents += P