John wayne

Justin52361 · Apr 17, 2024 · ccf032c · ccf032c
1 parent 50886b7
commit ccf032c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm
@@ -21,11 +21,12 @@ GLOBAL_LIST_EMPTY(billagerspawns)
 	outfit = null
 	outfit_female = null
 
-	var/isvillager = FALSE
-	var/ispilgrim = FALSE
 	display_order = JDO_ADVENTURER
 	show_in_credits = FALSE
 	min_pq = -4
+
+	var/isvillager = FALSE
+	var/ispilgrim = FALSE
 
 /datum/job/roguetown/adventurer/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
 	..()
@@ -64,16 +65,14 @@ GLOBAL_LIST_EMPTY(billagerspawns)
 					testing("[A.name] fail9")
 					continue
 
-			if(!isvillager && !ispilgrim) //adventurer
-				if(A.ispilgrim || A.isvillager)
-					continue
-			if(isvillager) //towner
-				if(!A.isvillager)
-					continue
+			if((!isvillager && !ispilgrim) && (A.isvillager || A.ispilgrim)) //adventurer
+				continue
 
-//			if(ispilgrim) //pilgrim
-//				if(A.ispilgrim)
-//					continue
+			if(isvillager && !A.isvillager) //towner
+				continue
+
+			if(ispilgrim && !A.ispilgrim) //pilgrim
+				continue
 
 			if(A.plevel_req > M.client.patreonlevel())
 				testing("[A.name] fail6")

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/villager.dm b/code/modules/jobs/job_types/roguetown/adventurer/villager.dm
@@ -20,6 +20,7 @@
 	display_order = JDO_VILLAGER
 	isvillager = TRUE
 	give_bank_account = TRUE
+
 /*
 /datum/job/roguetown/adventurer/villager/New()
 	. = ..()