merged the server to the latest fork

README.md

@@ -1,9 +1,7 @@
-"Ne participes, nec mors sequetur"
-# Blackstone
-Blackstone is a fantasy roleplaying game based on the source code for Roguetown, and is inspired by Table Top Roleplaying Games. The goal of Blackstone is to provide a freeform fantasy roleplay environment with minimal admin intervention, where players are empowered to collectively decide what is and is not acceptable through in-game action.
+“Words build bridges into unexplored regions.”
+
+This is made by me and some friends, feel free to use everything here.
+
+I don't care if your stolen work is in here, feel free to sue me if you don't want it on github
 
-## Wiki
-The wiki is currently being worked on at [here](https://wiki.moviesfreepremium.xyz/blackstone)
 
-## Discord
-Come say hi on the [discord](https://discord.gg/cHrV2mUmE4), it is where the community is the most active.

code/modules/jobs/job_types/roguetown/adventurer/DRIFTERZ.dm

@@ -27,7 +27,7 @@
 
 	total_positions = 0
 	spawn_positions = 0
-	advclass_cat_rolls = list(CTAG_PILGRIM = 5, CTAG_ADVENTURER = 5)
+	advclass_cat_rolls = list(CTAG_PILGRIM = 5, CTAG_ADVENTURER = 0)
 
 /datum/job/roguetown/drifters/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
 	..()

code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm

@@ -8,8 +8,8 @@ GLOBAL_VAR_INIT(adventurer_hugbox_duration_still, 3 MINUTES)
 	flag = ADVENTURER
 	department_flag = PEASANTS
 	faction = "Station"
-	total_positions = 20
-	spawn_positions = 20
+	total_positions = 0
+	spawn_positions = 0
 	allowed_races = ALL_RACES_LIST_NAMES
 	tutorial = "Hero of nothing, adventurer by trade. Whatever led you to this fate is up to the wind to decide, and you've never fancied yourself for much other than the thrill. Someday your pride is going to catch up to you, and you're going to find out why most men don't end up in the annals of history."
 
@@ -21,7 +21,7 @@ GLOBAL_VAR_INIT(adventurer_hugbox_duration_still, 3 MINUTES)
 	show_in_credits = FALSE
 	min_pq = 0
 	max_pq = null
-	
+
 	advclass_cat_rolls = list(CTAG_ADVENTURER = 5)
 	PQ_boost_divider = 10
 

code/modules/jobs/job_types/roguetown/adventurer/pilgrim.dm

@@ -4,7 +4,7 @@
 	department_flag = PEASANTS
 	faction = "Station"
 	total_positions = -1
-	spawn_positions = 20
+	spawn_positions = -1
 	allowed_races = ALL_RACES_LIST_NAMES
 	tutorial = "Pilgrims begin far outside of the town and must reach it in order to ply their various trades. Sometimes, they build their own settlements and enjoy the terrible nature."
 

code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm

@@ -8,7 +8,7 @@
 	outfit = /datum/outfit/job/roguetown/adventurer/crusader
 	traits_applied = list(TRAIT_HEAVYARMOR, TRAIT_MEDIUMARMOR)
 
-	maximum_possible_slots = 1
+	maximum_possible_slots = 0
 
 	tutorial = "The crusaders... Knights who have pledged \
 	their wealth and lands to the church, taking up the banner \

code/modules/jobs/job_types/roguetown/adventurer/villager.dm

@@ -3,8 +3,8 @@
 	flag = VILLAGER
 	department_flag = PEASANTS
 	faction = "Station"
-	total_positions = 50
-	spawn_positions = 50
+	total_positions = 0
+	spawn_positions = 0
 	allowed_races = ALL_RACES_LIST_NAMES
 	tutorial = "You've lived in this shithole for effectively all your life. You are not an explorer, nor exactly a warrior in many cases. You're just some average poor bastard who thinks they'll be something someday."
 	advclass_cat_rolls = list(CTAG_TOWNER = 20)
@@ -21,7 +21,7 @@
 	always_show_on_latechoices = TRUE
 	same_job_respawn_delay = 0
 
-	
+
 
 /datum/job/roguetown/villager/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
 	..()

code/modules/jobs/job_types/roguetown/church/druid.dm

@@ -4,8 +4,8 @@
 	flag = DRUID
 	department_flag = CHURCHMEN
 	faction = "Station"
-	total_positions = 2
-	spawn_positions = 2
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_sexes = list(MALE, FEMALE)
 	allowed_races = list(

code/modules/jobs/job_types/roguetown/church/monk.dm

@@ -3,8 +3,8 @@
 	flag = MONK
 	department_flag = CHURCHMEN
 	faction = "Station"
-	total_positions = 3
-	spawn_positions = 3
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_sexes = list(MALE, FEMALE)
 	allowed_races = list(

code/modules/jobs/job_types/roguetown/church/mortician.dm

@@ -3,8 +3,8 @@
 	flag = GRAVEDIGGER
 	department_flag = CHURCHMEN
 	faction = "Station"
-	total_positions = 3
-	spawn_positions = 3
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_sexes = list(MALE, FEMALE)
 	allowed_races = list(

code/modules/jobs/job_types/roguetown/church/priest.dm

@@ -4,12 +4,12 @@
 	flag = PRIEST
 	department_flag = CHURCHMEN
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 	selection_color = JCOLOR_CHURCH
 	allowed_sexes = list(MALE, FEMALE)
 	allowed_races = list(
-		"Humen", 
+		"Humen",
 		"Aasimar",
 	)
 	allowed_patrons = ALL_DIVINE_PATRONS
@@ -89,7 +89,7 @@
 			continue
 		if(!istype(HU.head, /obj/item/clothing/head/roguetown/crown/serpcrown))
 			continue
-		
+
 		//Abdicate previous King
 		for(var/mob/living/carbon/human/HL in GLOB.human_list)
 			if(HL.mind)

code/modules/jobs/job_types/roguetown/church/puritan.dm

@@ -3,23 +3,23 @@
 	flag = PURITAN
 	department_flag = CHURCHMEN
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 	allowed_sexes = list(MALE)
 	allowed_races = list(
 		"Humen",
 		"Aasimar",
 	)
 	allowed_patrons = list(
 		/datum/patron/old_god,
-		/datum/patron/divine/astrata, 
-		/datum/patron/divine/noc, 
-		/datum/patron/divine/dendor, 
-		/datum/patron/divine/abyssor, 
-		/datum/patron/divine/ravox, 
-		/datum/patron/divine/necra, 
-		/datum/patron/divine/xylix, 
-		/datum/patron/divine/pestra, 
+		/datum/patron/divine/astrata,
+		/datum/patron/divine/noc,
+		/datum/patron/divine/dendor,
+		/datum/patron/divine/abyssor,
+		/datum/patron/divine/ravox,
+		/datum/patron/divine/necra,
+		/datum/patron/divine/xylix,
+		/datum/patron/divine/pestra,
 		/datum/patron/divine/malum,
 	) //gets set to old god anyways
 	tutorial = "As an Inquisitor, the Queen has emboldened your radical sect to root out cultists and the cursed night beasts, using your practice of extracting involuntary 'sin confessions' as a guise to spy on the local populace. Witch Hunters are hired for their extreme paranoia and religious fervor."

code/modules/jobs/job_types/roguetown/church/templar.dm

@@ -17,8 +17,8 @@
 	outfit = /datum/outfit/job/roguetown/templar
 	min_pq = 2
 	max_pq = null
-	total_positions = 3
-	spawn_positions = 3
+	total_positions = 0
+	spawn_positions = 0
 	display_order = JDO_TEMPLAR
 	give_bank_account = TRUE
 

code/modules/jobs/job_types/roguetown/courtier/butler.dm

@@ -3,8 +3,8 @@
 	flag = BUTLER
 	department_flag = COURTIERS
 	faction = "Station"
-	total_positions = 2
-	spawn_positions = 3
+	total_positions = 0
+	spawn_positions = 0
 
 	f_title = "Maid"
 	allowed_races = list(

code/modules/jobs/job_types/roguetown/courtier/councillor.dm

@@ -3,8 +3,8 @@
 	flag = COUNCILLOR
 	department_flag = NOBLEMEN
 	faction = "Station"
-	total_positions = 2
-	spawn_positions = 2
+	total_positions = 0
+	spawn_positions = 0
 	allowed_ages = list(AGE_ADULT, AGE_MIDDLEAGED)
 	allowed_races = list(
 		"Humen",
@@ -21,7 +21,7 @@
 			You only answer to the Bailiff, Queen, King, Princes, or Princesses. However, your main focus is to assist the Bailiff."
 	whitelist_req = FALSE
 	outfit = /datum/outfit/job/roguetown/councillor
-	
+
 	give_bank_account = 40
 	min_pq = 2
 	max_pq = null

code/modules/jobs/job_types/roguetown/courtier/jester.dm

@@ -3,8 +3,8 @@
 	flag = JESTER
 	department_flag = PEASANTS
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_races = list(
 		"Humen",
@@ -72,8 +72,8 @@
 	ADD_TRAIT(H, TRAIT_ZJUMP, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_LEAPER, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_NUTCRACKER, TRAIT_GENERIC)
-	if(prob(50))	
+	if(prob(50))
 		ADD_TRAIT(H, TRAIT_EMPATH, TRAIT_GENERIC) // Jester :3
-	else	
+	else
 		ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) // Joker >:(
 

code/modules/jobs/job_types/roguetown/courtier/magician.dm

@@ -4,8 +4,8 @@
 	department_flag = COURTIERS
 	selection_color = JCOLOR_COURTIER
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_races = list(
 		"Humen",

code/modules/jobs/job_types/roguetown/courtier/physician.dm

@@ -3,8 +3,8 @@
 	flag = PHYSICIAN
 	department_flag = NOBLEMEN
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_races = list(
 		"Humen",

code/modules/jobs/job_types/roguetown/garrison/bogguard.dm

@@ -3,8 +3,8 @@
 	flag = BOGGUARD
 	department_flag = GARRISON
 	faction = "Station"
-	total_positions = 10
-	spawn_positions = 10
+	total_positions = 0
+	spawn_positions = 0
 	selection_color = JCOLOR_SOLDIER
 	allowed_sexes = list(MALE, FEMALE)
 	allowed_races = list(
@@ -24,7 +24,7 @@
 	give_bank_account = 16
 	min_pq = 1
 	max_pq = null
-	
+
 	cmode_music = 'sound/music/combat_bog.ogg'
 
 	/// Chance to be spawned as a crossbowman instead

code/modules/jobs/job_types/roguetown/garrison/bogmaster.dm

@@ -3,8 +3,8 @@
 	flag = BOGMASTER
 	department_flag = GARRISON
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 	allowed_patrons = ALL_DIVINE_PATRONS
 	allowed_sexes = list(MALE, FEMALE)
 	allowed_races = list(
@@ -25,7 +25,7 @@
 
 	spells = list(/obj/effect/proc_holder/spell/self/convertrole/bog)
 	outfit = /datum/outfit/job/roguetown/bogmaster
-	
+
 	give_bank_account = 35
 	min_pq = 4
 	max_pq = null

code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm

@@ -3,8 +3,8 @@
 	flag = DUNGEONEER
 	department_flag = GARRISON
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_races = list(
 		"Humen",

code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm

@@ -3,8 +3,8 @@
 	flag = GATEMASTER
 	department_flag = GARRISON
 	faction = "Station"
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 0
+	spawn_positions = 0
 	allowed_sexes = list(MALE)
 	allowed_races = list("Humen")
 	allowed_patrons = ALL_DIVINE_PATRONS
@@ -15,7 +15,7 @@
 	give_bank_account = 3
 	min_pq = 4
 	max_pq = null
-	
+
 	cmode_music = 'sound/music/combat_guard2.ogg'
 
 /datum/job/roguetown/gatemaster/after_spawn(mob/living/L, mob/M, latejoin = TRUE)
@@ -64,7 +64,7 @@
 		H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
-		H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE) 
+		H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
 		H.change_stat("strength", 2)
 		H.change_stat("perception", 2)

code/modules/jobs/job_types/roguetown/garrison/manorguard.dm

@@ -3,8 +3,8 @@
 	flag = MANATARMS
 	department_flag = GARRISON
 	faction = "Station"
-	total_positions = 8
-	spawn_positions = 8
+	total_positions = 0
+	spawn_positions = 0
 
 	allowed_sexes = list(MALE)
 	allowed_races = list("Humen")
@@ -61,7 +61,7 @@
 		H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
-		H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE) 
+		H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE)
 		H.change_stat("strength", 2)