Adds stuff for the admin-only faction head roles and stuff etc.

code/modules/clothing/head/f13factionhead.dm

@@ -1437,6 +1437,12 @@ obj/item/clothing/head/f13/army/beret
 //wrights//
 ////////////
 
+/obj/item/clothing/head/helmet/f13/wrights/fedora
+	name = "beige fedora"
+	desc = "A fedora in beige."
+	icon_state = "wright_fedora"
+	item_state = "wright_fedora"
+
 /obj/item/clothing/head/helmet/f13/wrights/tophat
 	name = "black tophat"
 	desc = "The family top hat of the Wrights."

code/modules/clothing/under/f13.dm

@@ -1963,6 +1963,12 @@
 
 //Bishops
 
+/obj/item/clothing/under/f13/bishops/mayor
+	name = "navy blue suit"
+	desc = "A tailored suit, in navy blue, complete with a tie and pocket square."
+	icon_state = "bishop_mayor"
+	item_state = "bishop_mayor"
+
 /obj/item/clothing/under/f13/bishops/boss
 	name = "blue checkers"
 	desc = "Ay, dat's a nice suit ya got there. Be a shame if something were to happen to it."
@@ -2013,6 +2019,12 @@
 
 //wrights
 
+/obj/item/clothing/under/f13/wrights/patriarch
+	name = "well tailored suit"
+	desc = "A neat, well maintained suit."
+	icon_state = "wright_boss"
+	item_state = "wright_boss"
+
 /obj/item/clothing/under/f13/wrights/elder
 	name = "well tailored suit"
 	desc = "A neat, well maintained suit."

code/modules/fallout/obj/decor.dm

@@ -124,3 +124,182 @@
 	desc = "A sign indicating which cell block you are in prisoner."
 	icon = 'icons/fallout/objects/decals.dmi'
 	icon_state = "cells"
