Merge branch 'master' into weapon-removal

code/game/objects/structures/artstuff.dm

@@ -351,7 +351,7 @@
 	desc_with_canvas = "A masterpiece hand-picked by the librarian, supposedly."
 	persistence_id = "library"
 	req_one_access = list(access_library)
-	curator = "Librarian"
+	curator = JOB_LIBRARIAN
 
 /obj/structure/sign/painting/chapel_secure
 	name = "\improper Religious Painting Exhibit mounting"
@@ -359,7 +359,7 @@
 	desc_with_canvas = "A masterpiece hand-picked by the chaplain, supposedly."
 	persistence_id = "chapel"
 	req_one_access = list(access_chapel_office)
-	curator = "Chaplain"
+	curator = JOB_CHAPLAIN
 
 /obj/structure/sign/painting/library_private // keep your smut away from prying eyes, or non-librarians at least
 	name = "\improper Private Painting Exhibit mounting"
@@ -367,7 +367,7 @@
 	desc_with_canvas = "A painting hung away from lesser minds."
 	persistence_id = "library_private"
 	req_one_access = list(access_library)
-	curator = "Librarian"
+	curator = JOB_LIBRARIAN
 
 /obj/structure/sign/painting/away_areas // for very hard-to-get-to areas
 	name = "\improper Remote Painting Exhibit mounting"

code/game/objects/structures/ghost_pods/event_vr.dm

@@ -78,7 +78,7 @@
 	var/choice
 	var/finalized = "No"
 
-	if(jobban_isbanned(M, "GhostRoles"))
+	if(jobban_isbanned(M, JOB_GHOSTROLES))
 		to_chat(M, "<span class='warning'>You cannot inhabit this creature because you are banned from playing ghost roles.</span>")
 		reset_ghostpod()
 		return

code/game/objects/structures/ghost_pods/ghost_pods.dm

@@ -87,7 +87,7 @@
 
 /obj/structure/ghost_pod/ghost_activated/attack_ghost(var/mob/observer/dead/user)
 	//VOREStation Add Start
-	if(jobban_isbanned(user, "GhostRoles"))
+	if(jobban_isbanned(user, JOB_GHOSTROLES))
 		to_chat(user, "<span class='warning'>You cannot inhabit this creature because you are banned from playing ghost roles.</span>")
 		return
 

code/game/objects/structures/ghost_pods/ghost_pods_vr.dm

@@ -11,7 +11,7 @@
 	var/activated = FALSE
 
 /obj/structure/ghost_pod/manual/attack_ghost(var/mob/observer/dead/user)
-	if(jobban_isbanned(user, "GhostRoles"))
+	if(jobban_isbanned(user, JOB_GHOSTROLES))
 		to_chat(user, "<span class='warning'>You cannot inhabit this creature because you are banned from playing ghost roles.</span>")
 		return
 

code/game/objects/structures/props/swarm.dm

@@ -14,11 +14,11 @@
 /obj/structure/cult/pylon/swarm/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover, /mob/living))
 		var/mob/living/L = mover
-		if(L.faction == "swarmer")
+		if(L.faction == FACTION_SWARMER)
 			return TRUE
 	else if(istype(mover, /obj/item/projectile))
 		var/obj/item/projectile/P = mover
-		if(istype(P.firer) && P.firer.faction == "swarmer")
+		if(istype(P.firer) && P.firer.faction == FACTION_SWARMER)
 			return TRUE
 	return ..()
 

code/game/objects/structures/trash_pile_vr.dm

@@ -88,7 +88,7 @@
 		return
 
 	//VOREStation Add Start
-	if(jobban_isbanned(user, "GhostRoles"))
+	if(jobban_isbanned(user, JOB_GHOSTROLES))
 		to_chat(user, "<span class='warning'>You cannot become a mouse because you are banned from playing ghost roles.</span>")
 		return
 	//VOREStation Add End