+
+//////////////////
+//new reno stuff//
+
+/obj/structure/decoration/framed
+	name = "DO NOT USE"
+	desc = "If you are seeing this text, somebody fucked up."
+	icon = 'icons/fallout/objects/decals.dmi'
+	icon_state = "no name"
+
+/obj/structure/decoration/framed/family_photos
+	name = "framed photos"
+	desc = "Framed photos of various people."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "wright_photos"
+
+/obj/structure/decoration/framed/diploma
+	name = "medical diploma"
+	desc = "A diploma from a Californian university."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "diploma"
+
+/obj/structure/decoration/framed/president_tandi
+	name = "portrait of a young woman"
+	desc = "A framed portrait of younger looking woman in a suit. The plaque reads 'Tandi N.M.; President of the New California Republic, 2196-2248'."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "portrait_kimball"
+
+/obj/structure/decoration/framed/president_kimball
+	name = "portrait of a middle aged man"
+	desc = "A framed portrait of a middle aged man in a suit with a military haircut. The plaque reads 'Aaron Kimball; President of the New California Republic'."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "portrait_kimball"
+
+/obj/structure/decoration/framed/mr_bishop
+	name = "portrait of a young man"
+	desc = "A framed portrait of a younger looking man in a suit with an eyepatch. The plaque reads 'John H. Bishop II; Mayor of the City-County of New Reno'."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "portrait_bishop"
+
+/obj/structure/decoration/framed/mr_wright
+	name = "portrait of an elderly man"
+	desc = "A framed portrait of an elderly man wearing a suit. The plaque reads 'Christopher Wright'."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "portrait_bishop"
+
+/obj/structure/decoration/framed/wright_photos
+	name = "framed photos"
+	desc = "Framed photos of various members of the Wright family."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "wright_photos"
+
+//flags
+
+/obj/structure/decoration/flag
+	name = "DO NOT USE"
+	desc = "If you are seeing this text, somebody fucked up."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "no name"
+
+/obj/structure/decoration/flag/ncr
+	name = "flag of the New California Republic"
+	desc = "The flag of the NCR. It's a bit faded, but still recognizable."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_ncr"
+
+/obj/structure/decoration/flag/ncr/pristine
+	name = "flag of the New California Republic"
+	desc = "The flag of the NCR. It is in perfect condition."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_ncr_pristine"
+
+/obj/structure/decoration/flag/cascadia
+	name = "flag of the Cascadia Republic"
+	desc = "The flag of the CR. It's a bit faded, but still recognizable."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_cascadia"
+
+/obj/structure/decoration/flag/cascadia/pristine
+	name = "flag of the Cascadia Republic"
+	desc = "The flag of the CR. It is in perfect condition."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_cascadia_pristine"
+
+/obj/structure/decoration/flag/legion
+	name = "flag of Caesar's legion"
+	desc = "The flag of that tribal horde in the east."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_legion"
+
+/obj/structure/decoration/flag/texas
+	name = "flag of Texas"
+	desc = "The flag of the Lone Star State. It's a bit faded, but still recognizable."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_texas"
+
+/obj/structure/decoration/flag/texas/pristine
+	name = "flag of Texas"
+	desc = "The flag of the Lone Star State. It is in perfect condition."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_texas"
+
+/obj/structure/decoration/flag/mexico
+	name = "flag of Mexico"
+	desc = "The flag of the United Mexican States. It's a bit faded and has a few holes, but still recognizable."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_texas"
+
+/obj/structure/decoration/flag/mexico/undamaged
+	name = "flag of Mexico"
+	desc = "The flag of the United Mexican States. It's a bit faded, but still recognizable."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_texas_undamaged"
+
+/obj/structure/decoration/flag/mexico/pristine
+	name = "flag of Mexico"
+	desc = "The flag of the United Mexican States. It is in perfect condition."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_texas_pristine"
+
+/obj/structure/decoration/flag/usa
+	name = "flag of America"
+	desc = "The flag of the United States of America. Although the government it once represented is long gone, these stars and stripes still mean a lot to some."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_usa"
+
+/obj/structure/decoration/flag/usa/tattered
+	name = "flag of America"
+	desc = "The flag of the United States of America. Although the government it once represented is long gone, these stars and stripes still mean a lot to some."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_usa_tattered"
+
+/obj/structure/decoration/flag/usa/undamaged
+	name = "flag of America"
+	desc = "The flag of the United States of America. Although the government it once represented is long gone, these stars and stripes still mean a lot to some."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_usa_undamaged"
+
+/obj/structure/decoration/flag/usa/pristine
+	name = "flag of America"
+	desc = "The flag of the United States of America. Although the government it once represented is long gone, these stars and stripes still mean a lot to some."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_usa_pristine"
+
+/obj/structure/decoration/flag/china
+	name = "flag of China"
+	desc = "The flag of the People's Republic of China. It's a bit faded, but still recognizable."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_china"
+
+/obj/structure/decoration/flag/china/pristine
+	name = "flag of China"
+	desc = "The flag of the People's Republic of China. It is in perfect condition."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_china_pristine"
+
+/obj/structure/decoration/flag/christian
+	name = "Christian flag"
+	desc = "A flag that represents Christianity and Christendom. It's a bit faded, but still recognizable."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_christian"
+
+/obj/structure/decoration/flag/christian/pristine
+	name = "Christian flag"
+	desc = "A flag that represents Christianity and Christendom. It is in perfect condition."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_christian_pristine"
+
+/obj/structure/decoration/flag/redcross
+	name = "Red Cross flag"
+	desc = "A flag generally used to identify medical instutions, but is by law reserved for the Californian Red Cross Society, the NCR's attempt at establishing a 'non-political' alternative to the Followers of the Apocalypse."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_redcross"
+
+/obj/structure/decoration/flag/redcross/pristine
+	name = "Red Cross flag"
+	desc = "A flag generally used to identify medical instutions, but is by law reserved for the Californian Red Cross Society, the NCR's attempt at establishing a 'non-political' alternative to the Followers of the Apocalypse."
+	icon = 'icons/fallout/objects/newreno.dmi'
+	icon_state = "flag_redcross_pristine"

code/modules/jobs/job_types/bishops.dm

@@ -18,14 +18,58 @@
 
 /*--------------------------------------------------------------*/
 
+/datum/job/bishops/f13mayor
+	title = "Mr Bishop"
+	flag = F13BISHOPSBOSS
+	department_flag = BISHOPS
+	total_positions = 0
+	spawn_positions = 0
+	supervisors = "The Federal government of the NCR, God"
+	description = "You are John Henry Bishop II (better known as Mr. Bishop), the leader of the Bishop family, you are also Mayor of the City-County of New Reno, blah blah blah, you're an admin so you should probably already know all of this"
+	selection_color = "#7C93AF"
+	exp_requirements = EXP_TYPE_BISHOPS
+
+	outfit = /datum/outfit/job/bishops/f13mayor
+
+	loadout_options = list(
+		/datum/outfit/loadout/handcannon,		// Desert Eagle
+		/datum/outfit/loadout/mylittlefriend,	// American180
+		)
+
+/datum/outfit/job/bishops/f13mayor
+	name = "Bishop Mayor"
+	jobtype = /datum/job/bishops/f13mayor
+
+	uniform	= /obj/item/clothing/under/f13/bishops/mayor
+	id = /obj/item/card/id/reno/bishops/ring/boss
+	accessory = null
+	shoes = /obj/item/clothing/shoes/laceup
+	head = /obj/item/clothing/head/helmet/f13/bishops/fedora
+	neck = /obj/item/clothing/neck/mayoral_sash
+	glasses = /obj/item/clothing/glasses/eyepatch
+	gloves = null
+	suit = /obj/item/clothing/suit/armor/f13/bishops/boss
+	suit_store = null
+	r_hand = null
+	backpack = /obj/item/storage/backpack/satchel/leather/withwallet
+	satchel = /obj/item/storage/backpack/satchel/leather/withwallet
+	backpack_contents = list(
+		/obj/item/clothing/mask/cigarette/cigar/ncr = 1,
+		/obj/item/lighter/gold = 1,
+		/obj/item/melee/onehanded/knife/switchblade = 1,
+		/obj/item/storage/bag/money/small/huge = 1
+		)
+
+/*--------------------------------------------------------------*/
+
 /datum/job/bishops/f13boss
-	title = "Bishop Boss"
+	title = "Bishop Underboss"
 	flag = F13BISHOPSBOSS
 	department_flag = BISHOPS
 	total_positions = 1
 	spawn_positions = 1
 	supervisors = "Mr Bishop"
-	description = "You are the head of the Bishop family. Your management of the Shark Club, the most famous casino in the city, and the good relations of the family with the NCR, have placed the gang in a comfortable situation, attracting most of the new blood in the city among their ranks, making the Bishops the most 'populated' family in New Reno. Manage the Casino, organize meetings with the other gangs to make ends meet, rely on prostitution, if necessary, assign soldiers to your capos, allow capos to have some level of autonomy regarding their soldiers, as long as it doesn't hinder the flow of business, and remember to get someone to manage the acts at the Shark to attract visitors. Though you have made it to the top, you never know who may be plotting against you to take your place, so always be weary, even of your own family."
+	description = "You are the second highest member of the Bishop family, with your only superior being Mr. John H. Bishop himself. Your management of the Shark Club, the most famous casino in the city, and the good relations of the family with the NCR, have placed the gang in a comfortable situation, attracting most of the new blood in the city among their ranks, making the Bishops the most 'populated' family in New Reno. Manage the Casino, organize meetings with the other gangs to make ends meet, rely on prostitution, if necessary, assign soldiers to your capos, allow capos to have some level of autonomy regarding their soldiers, as long as it doesn't hinder the flow of business, and remember to get someone to manage the acts at the Shark to attract visitors. Though you have made it to the top, you never know who may be plotting against you to take your place, so always be weary, even of your own family."
 	selection_color = "#7C93AF"
 	exp_requirements = EXP_TYPE_BISHOPS
 
@@ -37,15 +81,15 @@
 		)
 
 /datum/outfit/job/bishops/f13boss
-	name = "Bishop Boss"
+	name = "Bishop Undeross"
 	jobtype = /datum/job/bishops/f13boss
 
 	uniform	= /obj/item/clothing/under/f13/bishops/boss
 	id = /obj/item/card/id/reno/bishops/ring/boss
 	accessory = null
 	shoes = /obj/item/clothing/shoes/laceup
 	head = /obj/item/clothing/head/helmet/f13/bishops/fedora
-	neck = /obj/item/clothing/neck/mayoral_sash
+	neck = null
 	gloves = null
 	suit = /obj/item/clothing/suit/armor/f13/bishops/boss
 	suit_store = null
@@ -100,8 +144,8 @@
 	department_flag = BISHOPS
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the Bishop Boss"
-	description = "You are the wife of the Boss; how this happened? Who knows, maybe it was a drunken marriage. While you have no real responsibilities you do hold some level of authority, albeit lesser than that of the boss. You may find yourself doing things like micromanaging the casino staff, pestering the boss and the mobsters, and getting thrown off the third story of the Shark Club in an impromptu divorce."
+	supervisors = "the Bishop Underboss"
+	description = "You are the wife of the Underboss; how this happened? Who knows, maybe it was a drunken marriage. While you have no real responsibilities you do hold some level of authority, albeit lesser than that of the boss. You may find yourself doing things like micromanaging the casino staff, pestering the boss and the mobsters, and getting thrown off the third story of the Shark Club in an impromptu divorce."
 	selection_color = "#7C93AF"
 	exp_requirements = EXP_TYPE_BISHOPS
 
@@ -165,7 +209,7 @@
 	department_flag = BISHOPS
 	total_positions = 2
 	spawn_positions = 2
-	supervisors = "the Bishop Boss"
+	supervisors = "the Bishop Underboss, Mr. Bishop"
 	description = "You have proven your worth as an earner for the Bishop Family and, as such, it has been trusted to you to lead a small band of made men for the boss. You are the mediator between the head of the family and said made men, so expect to be given some level of autonomy to use your subordinates in the most efficient way possible to meet the needs of the boss and the family. Should the made men not be assigned to you by the Boss, the decision will fall unto you and the other capos. Help to manage the Casino, make sure there's entertainment for the visitors, follow the instructions of your superior, keep the made men in line."
 	selection_color = "#8CA2BD"
 	exp_requirements = EXP_TYPE_BISHOPS
@@ -246,7 +290,7 @@
 	outfit = /datum/outfit/job/bishops/f13mademan
 
 	loadout_options = list(
-		/datum/outfit/loadout/fedora1,
+		/datum/outfit/loadout/fedora,
 		/datum/outfit/loadout/fedora2,
 		/datum/outfit/loadout/fedora3,
 		/datum/outfit/loadout/fedora4

code/modules/jobs/job_types/wrights.dm

@@ -19,6 +19,47 @@
 	ears = /obj/item/radio/headset/headset_wrights
 /*--------------------------------------------------------------*/
 
+/datum/job/wrights/f13patriarch
+	title = "Wright Patriarch"
+	flag = F13WRIGHTSELDER
+	department_flag = WRIGHTS
+	total_positions = 0
+	spawn_positions = 0
+	supervisors = "God"
+	description = "You are the head of the Wright family. Although small, the Wrights are a proud and prosperous family, and it falls onto you to ensure that all the members keep the core tenets of your organization by avoiding both the consumption and distribution of chems and prostitution. To compensate, you have in your power the monopoly to the local production of alcohol and access to most of the cheap guns in the area. Assign soldiers to your capos. Allow capos to have some level of autonomy regarding their soldiers, as long as it doesn't hinder the flow of business. Talk to your underboss to help you coordinate the affairs of the gang. You are the most proper and correct family in New Reno: Be polite, don't act like a thug, and keep bums and vagrants away from your territory."
+	selection_color = "#A27954"
+	exp_requirements = EXP_TYPE_WRIGHTS
+
+	outfit = /datum/outfit/job/wrights/f13patriarch
+
+	loadout_options = list(
+		/datum/outfit/loadout/feelluckypunk,		// .44 magnum
+		/datum/outfit/loadout/householddefense,	// lever action
+		)
+
+/datum/outfit/job/wrights/f13patriarch
+	name = "Wright Patriarch"
+	jobtype = /datum/job/wrights/f13patriarch
+
+	uniform	= /obj/item/clothing/under/f13/wrights/patriarch
+	id = /obj/item/card/id/reno/wrights/ring/boss
+	accessory = null
+	shoes = /obj/item/clothing/shoes/laceup
+	head = /obj/item/clothing/head/helmet/f13/wrights/fedora
+	neck = /obj/item/storage/belt/holster
+	gloves = /obj/item/clothing/gloves/f13/crudemedical/formal
+	suit = /obj/item/clothing/suit/armor/f13/wrights/elder
+	suit_store = null
+	r_hand = null
+	backpack = /obj/item/storage/backpack/satchel/leather
+	satchel = /obj/item/storage/backpack/satchel/leather
+	backpack_contents = list(
+		/obj/item/clothing/mask/cigarette/pipe = 1,
+		/obj/item/storage/bag/money/small/large = 1,
+		)
+
+/*--------------------------------------------------------------*/
+
 /datum/job/wrights/f13wrightelder
 	title = "Wright Elder"
 	flag = F13WRIGHTSELDER