MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
ENLISTMENT BONUSES:
EDUCATION: Earn full tuition for 4+ years & merit-based scholarships.VACATIONS: 30 days paid annual vacation.HEALTHCARE: Free healthcare for full-time Soldiers, reduced premiums for Army Reserve and Army National Guard.VA LOAN: Purchase a home with 0% down.STIPEND: Money for books, meals, and other living expenses.HOUSING: Paid rent and utilities.___Fill out this form and we’ll put you in touch with a recruiter who can answer questions and offer opportunities in the U.S. Army:First Name: Last Name: Age: Phone: City: State: Postal Code:";
+ name = "us recruitment pamphlet"
+ },
+/obj/item/paper/pamphlet{
+ info = "
FIND YOUR CAREER IN THE U.S. ARMY
BENEFITS FOR YOU NOW.SECURITY FOR YOUR FUTURE.
___
LEARN HOW TO JOIN:
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
ENLISTMENT BONUSES:
EDUCATION: Earn full tuition for 4+ years & merit-based scholarships.VACATIONS: 30 days paid annual vacation.HEALTHCARE: Free healthcare for full-time Soldiers, reduced premiums for Army Reserve and Army National Guard.VA LOAN: Purchase a home with 0% down.STIPEND: Money for books, meals, and other living expenses.HOUSING: Paid rent and utilities.___Fill out this form and we’ll put you in touch with a recruiter who can answer questions and offer opportunities in the U.S. Army:First Name: Last Name: Age: Phone: City: State: Postal Code:";
+ name = "us recruitment pamphlet"
+ },
+/obj/item/paper/pamphlet{
+ info = "
FIND YOUR CAREER IN THE U.S. ARMY
BENEFITS FOR YOU NOW.SECURITY FOR YOUR FUTURE.
___
LEARN HOW TO JOIN:
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
ENLISTMENT BONUSES:
EDUCATION: Earn full tuition for 4+ years & merit-based scholarships.VACATIONS: 30 days paid annual vacation.HEALTHCARE: Free healthcare for full-time Soldiers, reduced premiums for Army Reserve and Army National Guard.VA LOAN: Purchase a home with 0% down.STIPEND: Money for books, meals, and other living expenses.HOUSING: Paid rent and utilities.___Fill out this form and we’ll put you in touch with a recruiter who can answer questions and offer opportunities in the U.S. Army:First Name: Last Name: Age: Phone: City: State: Postal Code:";
+ name = "us recruitment pamphlet"
+ },
+/obj/item/paper/pamphlet{
+ info = "
FIND YOUR CAREER IN THE U.S. ARMY
BENEFITS FOR YOU NOW.SECURITY FOR YOUR FUTURE.
___
LEARN HOW TO JOIN:
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
ENLISTMENT BONUSES:
EDUCATION: Earn full tuition for 4+ years & merit-based scholarships.VACATIONS: 30 days paid annual vacation.HEALTHCARE: Free healthcare for full-time Soldiers, reduced premiums for Army Reserve and Army National Guard.VA LOAN: Purchase a home with 0% down.STIPEND: Money for books, meals, and other living expenses.HOUSING: Paid rent and utilities.___Fill out this form and we’ll put you in touch with a recruiter who can answer questions and offer opportunities in the U.S. Army:First Name: Last Name: Age: Phone: City: State: Postal Code:";
+ name = "us recruitment pamphlet"
+ },
+/obj/item/paper/pamphlet{
+ info = "
FIND YOUR CAREER IN THE U.S. ARMY
BENEFITS FOR YOU NOW.SECURITY FOR YOUR FUTURE.
___
LEARN HOW TO JOIN:
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
MEETING WITH A RECRUITER: The first step for eligible recruits who want to find out more is to sit down with a recruiter. Recruiters are the most qualified people to help you find out what's the most appropiate way to serve your country.REQUIRED DOCUMENTS: Your local recruiter will help identify what documents are required for enlistment and will also help you get replacements or copies of any documents that will be needed.ACADEMIC EVALUATION: After speaking to a recruiter, your next step will be to take the Armed Services Occupational Aptitude Test (A.S.O.A.T.). The A.S.O.A.T. is a multiple-choice test designed to pinpoint your strengths and identify which Military Occupational Specialty (M.O.S.) or Army job best suits you.PHYSICAL FITNESS EVALUATION: Your recruiter will help you schedule an appointment at the nearest Military Entrance Processing Station (M.E.P.S.). At M.E.P.S. they will determine if you are qualified to serve and what jobs best fit you. This is also where you will take your physical examination.ARMY CAREERS: The Army offers over 150 different careers in a wide variety of categories. The key to your career path is your A.S.O.A.T. score, which helps to identify the Army jobs that fit you the best.PREP FOR BASIC COMBAT TRAINING: Now that you have taken the A.S.O.A.T., passed your physical and chosen a career path, you are ready to move on to the important training necessary to becoming a Soldier: Basic Combat Training.
@@ -105,9 +133,9 @@
dat = reeltext
else
- dat = {"[SPIN_PRICE] caps to play!
- Prize Money Available: [money] (jackpot payout is ALWAYS 100%!)
- Caps Remaining: [balance]
+ dat = {"Five dollars to play!
+ Prize Money Available: [money]
+ Credit Remaining: [balance]
[plays] players have tried their luck today, and [jackpots] have won a jackpot! Play!
@@ -129,42 +157,39 @@
spin(usr)
else if(href_list["refund"])
- drop_caps(balance)
- updateDialog()
+ give_money(balance, TRUE)
+ balance = 0
-/obj/machinery/computer/slot_machine/proc/drop_caps(amt)
- // Come back when you're a little bit richer...
- if(!balance)
- return FALSE
-
- if(isturf(get_turf(src)))
- var/currentamt = amt
- // Stop cash stacks from going over their limit.
- if(currentamt >= MAX_CASH_STACK_AMOUNT)
- while(currentamt >= MAX_CASH_STACK_AMOUNT)
- var/obj/item/stack/f13Cash/moneytodrop = new /obj/item/stack/f13Cash/caps(get_turf(src))
- moneytodrop.amount = MAX_CASH_STACK_AMOUNT
- moneytodrop.use(0) //Hacky, updates the sprite
- currentamt -= MAX_CASH_STACK_AMOUNT
- if(currentamt)
- var/obj/item/stack/f13Cash/moneytodrop = new /obj/item/stack/f13Cash/caps(get_turf(src))
- moneytodrop.amount = currentamt
- moneytodrop.use(0) //Hacky, updates the sprite
- balance -= amt
- return TRUE
-
- return FALSE
+/obj/machinery/computer/slot_machine/emp_act(severity)
+ . = ..()
+ if(stat & (NOPOWER|BROKEN) || . & EMP_PROTECT_SELF)
+ return
+ if(prob(1500 / severity))
+ return
+ if(prob(1 * severity/100)) // :^)
+ obj_flags |= EMAGGED
+ var/severity_ascending = 4 - severity
+ money = max(rand(money - (200 * severity_ascending), money + (200 * severity_ascending)), 0)
+ balance = max(rand(balance - (50 * severity_ascending), balance + (50 * severity_ascending)), 0)
+ money -= max(0, give_money(min(rand(-50, 100 * severity_ascending)), money)) //This starts at -50 because it shouldn't always dispense coins yo
+ spin()
/obj/machinery/computer/slot_machine/proc/spin(mob/user)
- if(!can_spin(user) || !user)
+ if(!can_spin(user))
return
- visible_message("[user] pulls the lever and the slot machine starts spinning!")
+ var/the_name
+ if(user)
+ the_name = user.real_name
+ visible_message("[user] pulls the lever and the slot machine starts spinning!")
+ else
+ the_name = "Exaybachay"
balance -= SPIN_PRICE
money += SPIN_PRICE
+ consumed_money += round(SPIN_PRICE / 2) // So you can't abuse it to hell and just play yourself until jackpot
plays += 1
- working = TRUE
+ working = 1
toggle_reel_spin(1)
update_icon()
@@ -178,8 +203,8 @@
spawn(SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len)) //WARNING: no sanity checking for user since it's not needed and would complicate things (machine should still spin even if user is gone), be wary of this if you're changing this code.
toggle_reel_spin(0, REEL_DEACTIVATE_DELAY)
- working = FALSE
- give_prizes(user)
+ working = 0
+ give_prizes(the_name, user)
update_icon()
updateDialog()
@@ -209,26 +234,26 @@
reel[2] = reel[1]
reel[1] = pick(symbols)
-/obj/machinery/computer/slot_machine/proc/give_prizes(mob/user)
+/obj/machinery/computer/slot_machine/proc/give_prizes(usrname, mob/user)
var/linelength = get_lines()
if(reels[1][2] + reels[2][2] + reels[3][2] + reels[4][2] + reels[5][2] == "[SEVEN][SEVEN][SEVEN][SEVEN][SEVEN]")
- visible_message("[src] says, 'JACKPOT! You win [money] caps!'")
+ visible_message("[src] says, 'JACKPOT! You win [JACKPOT] dollars!'")
+ priority_announce("Congratulations to [user ? user.real_name : usrname] for winning the jackpot at the slot machine in [get_area(src)]!")
jackpots += 1
- give_money(money)
- money = 0
+ give_money(JACKPOT)
else if(linelength == 5)
- visible_message("[src] says, 'Big Winner! You win [BIG_PRIZE] caps!'")
+ visible_message("[src] says, 'Big Winner! You win [BIG_PRIZE] dollars!'")
give_money(BIG_PRIZE)
else if(linelength == 4)
- visible_message("[src] says, 'Winner! You win [SMALL_PRIZE] caps!'")
+ visible_message("[src] says, 'Winner! You win [BIG_PRIZE] dollars!'")
give_money(SMALL_PRIZE)
else if(linelength == 3)
to_chat(user, "You win three free games!")
- give_money(SPIN_PRICE * 4)
+ balance += SPIN_PRICE * 4
money = max(money - SPIN_PRICE * 4, money)
else
@@ -253,13 +278,24 @@
return amountthesame
-/obj/machinery/computer/slot_machine/proc/give_money(amt)
- balance += amt
+/obj/machinery/computer/slot_machine/proc/give_money(amount, force = FALSE)
+ if(amount < 1)
+ return
+ var/amount_to_give = amount
+ if(!force) // So if it's a balance refund - don't do the shit below
+ amount_to_give = money >= amount ? amount : money
+ money = max(0, money - amount)
+ // Spawn the money
+ playsound(src, 'sound/items/coinflip.ogg', 60, 1)
+ var/obj/item/stack/f13Cash/winning_money = new /obj/item/stack/f13Cash
+ winning_money.amount = amount_to_give
+ winning_money.update_desc()
+ winning_money.update_icon()
+ winning_money.forceMove(src.loc)
#undef SEVEN
#undef SPIN_TIME
-#undef DEFAULT_JACKPOT
+#undef JACKPOT
#undef BIG_PRIZE
#undef SMALL_PRIZE
#undef SPIN_PRICE
-#undef MAX_CASH_STACK_AMOUNT
diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm
index 3951627af2..435ceb33af 100644
--- a/code/game/machinery/telecomms/machines/bus.dm
+++ b/code/game/machinery/telecomms/machines/bus.dm
@@ -61,8 +61,8 @@
/obj/machinery/telecomms/bus/preset_three
id = "Bus 3"
network = "tcommsat"
- freq_listening = list(FREQ_VAULT, FREQ_NCR, FREQ_ENCLAVE, FREQ_TOWN, FREQ_FOLLOWERS)
- autolinkers = list("processor3","vault", "enclave", "town", "followers")
+ freq_listening = list(FREQ_SECURITY, FREQ_COMMAND, FREQ_VAULT, FREQ_NCR, FREQ_BOS, FREQ_ENCLAVE, FREQ_DEN, FREQ_TOWN, FREQ_LEGION, FREQ_RANGER, FREQ_KHANS, FREQ_SALVATORES, FREQ_BISHOPS, FREQ_MORDINOS, FREQ_WRIGHTS, FREQ_HOTEL, FREQ_FOLLOWERS)
+ autolinkers = list("processor3", "security", "command", "den","vault", "ncr", "bos", "enclave", "town", "legion", "ranger", "khans", "salvatores", "bishops", "mordinos", "wrights", "hotel", "followers")
/obj/machinery/telecomms/bus/preset_four
id = "Bus 4"
diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm
index 56b32f478a..f741972c8f 100644
--- a/code/game/machinery/telecomms/machines/receiver.dm
+++ b/code/game/machinery/telecomms/machines/receiver.dm
@@ -60,7 +60,7 @@
id = "Receiver B"
network = "tcommsat"
autolinkers = list("receiverB") // link to relay
- freq_listening = list(FREQ_VAULT, FREQ_NCR, FREQ_ENCLAVE, FREQ_TOWN, FREQ_LEGION, FREQ_RANGER, FREQ_FOLLOWERS)
+ freq_listening = list(FREQ_COMMAND, FREQ_ENGINEERING, FREQ_SECURITY, FREQ_VAULT, FREQ_NCR, FREQ_BOS, FREQ_ENCLAVE, FREQ_DEN, FREQ_TOWN, FREQ_LEGION, FREQ_RANGER, FREQ_KHANS, FREQ_SALVATORES, FREQ_BISHOPS, FREQ_MORDINOS, FREQ_WRIGHTS, FREQ_HOTEL, FREQ_FOLLOWERS)
//Common and other radio frequencies for people to freely use
/obj/machinery/telecomms/receiver/preset_right/Initialize()
diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm
index 8eaef7b4a7..13c10a9ed5 100644
--- a/code/game/machinery/telecomms/machines/server.dm
+++ b/code/game/machinery/telecomms/machines/server.dm
@@ -147,6 +147,31 @@
freq_listening = list(FREQ_KHANS)
autolinkers = list("khans")
+/obj/machinery/telecomms/server/presets/salvatores
+ id = "Salvatores Server"
+ freq_listening = list(FREQ_SALVATORES)
+ autolinkers = list("salvatores")
+
+/obj/machinery/telecomms/server/presets/bishops
+ id = "Bishops Server"
+ freq_listening = list(FREQ_BISHOPS)
+ autolinkers = list("bishops")
+
+/obj/machinery/telecomms/server/presets/mordinos
+ id = "Mordinos Server"
+ freq_listening = list(FREQ_MORDINOS)
+ autolinkers = list("mordinos")
+
+/obj/machinery/telecomms/server/presets/wrights
+ id = "Wrights Server"
+ freq_listening = list(FREQ_WRIGHTS)
+ autolinkers = list("wrights")
+
+/obj/machinery/telecomms/server/presets/hotel
+ id = "Hotel Server"
+ freq_listening = list(FREQ_HOTEL)
+ autolinkers = list("hotel")
+
/obj/machinery/telecomms/server/presets/followers
id = "Followers Server"
freq_listening = list(FREQ_FOLLOWERS)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 9545ea1143..79f90a46d5 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -923,3 +923,174 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer
/obj/effect/landmark/start/f13/followersscientist
name = "Followers Scientist"
+
+////////
+//Reno//
+////////
+
+//salvatores
+/obj/effect/landmark/start/f13/don
+ name = "Salvatores Don"
+ icon_state = "Salvatores Don"
+
+/obj/effect/landmark/start/f13/underboss
+ name = "Salvatores Underboss"
+ icon_state = "Salvatores Underboss"
+
+/obj/effect/landmark/start/f13/capo
+ name = "Salvatores Capo"
+ icon_state = "Salvatores Capo"
+
+/obj/effect/landmark/start/f13/soldier
+ name = "Salvatores Soldier"
+ icon_state = "Salvatores Soldier"
+
+/obj/effect/landmark/start/f13/bartender
+ name = "Salvatores Bartender"
+ icon_state = "Salvatores Bartender"
+
+/obj/effect/landmark/start/f13/roboticist
+ name = "Salvatores Roboticist"
+ icon_state = "Salvatores Roboticist"
+
+//mordinos
+
+/obj/effect/landmark/start/f13/mordinos/boss
+ name = "Mordinos Boss"
+ icon_state = "Mordinos Boss"
+
+/obj/effect/landmark/start/f13/mordinos/underboss
+ name = "Mordinos Underboss"
+ icon_state = "Mordinos Underboss"
+
+/obj/effect/landmark/start/f13/mordinos/capo
+ name = "Mordinos Capo"
+ icon_state = "Mordinos Capo"
+
+/obj/effect/landmark/start/f13/mordinos/soldier
+ name = "Mordinos Goon"
+ icon_state = "Mordinos Goon"
+
+/obj/effect/landmark/start/f13/mordinos/bartender
+ name = "Mordinos Casino Worker"
+ icon_state = "Mordinos Casino Worker"
+
+/obj/effect/landmark/start/f13/mordinos/chemist
+ name = "Mordinos Chemist"
+ icon_state = "Mordinos Chemist"
+
+//bishops
+
+/obj/effect/landmark/start/f13/bishops/boss
+ name = "Bishops Boss"
+ icon_state = "Bishops Boss"
+
+/obj/effect/landmark/start/f13/bishops/underboss
+ name = "Bishops Underboss"
+ icon_state = "Bishops Underboss"
+
+/obj/effect/landmark/start/f13/bishops/capo
+ name = "Bishops Capo"
+ icon_state = "Bishops Capo"
+
+/obj/effect/landmark/start/f13/bishops/soldier
+ name = "Bishops Soldier"
+ icon_state = "Bishops Soldier"
+
+/obj/effect/landmark/start/f13/bishops/bartender
+ name = "Bishops Casino Worker"
+ icon_state = "Bishops Casino Worker"
+
+/obj/effect/landmark/start/f13/bishops/comedian
+ name = "Bishops Comedian"
+ icon_state = "Bishops Comedian"
+
+
+//wrights
+/obj/effect/landmark/start/f13/wrights/boss
+ name = "Wrights Boss"
+ icon_state = "Wrights Boss"
+
+/obj/effect/landmark/start/f13/wrights/underboss
+ name = "Wrights Underboss"
+ icon_state = "Wrights Underboss"
+
+/obj/effect/landmark/start/f13/wrights/capo
+ name = "Wrights Capo"
+ icon_state = "Wrights Capo"
+
+/obj/effect/landmark/start/f13/wrights/soldier
+ name = "Wrights Soldier"
+ icon_state = "Wrights Soldier"
+
+//hotel
+
+/obj/effect/landmark/start/f13/civilians/hotelowner
+ name = "Hotel Owner"
+ icon_state = "Hotel Owner"
+
+/obj/effect/landmark/start/f13/civilians/hotelconcierge
+ name = "Hotel Concierges"
+ icon_state = "Hotel Concierges"
+
+//citizens
+
+/obj/effect/landmark/start/f13/civilians/yakuza
+ name = "Yakuza"
+ icon_state = "Yakuza"
+
+/obj/effect/landmark/start/f13/civilians/pharmacist
+ name = "Pharmacist"
+ icon_state = "Pharmacist"
+
+/obj/effect/landmark/start/f13/civilians/armsdealer
+ name = "Arms Dealer"
+ icon_state = "Arms Dealer"
+
+/obj/effect/landmark/start/f13/civilians/priest
+ name = "Priest"
+ icon_state = "Priest"
+
+/obj/effect/landmark/start/f13/civilians/junglegymowner
+ name = "Jungle Gym Owner"
+ icon_state = "Jungle Gym Owner"
+
+/obj/effect/landmark/start/f13/civilians/bum
+ name = "Bum"
+ icon_state = "Bum"
+
+/obj/effect/landmark/start/f13/civilians/mercenary
+ name = "Mercenary"
+ icon_state = "Mercenary"
+
+/obj/effect/landmark/start/f13/civilians/peasant
+ name = "Peasant"
+ icon_state = "Peasant"
+
+/obj/effect/landmark/start/f13/civilians/renodoctor
+ name = "Reno Doctor"
+ icon_state = "Reno Doctor"
+
+/obj/effect/landmark/start/f13/civilians/raider
+ name = "Raider"
+ icon_state = "Raider"
+
+/obj/effect/landmark/start/f13/civilians/tourist
+ name = "Tourist"
+ icon_state = "Tourist"
+
+/obj/effect/landmark/start/f13/civilians/brahminbaron
+ name = "Brahmin Baron"
+ icon_state = "Brahmin Baron"
+
+/obj/effect/landmark/start/f13/civilians/ambassador
+ name = "NCR Ambassador"
+ icon_state = "NCR Ambassador"
+
+/obj/effect/landmark/start/f13/civilians/provostmarshal
+ name = "NCRA Provost Marshal"
+ icon_state = "NCRA Provost Marshal"
+
+/obj/effect/landmark/start/f13/civilians/militarypolice
+ name = "NCRA Military Police"
+ icon_state = "NCRA Military Police"
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 9306b59d71..8e3235e7d7 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -21,6 +21,11 @@
user.visible_message("[user] begins to swipe [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
return BRUTELOSS
+/obj/item/card/slotmachine
+ name = "slot machine card"
+ desc = "Allows you to cash out the stored money inside of the slot machines."
+ icon_state = "budgetcard"
+
/obj/item/card/data
name = "data card"
desc = "A plastic magstripe card for simple and speedy data storage and transfer. This one has a stripe running down the middle."
@@ -932,7 +937,7 @@
item_state = "card-doctor"
assignment = "citizenship permit"
access = list(ACCESS_BAR)
-
+
/obj/item/card/id/dogtag/MDfakepermit
name = "faded medical license"
desc = "a revoked medical license. This is why we do not remove people's skeletons "
@@ -1280,3 +1285,223 @@
assignment = "US dogtags"
access = list(ACCESS_ENCLAVE)
+///////////
+//RENO ID//
+///////////
+
+//bishops
+
+/obj/item/card/id/reno/bishops/ring/soldier
+ name = "bronze ring"
+ desc = "An old ring that is seemingly of some value."
+ icon_state = "bronze_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "bishop bronze ring"
+ access = list(ACCESS_BISHOPS)
+
+/obj/item/card/id/reno/bishops/ring/officer
+ name = "silver ring"
+ desc = "A well crafted silver ring."
+ icon_state = "silver_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "bishop silver ring"
+ access = list(ACCESS_BISHOPS)
+
+/obj/item/card/id/reno/bishops/ring/boss
+ name = "golden ring"
+ desc = "A ring that is seemingly made of gold. Seems valuable."
+ icon_state = "bishop_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "bishop golden ring"
+ access = list(ACCESS_BISHOPS)
+
+/obj/item/card/id/reno/bishops/papers/worker
+ name = "employment papers"
+ desc = "Papers detailing general information about an employee."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "bishop employment papers"
+ access = list(ACCESS_BISHOPS)
+
+//mordinos
+
+/obj/item/card/id/reno/mordinos/ring/soldier
+ name = "bronze ring"
+ desc = "An old ring that is seemingly of some value."
+ icon_state = "bronze_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "mordino bronze ring"
+ access = list(ACCESS_MORDINOS)
+
+/obj/item/card/id/reno/mordinos/ring/officer
+ name = "silver ring"
+ desc = "A well crafted silver ring."
+ icon_state = "silver_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "bishop silver ring"
+ access = list(ACCESS_MORDINOS)
+
+/obj/item/card/id/reno/mordinos/ring/boss
+ name = "golden ring"
+ desc = "A ring that is seemingly made of gold. Seems valuable."
+ icon_state = "mordino_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "mordino golden ring"
+ access = list(ACCESS_MORDINOS)
+
+/obj/item/card/id/reno/mordinos/papers/worker
+ name = "employment papers"
+ desc = "Papers detailing general information about an employee."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "mordino employment papers"
+ access = list(ACCESS_MORDINOS)
+
+/obj/item/card/id/reno/mordinos/papers/chemist
+ name = "employment papers"
+ desc = "Papers detailing general information about an employee."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "mordino employment papers"
+ access = list(ACCESS_MORDINOS)
+
+//salvatores
+
+/obj/item/card/id/reno/salvatores/ring/soldier
+ name = "bronze ring"
+ desc = "An old ring that is seemingly of some value."
+ icon_state = "bronze_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "salvatore bronze ring"
+ access = list(ACCESS_SALVATORES)
+
+/obj/item/card/id/reno/salvatores/ring/officer
+ name = "silver ring"
+ desc = "A well crafted silver ring."
+ icon_state = "silver_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "salvatore silver ring"
+ access = list(ACCESS_SALVATORES)
+
+/obj/item/card/id/reno/salvatores/ring/don
+ name = "golden ring"
+ desc = "A ring that is seemingly made of gold. Seems valuable."
+ icon_state = "salvatore_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "salvatore gold ring"
+ access = list(ACCESS_SALVATORES)
+
+/obj/item/card/id/reno/salvatores/papers/worker
+ name = "employment papers"
+ desc = "Papers detailing general information about an employee."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "salvatore employment papers"
+ access = list(ACCESS_SALVATORES)
+
+//wrights
+
+/obj/item/card/id/reno/wrights/ring/soldier
+ name = "bronze ring"
+ desc = "An old ring that is seemingly of some value."
+ icon_state = "bronze_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "wright bronze ring"
+ access = list(ACCESS_WRIGHTS)
+
+/obj/item/card/id/reno/wrights/ring/officer
+ name = "silver ring"
+ desc = "A well crafted silver ring."
+ icon_state = "silver_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "wright silver ring"
+ access = list(ACCESS_WRIGHTS)
+
+/obj/item/card/id/reno/wrights/ring/boss
+ name = "golden ring"
+ desc = "A ring that is seemingly made of gold. Seems valuable."
+ icon_state = "wright_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "wright golden ring"
+ access = list(ACCESS_WRIGHTS)
+
+//misc
+
+/obj/item/card/id/reno/hotel/papers/owner
+ name = "hotel deed"
+ desc = "Papers detailing the official ownership of New Reno's hotel."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "hotel deed"
+ access = list(ACCESS_HOTEL)
+
+/obj/item/card/id/reno/hotel/papers/worker
+ name = "employment papers"
+ desc = "Papers detailing general information about an employee."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "hotel employment papers"
+ access = list(ACCESS_HOTEL)
+
+/obj/item/card/id/reno/nra/papers/owner
+ name = "new reno arms deed"
+ desc = "Papers detailing the official ownership of New Reno Arms."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "NRA deed"
+ access = list(ACCESS_NRA)
+
+/obj/item/card/id/reno/junglegym/papers/owner
+ name = "jungle gym deed"
+ desc = "Papers detailing the official ownership of the Jungle Gym."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "jungle gym deed"
+ access = list(ACCESS_GYM)
+
+/obj/item/card/id/reno/clinic/papers
+ name = "medical license"
+ desc = "Papers showing a medical license of sorts. You aren't sure if it is credible or not."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "medical license"
+ access = list(ACCESS_RENO_CLINIC)
+
+/obj/item/card/id/reno/pharmacy/owner
+ name = "pharmacy deed"
+ desc = "Papers detailing the offical ownership of the New Reno Pharmacy."
+ icon_state = "papers"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "pharmacy deed"
+ access = list(ACCESS_PHAR)
+
+/obj/item/card/id/reno/yakuza/ring
+ name = "silver ring"
+ desc = "A well crafted silver ring with a funny dragon on it."
+ icon_state = "silver_ring"
+ item_state = null
+ uses_overlays = FALSE
+ assignment = "yakuza ring"
+ access = list(ACCESS_YAKUZA)
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index d80ad519fe..9cdec05757 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -207,6 +207,36 @@
icon_state = "cypherkey"
channels = list(RADIO_CHANNEL_KHANS = 1)
+/obj/item/encryptionkey/headset_salvatores
+ name = "Salvatores radio encryption key"
+ desc = "An encryption key for a radio headset. To access the Salvatore channel, use :s."
+ icon_state = "cypherkey"
+ channels = list(RADIO_CHANNEL_SALVATORES = 1)
+
+/obj/item/encryptionkey/headset_bishops
+ name = "Bishops radio encryption key"
+ desc = "An encryption key for a radio headset. To access the Bishop channel, use :b."
+ icon_state = "cypherkey"
+ channels = list(RADIO_CHANNEL_BISHOPS = 1)
+
+/obj/item/encryptionkey/headset_mordinos
+ name = "Mordinos radio encryption key"
+ desc = "An encryption key for a radio headset. To access the Mordino channel, use :m."
+ icon_state = "cypherkey"
+ channels = list(RADIO_CHANNEL_MORDINOS = 1)
+
+/obj/item/encryptionkey/headset_wrights
+ name = "Wrights radio encryption key"
+ desc = "An encryption key for a radio headset. To access the Wright channel, use :w."
+ icon_state = "cypherkey"
+ channels = list(RADIO_CHANNEL_WRIGHTS = 1)
+
+/obj/item/encryptionkey/headset_hotel
+ name = "Hotel radio encryption key"
+ desc = "An encryption key for a radio headset. To access the Hotel channel, use :h."
+ icon_state = "cypherkey"
+ channels = list(RADIO_CHANNEL_HOTEL = 1)
+
/obj/item/encryptionkey/headset_followers
name = "Followers radio encryption key"
desc = "An encryption key for a radio headset. To access the Followers channel, use :g. To access the Town channel, use :f"
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 80904ed165..23599aa0fe 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -21,6 +21,11 @@ GLOBAL_LIST_INIT(channel_tokens, list(
RADIO_CHANNEL_LEGION = RADIO_TOKEN_LEGION,
RADIO_CHANNEL_RANGER = RADIO_TOKEN_RANGER,
RADIO_CHANNEL_KHANS = RADIO_TOKEN_KHANS,
+ RADIO_CHANNEL_SALVATORES = RADIO_TOKEN_SALVATORES,
+ RADIO_CHANNEL_BISHOPS = RADIO_TOKEN_BISHOPS,
+ RADIO_CHANNEL_MORDINOS = RADIO_TOKEN_MORDINOS,
+ RADIO_CHANNEL_WRIGHTS = RADIO_TOKEN_WRIGHTS,
+ RADIO_CHANNEL_HOTEL = RADIO_TOKEN_HOTEL,
RADIO_CHANNEL_FOLLOWERS = RADIO_TOKEN_FOLLOWERS
))
@@ -405,6 +410,42 @@ GLOBAL_LIST_INIT(channel_tokens, list(
icon_state = "mine_headset"
keyslot = new /obj/item/encryptionkey/headset_den
+////////
+//Reno//
+////////
+
+/obj/item/radio/headset/headset_salvatores
+ name = "salvtore radio headset"
+ desc = "This is used by the salvatores. \nTo access the salvatore channel, use :j."
+ icon_state = "mine_headset"
+ keyslot = new /obj/item/encryptionkey/headset_salvatores
+
+/obj/item/radio/headset/headset_bishops
+ name = "bishop radio headset"
+ desc = "This is used by the bishops. \nTo access the bishop channel, use :j."
+ icon_state = "mine_headset"
+ keyslot = new /obj/item/encryptionkey/headset_bishops
+
+/obj/item/radio/headset/headset_mordinos
+ name = "mordino radio headset"
+ desc = "This is used by the mordinos. \nTo access the mordino channel, use :j."
+ icon_state = "mine_headset"
+ keyslot = new /obj/item/encryptionkey/headset_mordinos
+
+/obj/item/radio/headset/headset_wrights
+ name = "wright radio headset"
+ desc = "This is used by the wrights. \nTo access the wright channel, use :j."
+ icon_state = "mine_headset"
+ keyslot = new /obj/item/encryptionkey/headset_wrights
+
+/obj/item/radio/headset/headset_hotel
+ name = "hotel radio headset"
+ desc = "This is used by the hotel. \nTo access the hotel channel, use :j."
+ icon_state = "mine_headset"
+ keyslot = new /obj/item/encryptionkey/headset_hotel
+
+///////////////////////End
+
/obj/item/radio/headset/headset_cent
name = "\improper Vault-Tec headset"
desc = "A headset used by the upper echelons of Vault-Tec.\nTo access the Vault-Tec channel, use :y."
diff --git a/code/game/objects/items/melee/weaponry.dm b/code/game/objects/items/melee/weaponry.dm
index b579b29799..8ec143d0bf 100644
--- a/code/game/objects/items/melee/weaponry.dm
+++ b/code/game/objects/items/melee/weaponry.dm
@@ -62,7 +62,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
- force = 40
+ force = 30
throwforce = 10
w_class = WEIGHT_CLASS_BULKY
hitsound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 0ff9da359d..11c8504354 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -297,6 +297,54 @@
tableVariant = /obj/structure/table/wood/fancy/red
merge_type = /obj/item/stack/tile/carpet/red
+/obj/item/stack/tile/carpet/brown
+ name = "brown carpet"
+ icon_state = "tile-carpet_brown"
+ item_state = "tile-carpet_brown"
+ turf_type = /turf/open/floor/carpet/brown
+ tableVariant = /obj/structure/table/wood/fancy/red //placeholder
+ merge_type = /obj/item/stack/tile/carpet/brown
+
+/obj/item/stack/tile/carpet/reno/green
+ name = "green carpet"
+ icon_state = "tile-carpet_green"
+ item_state = "tile-carpet_green"
+ turf_type = /obj/item/stack/tile/carpet/reno/green
+ tableVariant = /obj/structure/table/wood/fancy/red //placeholder
+ merge_type = /obj/item/stack/tile/carpet/reno/green
+
+/obj/item/stack/tile/carpet/reno/blue
+ name = "blue carpet"
+ icon_state = "tile-carpet_blue"
+ item_state = "tile-carpet_blue"
+ turf_type = /turf/open/floor/carpet/reno/blue
+ tableVariant = /obj/structure/table/wood/fancy/red //placeholder
+ merge_type = /obj/item/stack/tile/carpet/reno/blue
+
+/obj/item/stack/tile/carpet/reno/burgandy
+ name = "burgandy carpet"
+ icon_state = "tile-carpet_burgandy"
+ item_state = "tile-carpet_burgandy"
+ turf_type = /turf/open/floor/carpet/reno/burgandy
+ tableVariant = /obj/structure/table/wood/fancy/red //placeholder
+ merge_type = /obj/item/stack/tile/carpet/reno/burgandy
+
+/obj/item/stack/tile/carpet/reno/pattern1
+ name = "white pattern carpet"
+ icon_state = "tile-carpet_pattern1"
+ item_state = "tile-carpet_pattern1"
+ turf_type = /turf/open/floor/carpet/reno/pattern1
+ tableVariant = /obj/structure/table/wood/fancy/red //placeholder
+ merge_type = /obj/item/stack/tile/carpet/reno/pattern1
+
+/obj/item/stack/tile/carpet/reno/pattern2
+ name = "red pattern carpet"
+ icon_state = "tile-carpet_pattern2"
+ item_state = "tile-carpet_pattern2"
+ turf_type = /turf/open/floor/carpet/reno/pattern2
+ tableVariant = /obj/structure/table/wood/fancy/red //placeholder
+ merge_type = /obj/item/stack/tile/carpet/reno/pattern2
+
/obj/item/stack/tile/carpet/royalblack
name = "royal black carpet"
icon_state = "tile-carpet-royalblack"
diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm
index c7e18fd16e..29aa153566 100644
--- a/code/game/objects/structures/barsigns.dm
+++ b/code/game/objects/structures/barsigns.dm
@@ -1,3 +1,21 @@
+////////
+//reno//
+////////
+
+/obj/structure/sign/reno/barsign/sharkclub
+ name = "Shark Club"
+ desc = "The Shark Club is a casino located in New Reno on Second Street, owned by the Bishop family. It is the largest casino in New Reno."
+ icon = 'icons/obj/barsigns.dmi'
+ icon_state = "sharkclub"
+ max_integrity = 500
+ integrity_failure = 0.5
+ armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ buildable_sign = 0
+
+//////////
+//normal//
+//////////
+
/obj/structure/sign/barsign // All Signs are 64 by 64 pixels, though most of them are made to fit 64 x 32 and only take the two lowermost tiles.
name = "Bar Sign"
desc = "A bar sign with no writing on it."
@@ -291,6 +309,11 @@
icon = "thehive"
desc = "Comb in for some sweet drinks! Not known for serving any sappy drink."
+/datum/barsign/reno/sharkclub
+ name = "Shark Club"
+ icon = "sharkclub"
+ desc = "The Shark Club is a casino located in New Reno on Second Street, owned by the Bishop family. It is the largest casino in New Reno."
+
/datum/barsign/hiddensigns
hidden = TRUE
@@ -309,3 +332,4 @@
name = "Bar Sign"
icon = "empty"
desc = "This sign doesn't seem to be on."
+
diff --git a/code/game/say.dm b/code/game/say.dm
index ab6776821d..2ecca6e880 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -25,6 +25,11 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_DEN]" = "denradio",
"[FREQ_RANGER]" = "rangerradio",
"[FREQ_KHANS]" = "khansradio",
+ "[FREQ_SALVATORES]" = "salvatoresradio",
+ "[FREQ_BISHOPS]" = "bishopsradio",
+ "[FREQ_MORDINOS]" = "mordinosradio",
+ "[FREQ_WRIGHTS]" = "wrightsradio",
+ "[FREQ_HOTEL]" = "hotelradio",
"[FREQ_FOLLOWERS]" = "followersradio"
))
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 0986bf37f3..c575e2be84 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -280,6 +280,51 @@
smooth = SMOOTH_FALSE
canSmoothWith = list()
+/turf/open/floor/carpet/brown
+ icon = 'icons/fallout/turfs/floors.dmi'
+ icon_state = "tile-carpet_brown"
+ floor_tile = /obj/item/stack/tile/carpet/brown
+ smooth = SMOOTH_FALSE
+ canSmoothWith = list()
+
+/turf/open/floor/carpet/reno/blue
+ icon = 'icons/fallout/turfs/floors.dmi'
+ icon_state = "tile-carpet_blue"
+ floor_tile = /obj/item/stack/tile/carpet/reno/blue
+ smooth = SMOOTH_FALSE
+ canSmoothWith = list()
+
+/turf/open/floor/carpet/reno/green
+ icon = 'icons/fallout/turfs/floors.dmi'
+ icon_state = "tile-carpet_green"
+ floor_tile = /obj/item/stack/tile/carpet/reno/green
+ smooth = SMOOTH_FALSE
+ canSmoothWith = list()
+
+/turf/open/floor/carpet/reno/burgandy
+ icon = 'icons/fallout/turfs/floors.dmi'
+ icon_state = "tile-carpet_burgandy"
+ floor_tile = /obj/item/stack/tile/carpet/reno/burgandy
+ smooth = SMOOTH_FALSE
+ canSmoothWith = list()
+
+/turf/open/floor/carpet/reno/pattern1
+ icon = 'icons/fallout/turfs/floors.dmi'
+ icon_state = "tile-carpet_pattern1"
+ floor_tile = /obj/item/stack/tile/carpet/reno/pattern1
+ smooth = SMOOTH_FALSE
+ canSmoothWith = list()
+
+/turf/open/floor/carpet/reno/pattern2
+ icon = 'icons/fallout/turfs/floors.dmi'
+ icon_state = "tile-carpet_pattern2"
+ floor_tile = /obj/item/stack/tile/carpet/reno/pattern2
+ smooth = SMOOTH_FALSE
+ canSmoothWith = list()
+
+/turf/open/floor/wood/f13/carpet_brown
+ icon_state = "tile-carpet_brown"
+
/turf/open/floor/carpet/blackred
icon = 'icons/turf/floors/carpet_blackred.dmi'
floor_tile = /obj/item/stack/tile/carpet/blackred
@@ -333,7 +378,7 @@
icon = 'icons/turf/floors/carpet_royalblue.dmi'
floor_tile = /obj/item/stack/tile/carpet/royalblue
canSmoothWith = list(/turf/open/floor/carpet/royalblue, /turf/open/floor/carpet/royalblue/airless)
-
+
/turf/open/floor/carpet/vault
icon = 'icons/turf/floors/carpet_vault.dmi'
canSmoothWith = list(/turf/open/floor/carpet/vault)
diff --git a/code/modules/WVM/wvm.dm b/code/modules/WVM/wvm.dm
index 42ba606354..5d8927093e 100644
--- a/code/modules/WVM/wvm.dm
+++ b/code/modules/WVM/wvm.dm
@@ -671,7 +671,7 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
new /datum/data/wasteland_equipment("Upgraded Prosthetic Limbs", /obj/item/storage/box/sparelimbs, 2000),
new /datum/data/wasteland_equipment("Cat", /mob/living/simple_animal/pet/cat/Runtime, 10000),
)
-
+
highpop_list = list(
new /datum/data/wasteland_equipment("Medicated Suture", /obj/item/stack/medical/suture/medicated, 45),
new /datum/data/wasteland_equipment("Advanced Regen. Mesh", /obj/item/stack/medical/mesh/advanced, 45),
@@ -691,7 +691,7 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
new /datum/data/wasteland_equipment("Upgraded Prosthetic Limbs", /obj/item/storage/box/sparelimbs, 2000),
new /datum/data/wasteland_equipment("Cat", /mob/living/simple_animal/pet/cat/Runtime, 10000),
)
-
+
/obj/machinery/mineral/wasteland_vendor/weapons
name = "Wasteland Vending Machine - Weapons"
icon_state = "weapon_idle"
@@ -935,6 +935,354 @@ GLOBAL_VAR_INIT(vendor_cash, 0)
new /datum/data/wasteland_equipment("ORM Board", /obj/item/circuitboard/machine/ore_redemption, 150)
)
+/////////////////
+//Reno Machines//
+/////////////////
+
+/obj/machinery/mineral/wasteland_vendor/reno/mordino_chem
+ name = "chem supply console"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Jet", /obj/item/reagent_containers/pill/patch/jet, 15),
+ new /datum/data/wasteland_equipment("Psycho", /obj/item/reagent_containers/hypospray/medipen/psycho, 25),
+ new /datum/data/wasteland_equipment("Turbo", /obj/item/reagent_containers/pill/patch/turbo, 15),
+ new /datum/data/wasteland_equipment("Mentats", /obj/item/storage/pill_bottle/chem_tin/mentats, 10),
+ new /datum/data/wasteland_equipment("Buffout", /obj/item/storage/pill_bottle/chem_tin/buffout, 20),
+ new /datum/data/wasteland_equipment("Med-X", /obj/item/reagent_containers/hypospray/medipen/medx, 20),
+ new /datum/data/wasteland_equipment("Fixer", /obj/item/storage/pill_bottle/chem_tin/fixer, 40)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Jet", /obj/item/reagent_containers/pill/patch/jet, 15),
+ new /datum/data/wasteland_equipment("Psycho", /obj/item/reagent_containers/hypospray/medipen/psycho, 25),
+ new /datum/data/wasteland_equipment("Turbo", /obj/item/reagent_containers/pill/patch/turbo, 15),
+ new /datum/data/wasteland_equipment("Mentats", /obj/item/storage/pill_bottle/chem_tin/mentats, 10),
+ new /datum/data/wasteland_equipment("Buffout", /obj/item/storage/pill_bottle/chem_tin/buffout, 20),
+ new /datum/data/wasteland_equipment("Med-X", /obj/item/reagent_containers/hypospray/medipen/medx, 20),
+ new /datum/data/wasteland_equipment("Fixer", /obj/item/storage/pill_bottle/chem_tin/fixer, 40)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/pharmacy_chem
+ name = "chem supply console"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Jet", /obj/item/reagent_containers/pill/patch/jet, 30),
+ new /datum/data/wasteland_equipment("Psycho", /obj/item/reagent_containers/hypospray/medipen/psycho, 35),
+ new /datum/data/wasteland_equipment("Turbo", /obj/item/reagent_containers/pill/patch/turbo, 30),
+ new /datum/data/wasteland_equipment("Mentats", /obj/item/storage/pill_bottle/chem_tin/mentats, 20),
+ new /datum/data/wasteland_equipment("Buffout", /obj/item/storage/pill_bottle/chem_tin/buffout, 30),
+ new /datum/data/wasteland_equipment("Med-X", /obj/item/reagent_containers/hypospray/medipen/medx, 30),
+ new /datum/data/wasteland_equipment("Fixer", /obj/item/storage/pill_bottle/chem_tin/fixer, 70)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Jet", /obj/item/reagent_containers/pill/patch/jet, 30),
+ new /datum/data/wasteland_equipment("Psycho", /obj/item/reagent_containers/hypospray/medipen/psycho, 35),
+ new /datum/data/wasteland_equipment("Turbo", /obj/item/reagent_containers/pill/patch/turbo, 30),
+ new /datum/data/wasteland_equipment("Mentats", /obj/item/storage/pill_bottle/chem_tin/mentats, 20),
+ new /datum/data/wasteland_equipment("Buffout", /obj/item/storage/pill_bottle/chem_tin/buffout, 30),
+ new /datum/data/wasteland_equipment("Med-X", /obj/item/reagent_containers/hypospray/medipen/medx, 30),
+ new /datum/data/wasteland_equipment("Fixer", /obj/item/storage/pill_bottle/chem_tin/fixer, 70)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/nukacola_streets
+ name = "nuka cola vending machine"
+ icon_state = "nuka_vending"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Nuka Cola", /obj/item/reagent_containers/food/drinks/bottle/f13nukacola, 18)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Nuka Cola", /obj/item/reagent_containers/food/drinks/bottle/f13nukacola, 18)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/nukacola_casino
+ name = "nuka cola vending machine"
+ icon_state = "nuka_vending"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Nuka Cola", /obj/item/reagent_containers/food/drinks/bottle/f13nukacola, 10)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Nuka Cola", /obj/item/reagent_containers/food/drinks/bottle/f13nukacola, 10)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/smokes
+ name = "cigarette vending machine"
+ icon_state = "cigs"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Cheap Lighter", /obj/item/lighter/greyscale, 10),
+ new /datum/data/wasteland_equipment("Zippo", /obj/item/lighter, 50),
+ new /datum/data/wasteland_equipment("Gold Zippo", /obj/item/lighter/gold, 120),
+ new /datum/data/wasteland_equipment("Bigboss", /obj/item/storage/fancy/cigarettes/cigpack_bigboss, 5),
+ new /datum/data/wasteland_equipment("Greytort", /obj/item/storage/fancy/cigarettes/cigpack_greytort, 5),
+ new /datum/data/wasteland_equipment("Pyramid", /obj/item/storage/fancy/cigarettes/cigpack_pyramid, 5)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Cheap Lighter", /obj/item/lighter/greyscale, 10),
+ new /datum/data/wasteland_equipment("Zippo", /obj/item/lighter, 50),
+ new /datum/data/wasteland_equipment("Gold Zippo", /obj/item/lighter/gold, 120),
+ new /datum/data/wasteland_equipment("Bigboss", /obj/item/storage/fancy/cigarettes/cigpack_bigboss, 5),
+ new /datum/data/wasteland_equipment("Greytort", /obj/item/storage/fancy/cigarettes/cigpack_greytort, 5),
+ new /datum/data/wasteland_equipment("Pyramid", /obj/item/storage/fancy/cigarettes/cigpack_pyramid, 5)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/guns
+ name = "gun supply console"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment(".22 pistol", /obj/item/gun/ballistic/automatic/pistol/pistol22, 40),
+ new /datum/data/wasteland_equipment("Type 17", /obj/item/gun/ballistic/automatic/pistol/type17, 50),
+ new /datum/data/wasteland_equipment("N99", /obj/item/gun/ballistic/automatic/pistol/n99, 50),
+ new /datum/data/wasteland_equipment("Desert Eagle", /obj/item/gun/ballistic/automatic/pistol/deagle, 120),
+ new /datum/data/wasteland_equipment(".38 Detective", /obj/item/gun/ballistic/revolver/detective, 50),
+ new /datum/data/wasteland_equipment("Colt 357", /obj/item/gun/ballistic/revolver/colt357, 60),
+ new /datum/data/wasteland_equipment("M29", /obj/item/gun/ballistic/revolver/m29, 80),
+ new /datum/data/wasteland_equipment("Police Revolver", /obj/item/gun/ballistic/revolver/police, 90),
+ new /datum/data/wasteland_equipment("M29 Snub", /obj/item/gun/ballistic/revolver/m29/snub, 100),
+ new /datum/data/wasteland_equipment("Hunting Rifle", /obj/item/gun/ballistic/rifle/hunting, 65),
+ new /datum/data/wasteland_equipment("Mosin", /obj/item/gun/ballistic/rifle/mosin, 90),
+ new /datum/data/wasteland_equipment("caravan shotgun", /obj/item/gun/ballistic/revolver/caravan_shotgun, 100),
+ new /datum/data/wasteland_equipment("widowmaker", /obj/item/gun/ballistic/revolver/widowmaker, 100),
+ new /datum/data/wasteland_equipment("Pump Shotgun", /obj/item/gun/ballistic/shotgun/hunting, 170),
+ new /datum/data/wasteland_equipment("Tommygun", /obj/item/gun/ballistic/automatic/smg/tommygun, 300)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment(".22 pistol", /obj/item/gun/ballistic/automatic/pistol/pistol22, 40),
+ new /datum/data/wasteland_equipment("Type 17", /obj/item/gun/ballistic/automatic/pistol/type17, 50),
+ new /datum/data/wasteland_equipment("N99", /obj/item/gun/ballistic/automatic/pistol/n99, 50),
+ new /datum/data/wasteland_equipment("Desert Eagle", /obj/item/gun/ballistic/automatic/pistol/deagle, 120),
+ new /datum/data/wasteland_equipment(".38 Detective", /obj/item/gun/ballistic/revolver/detective, 50),
+ new /datum/data/wasteland_equipment("Colt 357", /obj/item/gun/ballistic/revolver/colt357, 60),
+ new /datum/data/wasteland_equipment("M29", /obj/item/gun/ballistic/revolver/m29, 80),
+ new /datum/data/wasteland_equipment("Police Revolver", /obj/item/gun/ballistic/revolver/police, 90),
+ new /datum/data/wasteland_equipment("M29 Snub", /obj/item/gun/ballistic/revolver/m29/snub, 100),
+ new /datum/data/wasteland_equipment("Hunting Rifle", /obj/item/gun/ballistic/rifle/hunting, 65),
+ new /datum/data/wasteland_equipment("Mosin", /obj/item/gun/ballistic/rifle/mosin, 90),
+ new /datum/data/wasteland_equipment("caravan shotgun", /obj/item/gun/ballistic/revolver/caravan_shotgun, 100),
+ new /datum/data/wasteland_equipment("widowmaker", /obj/item/gun/ballistic/revolver/widowmaker, 100),
+ new /datum/data/wasteland_equipment("Pump Shotgun", /obj/item/gun/ballistic/shotgun/hunting, 170),
+ new /datum/data/wasteland_equipment("Tommygun", /obj/item/gun/ballistic/automatic/smg/tommygun, 300)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/guns/pipes
+ name = "gun supply console"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Peppergun", /obj/item/gun/ballistic/revolver/hobo/pepperbox, 25),
+ new /datum/data/wasteland_equipment("Zipgun", /obj/item/gun/ballistic/automatic/hobo/zipgun, 30),
+ new /datum/data/wasteland_equipment("Knife Gun", /obj/item/gun/ballistic/revolver/hobo/knifegun, 35),
+ new /datum/data/wasteland_equipment("Knuckle Gun", /obj/item/gun/ballistic/revolver/hobo/knucklegun, 37),
+ new /datum/data/wasteland_equipment("Pipe Rifle", /obj/item/gun/ballistic/revolver/hobo/piperifle, 45),
+ new /datum/data/wasteland_equipment("Shotgun Bat", /obj/item/gun/ballistic/revolver/single_shotgun, 50),
+ new /datum/data/wasteland_equipment("Autopipe", /obj/item/gun/ballistic/automatic/autopipe, 60)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Peppergun", /obj/item/gun/ballistic/revolver/hobo/pepperbox, 25),
+ new /datum/data/wasteland_equipment("Zipgun", /obj/item/gun/ballistic/automatic/hobo/zipgun, 30),
+ new /datum/data/wasteland_equipment("Knife Gun", /obj/item/gun/ballistic/revolver/hobo/knifegun, 35),
+ new /datum/data/wasteland_equipment("Knuckle Gun", /obj/item/gun/ballistic/revolver/hobo/knucklegun, 37),
+ new /datum/data/wasteland_equipment("Pipe Rifle", /obj/item/gun/ballistic/revolver/hobo/piperifle, 45),
+ new /datum/data/wasteland_equipment("Shotgun Bat", /obj/item/gun/ballistic/revolver/single_shotgun, 50),
+ new /datum/data/wasteland_equipment("Autopipe", /obj/item/gun/ballistic/automatic/autopipe, 60)
+ )
+/obj/machinery/mineral/wasteland_vendor/reno/guns/pipes/ammo
+ name = "improvised ammo supply console"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("10mm Improvised", /obj/item/ammo_box/c10mm/improvised, 8),
+ new /datum/data/wasteland_equipment("Zipgun Clips", /obj/item/ammo_box/magazine/zipgun, 5),
+ new /datum/data/wasteland_equipment("44 Improvised", /obj/item/ammo_box/m44box/improvised, 8),
+ new /datum/data/wasteland_equipment("45 Improvised", /obj/item/ammo_box/c45/improvised, 8),
+ new /datum/data/wasteland_equipment("223 Improvised", /obj/item/ammo_box/a556/sport/improvised, 8),
+ new /datum/data/wasteland_equipment("Autopipe Belts", /obj/item/ammo_box/magazine/autopipe, 18),
+ new /datum/data/wasteland_equipment("Improvised Buckshot", /obj/item/ammo_box/shotgun/improvised, 20)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("10mm Improvised", /obj/item/ammo_box/c10mm/improvised, 8),
+ new /datum/data/wasteland_equipment("Zipgun Clips", /obj/item/ammo_box/magazine/zipgun, 5),
+ new /datum/data/wasteland_equipment("44 Improvised", /obj/item/ammo_box/m44box/improvised, 8),
+ new /datum/data/wasteland_equipment("45 Improvised", /obj/item/ammo_box/c45/improvised, 8),
+ new /datum/data/wasteland_equipment("223 Improvised", /obj/item/ammo_box/a556/sport/improvised, 8),
+ new /datum/data/wasteland_equipment("Autopipe Belts", /obj/item/ammo_box/magazine/autopipe, 18),
+ new /datum/data/wasteland_equipment("Improvised Buckshot", /obj/item/ammo_box/shotgun/improvised, 20)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/guns/energy
+ name = "gun vending machine"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Wattz", /obj/item/gun/energy/laser/wattz/magneto, 130),
+ new /datum/data/wasteland_equipment("AEP7", /obj/item/gun/energy/laser/pistol, 170),
+ new /datum/data/wasteland_equipment("Laser Musket", /obj/item/gun/ballistic/rifle/hobo/lasmusket, 230),
+ new /datum/data/wasteland_equipment("Plasma Musket", /obj/item/gun/ballistic/rifle/hobo/plasmacaster, 300)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Wattz", /obj/item/gun/energy/laser/wattz/magneto, 130),
+ new /datum/data/wasteland_equipment("AEP7", /obj/item/gun/energy/laser/pistol, 170),
+ new /datum/data/wasteland_equipment("Laser Musket", /obj/item/gun/ballistic/rifle/hobo/lasmusket, 230),
+ new /datum/data/wasteland_equipment("Plasma Musket", /obj/item/gun/ballistic/rifle/hobo/plasmacaster, 300)
+ )
+
+
+/obj/machinery/mineral/wasteland_vendor/reno/guns/energy/ammo
+ name = "cell supply console"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Energy Cell", /obj/item/stock_parts/cell/ammo/ec, 40),
+ new /datum/data/wasteland_equipment("Battery Box", /obj/item/ammo_box/lasmusket, 40),
+ new /datum/data/wasteland_equipment("Canister Box", /obj/item/ammo_box/plasmamusket, 40)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Energy Cell", /obj/item/stock_parts/cell/ammo/ec, 40),
+ new /datum/data/wasteland_equipment("Battery Box", /obj/item/ammo_box/lasmusket, 40),
+ new /datum/data/wasteland_equipment("Canister Box", /obj/item/ammo_box/plasmamusket, 40)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/guns/ammo
+ name = "ammo supply console"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Buckshot", /obj/item/ammo_box/shotgun/buck, 45),
+ new /datum/data/wasteland_equipment("308", /obj/item/ammo_box/a308, 10),
+ new /datum/data/wasteland_equipment("762", /obj/item/ammo_box/a762, 10),
+ new /datum/data/wasteland_equipment("lr22", /obj/item/ammo_box/magazine/m22, 16),
+ new /datum/data/wasteland_equipment("10mm", /obj/item/ammo_box/magazine/m10mm_adv/simple, 18),
+ new /datum/data/wasteland_equipment("Desert Eagle Magazine", /obj/item/ammo_box/magazine/m44, 16),
+ new /datum/data/wasteland_equipment("38", /obj/item/ammo_box/c38, 5),
+ new /datum/data/wasteland_equipment("357", /obj/item/ammo_box/a357, 12),
+ new /datum/data/wasteland_equipment("44", /obj/item/ammo_box/m44, 12),
+ new /datum/data/wasteland_equipment("Tommy Mag", /obj/item/ammo_box/magazine/tommygunm45, 50),
+ new /datum/data/wasteland_equipment("Energy Cell", /obj/item/stock_parts/cell/ammo/ec, 50),
+ new /datum/data/wasteland_equipment("Microfusion Cell", /obj/item/stock_parts/cell/ammo/mfc, 50)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Buckshot", /obj/item/ammo_box/shotgun/buck, 45),
+ new /datum/data/wasteland_equipment("308", /obj/item/ammo_box/a308, 10),
+ new /datum/data/wasteland_equipment("762", /obj/item/ammo_box/a762, 10),
+ new /datum/data/wasteland_equipment("lr22", /obj/item/ammo_box/magazine/m22, 16),
+ new /datum/data/wasteland_equipment("10mm", /obj/item/ammo_box/magazine/m10mm_adv/simple, 18),
+ new /datum/data/wasteland_equipment("Desert Eagle Magazine", /obj/item/ammo_box/magazine/m44, 16),
+ new /datum/data/wasteland_equipment("38", /obj/item/ammo_box/c38, 5),
+ new /datum/data/wasteland_equipment("357", /obj/item/ammo_box/a357, 12),
+ new /datum/data/wasteland_equipment("44", /obj/item/ammo_box/m44, 12),
+ new /datum/data/wasteland_equipment("Tommy Mag", /obj/item/ammo_box/magazine/tommygunm45, 50),
+ new /datum/data/wasteland_equipment("Energy Cell", /obj/item/stock_parts/cell/ammo/ec, 50),
+ new /datum/data/wasteland_equipment("Microfusion Cell", /obj/item/stock_parts/cell/ammo/mfc, 50)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/alcohol
+ name = "alcohol supply orders"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Flour", /obj/item/reagent_containers/food/condiment/flour, 5),
+ new /datum/data/wasteland_equipment("Universal Enzyme", /obj/item/reagent_containers/food/condiment/enzyme, 5),
+ new /datum/data/wasteland_equipment("Hard Cider", /obj/item/reagent_containers/food/drinks/bottle/hcider, 10),
+ new /datum/data/wasteland_equipment("Wine", /obj/item/reagent_containers/food/drinks/bottle/wine, 15),
+ new /datum/data/wasteland_equipment("Kahlua", /obj/item/reagent_containers/food/drinks/bottle/kahlua, 15),
+ new /datum/data/wasteland_equipment("Vodka", /obj/item/reagent_containers/food/drinks/bottle/vodka, 15),
+ new /datum/data/wasteland_equipment("Gin", /obj/item/reagent_containers/food/drinks/bottle/gin, 15),
+ new /datum/data/wasteland_equipment("Rum", /obj/item/reagent_containers/food/drinks/bottle/rum, 15),
+ new /datum/data/wasteland_equipment("Ale", /obj/item/reagent_containers/food/drinks/bottle/ale, 15),
+ new /datum/data/wasteland_equipment("Creme de Menthe", /obj/item/reagent_containers/food/drinks/bottle/creme_de_menthe, 15),
+ new /datum/data/wasteland_equipment("Creme de Cacao", /obj/item/reagent_containers/food/drinks/bottle/creme_de_cacao, 15),
+ new /datum/data/wasteland_equipment("Creme de Coconut", /obj/item/reagent_containers/food/drinks/bottle/creme_de_coconut, 15),
+ new /datum/data/wasteland_equipment("Triple Sec", /obj/item/reagent_containers/food/drinks/bottle/triple_sec, 15),
+ new /datum/data/wasteland_equipment("Sake", /obj/item/reagent_containers/food/drinks/bottle/sake, 15),
+ new /datum/data/wasteland_equipment("Applejack", /obj/item/reagent_containers/food/drinks/bottle/applejack, 20),
+ new /datum/data/wasteland_equipment("Rotgut", /obj/item/reagent_containers/food/drinks/bottle/rotgut, 20),
+ new /datum/data/wasteland_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 20),
+ new /datum/data/wasteland_equipment("Vermouth", /obj/item/reagent_containers/food/drinks/bottle/vermouth, 20),
+ new /datum/data/wasteland_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 25),
+ new /datum/data/wasteland_equipment("Tequila", /obj/item/reagent_containers/food/drinks/bottle/tequila, 25),
+ new /datum/data/wasteland_equipment("Fernet", /obj/item/reagent_containers/food/drinks/bottle/fernet, 30),
+ new /datum/data/wasteland_equipment("Champagne", /obj/item/reagent_containers/food/drinks/bottle/champagne, 35),
+ new /datum/data/wasteland_equipment("Cognac", /obj/item/reagent_containers/food/drinks/bottle/cognac, 35),
+ new /datum/data/wasteland_equipment("Mont De Requin", /obj/item/reagent_containers/food/drinks/bottle/trappist, 40)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Flour", /obj/item/reagent_containers/food/condiment/flour, 5),
+ new /datum/data/wasteland_equipment("Universal Enzyme", /obj/item/reagent_containers/food/condiment/enzyme, 5),
+ new /datum/data/wasteland_equipment("Hard Cider", /obj/item/reagent_containers/food/drinks/bottle/hcider, 10),
+ new /datum/data/wasteland_equipment("Wine", /obj/item/reagent_containers/food/drinks/bottle/wine, 15),
+ new /datum/data/wasteland_equipment("Kahlua", /obj/item/reagent_containers/food/drinks/bottle/kahlua, 15),
+ new /datum/data/wasteland_equipment("Vodka", /obj/item/reagent_containers/food/drinks/bottle/vodka, 15),
+ new /datum/data/wasteland_equipment("Gin", /obj/item/reagent_containers/food/drinks/bottle/gin, 15),
+ new /datum/data/wasteland_equipment("Rum", /obj/item/reagent_containers/food/drinks/bottle/rum, 15),
+ new /datum/data/wasteland_equipment("Ale", /obj/item/reagent_containers/food/drinks/bottle/ale, 15),
+ new /datum/data/wasteland_equipment("Creme de Menthe", /obj/item/reagent_containers/food/drinks/bottle/creme_de_menthe, 15),
+ new /datum/data/wasteland_equipment("Creme de Cacao", /obj/item/reagent_containers/food/drinks/bottle/creme_de_cacao, 15),
+ new /datum/data/wasteland_equipment("Creme de Coconut", /obj/item/reagent_containers/food/drinks/bottle/creme_de_coconut, 15),
+ new /datum/data/wasteland_equipment("Triple Sec", /obj/item/reagent_containers/food/drinks/bottle/triple_sec, 15),
+ new /datum/data/wasteland_equipment("Sake", /obj/item/reagent_containers/food/drinks/bottle/sake, 15),
+ new /datum/data/wasteland_equipment("Applejack", /obj/item/reagent_containers/food/drinks/bottle/applejack, 20),
+ new /datum/data/wasteland_equipment("Rotgut", /obj/item/reagent_containers/food/drinks/bottle/rotgut, 20),
+ new /datum/data/wasteland_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 20),
+ new /datum/data/wasteland_equipment("Vermouth", /obj/item/reagent_containers/food/drinks/bottle/vermouth, 20),
+ new /datum/data/wasteland_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 25),
+ new /datum/data/wasteland_equipment("Tequila", /obj/item/reagent_containers/food/drinks/bottle/tequila, 25),
+ new /datum/data/wasteland_equipment("Fernet", /obj/item/reagent_containers/food/drinks/bottle/fernet, 30),
+ new /datum/data/wasteland_equipment("Champagne", /obj/item/reagent_containers/food/drinks/bottle/champagne, 35),
+ new /datum/data/wasteland_equipment("Cognac", /obj/item/reagent_containers/food/drinks/bottle/cognac, 35),
+ new /datum/data/wasteland_equipment("Mont De Requin", /obj/item/reagent_containers/food/drinks/bottle/trappist, 40)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/nonalcoholic
+ name = "nonalcoholic supply orders"
+ icon_state = "order_console"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Instacocoa", /obj/item/reagent_containers/food/drinks/bottle/instacocoa, 5),
+ new /datum/data/wasteland_equipment("Instacoffee", /obj/item/reagent_containers/food/drinks/bottle/instacoffee, 5),
+ new /datum/data/wasteland_equipment("Instatea", /obj/item/reagent_containers/food/drinks/bottle/instatea, 5),
+ new /datum/data/wasteland_equipment("Cream", /obj/item/reagent_containers/food/drinks/bottle/cream, 5),
+ new /datum/data/wasteland_equipment("Sugar", /obj/item/reagent_containers/food/condiment/sugar, 8),
+ new /datum/data/wasteland_equipment("Pineapple Juice", /obj/item/reagent_containers/food/drinks/bottle/pineapplejuice, 8),
+ new /datum/data/wasteland_equipment("Orange Juice", /obj/item/reagent_containers/food/drinks/bottle/orangejuice, 8),
+ new /datum/data/wasteland_equipment("Grenadine", /obj/item/reagent_containers/food/drinks/bottle/grenadine, 8),
+ new /datum/data/wasteland_equipment("Lemon Juice", /obj/item/reagent_containers/food/drinks/bottle/lemonjuice, 8),
+ new /datum/data/wasteland_equipment("Tomato Juice", /obj/item/reagent_containers/food/drinks/bottle/tomatojuice, 8),
+ new /datum/data/wasteland_equipment("Menthol", /obj/item/reagent_containers/food/drinks/bottle/menthol, 8),
+ new /datum/data/wasteland_equipment("Grape Juice", /obj/item/reagent_containers/food/drinks/bottle/grapejuice, 8),
+ new /datum/data/wasteland_equipment("Bawls", /obj/item/reagent_containers/food/drinks/bottle/bawls, 9),
+ new /datum/data/wasteland_equipment("Vim", /obj/item/reagent_containers/food/drinks/bottle/vim, 9),
+ new /datum/data/wasteland_equipment("Lime Juice", /obj/item/reagent_containers/food/drinks/bottle/limejuice, 10),
+ new /datum/data/wasteland_equipment("Sunset", /obj/item/reagent_containers/food/drinks/bottle/sunset, 10),
+ new /datum/data/wasteland_equipment("Forest Tea", /obj/item/reagent_containers/food/drinks/mug/tea/forest, 15),
+ new /datum/data/wasteland_equipment("Red Tea", /obj/item/reagent_containers/food/drinks/mug/tea/red, 15),
+ new /datum/data/wasteland_equipment("Green Tea", /obj/item/reagent_containers/food/drinks/mug/tea/green, 15),
+ new /datum/data/wasteland_equipment("Ice", /obj/item/reagent_containers/food/drinks/ice, 20)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Instacocoa", /obj/item/reagent_containers/food/drinks/bottle/instacocoa, 5),
+ new /datum/data/wasteland_equipment("Instacoffee", /obj/item/reagent_containers/food/drinks/bottle/instacoffee, 5),
+ new /datum/data/wasteland_equipment("Instatea", /obj/item/reagent_containers/food/drinks/bottle/instatea, 5),
+ new /datum/data/wasteland_equipment("Cream", /obj/item/reagent_containers/food/drinks/bottle/cream, 5),
+ new /datum/data/wasteland_equipment("Sugar", /obj/item/reagent_containers/food/condiment/sugar, 8),
+ new /datum/data/wasteland_equipment("Pineapple Juice", /obj/item/reagent_containers/food/drinks/bottle/pineapplejuice, 8),
+ new /datum/data/wasteland_equipment("Orange Juice", /obj/item/reagent_containers/food/drinks/bottle/orangejuice, 8),
+ new /datum/data/wasteland_equipment("Grenadine", /obj/item/reagent_containers/food/drinks/bottle/grenadine, 8),
+ new /datum/data/wasteland_equipment("Lemon Juice", /obj/item/reagent_containers/food/drinks/bottle/lemonjuice, 8),
+ new /datum/data/wasteland_equipment("Tomato Juice", /obj/item/reagent_containers/food/drinks/bottle/tomatojuice, 8),
+ new /datum/data/wasteland_equipment("Menthol", /obj/item/reagent_containers/food/drinks/bottle/menthol, 8),
+ new /datum/data/wasteland_equipment("Grape Juice", /obj/item/reagent_containers/food/drinks/bottle/grapejuice, 8),
+ new /datum/data/wasteland_equipment("Bawls", /obj/item/reagent_containers/food/drinks/bottle/bawls, 9),
+ new /datum/data/wasteland_equipment("Vim", /obj/item/reagent_containers/food/drinks/bottle/vim, 9),
+ new /datum/data/wasteland_equipment("Lime Juice", /obj/item/reagent_containers/food/drinks/bottle/limejuice, 10),
+ new /datum/data/wasteland_equipment("Sunset", /obj/item/reagent_containers/food/drinks/bottle/sunset, 10),
+ new /datum/data/wasteland_equipment("Forest Tea", /obj/item/reagent_containers/food/drinks/mug/tea/forest, 15),
+ new /datum/data/wasteland_equipment("Red Tea", /obj/item/reagent_containers/food/drinks/mug/tea/red, 15),
+ new /datum/data/wasteland_equipment("Green Tea", /obj/item/reagent_containers/food/drinks/mug/tea/green, 15),
+ new /datum/data/wasteland_equipment("Ice", /obj/item/reagent_containers/food/drinks/ice, 20)
+ )
+
+/obj/machinery/mineral/wasteland_vendor/reno/materials
+ name = "material vendor"
+ icon_state = "generic_idle"
+ prize_list = list(
+ new /datum/data/wasteland_equipment("Wood", /obj/item/stack/sheet/mineral/wood/fifty, 25),
+ new /datum/data/wasteland_equipment("Metal", /obj/item/stack/sheet/metal/fifty, 25)
+ )
+ highpop_list = list(
+ new /datum/data/wasteland_equipment("Wood", /obj/item/stack/sheet/mineral/wood/fifty, 25),
+ new /datum/data/wasteland_equipment("Metal", /obj/item/stack/sheet/metal/fifty, 25)
+ )
+
/datum/data/wasteland_equipment
var/equipment_name = "generic"
var/equipment_path = null
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index a744198c93..012f9b6afe 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -145,7 +145,7 @@
desc = "Avast ye wasteys!"
icon_state = "eyepatch"
item_state = "eyepatch"
-
+
/obj/item/clothing/glasses/eyepatch/goji
name = "emblazoned eyepatch"
desc = "You have the eye of a mad dog!"
@@ -633,3 +633,16 @@
user.blind_eyes(30)
return
+//special case, and it's not really glasses, but whatever.
+
+/obj/item/clothing/glasses/concierge_m
+ name = "concierge mask"
+ desc = "A off-white creepy old mask made of an uncertain material. Looks sturdy enough. It's sometimes used by the hotel staff."
+ icon_state = "concierge_mask_m"
+ item_state = "concierge_mask_m"
+
+/obj/item/clothing/glasses/concierge_f
+ name = "concierge mask"
+ desc = "A off-white creepy old mask made of an uncertain material. It has paint on it to resemble makeup. Looks sturdy enough. It's sometimes used by the hotel staff."
+ icon_state = "concierge_mask_f"
+ item_state = "concierge_mask_f"
diff --git a/code/modules/clothing/head/f13factionhead.dm b/code/modules/clothing/head/f13factionhead.dm
index 2b4cc9d3bc..9688173d37 100644
--- a/code/modules/clothing/head/f13factionhead.dm
+++ b/code/modules/clothing/head/f13factionhead.dm
@@ -610,6 +610,9 @@
dog_fashion = null
unique_reskin = list("M1" = "ncr_old")
+/obj/item/clothing/head/f13/ncr/standard/conscript/reno
+ armor = list("melee" = 20, "bullet" = 15, "laser" = 10, "energy" = 20, "bomb" = 30, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0)
+
/obj/item/clothing/head/f13/ncr/ncr_flapcap
name = "NCR field cap"
desc = "A special issue canvas NCR field cap with cotton neckflap, for sun protection in arid climates."
@@ -647,6 +650,10 @@
item_state = "ncr_officer_beret"
armor = list("melee" = 15, "bullet" = 60, "laser" = 40, "energy" = 20, "bomb" = 50, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0, "wound" = 55)
+/obj/item/clothing/head/beret/ncr/reno
+ name = "NCR officer beret"
+ armor = list("melee" = 10, "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 5, "bio" = 5, "rad" = 5, "fire" = 5, "acid" = 0, "wound" = 0)
+
/obj/item/clothing/head/beret/ncr/ncr_medic
name = "NCR medical beret"
desc = "A white beret, issued to officers of the medical corps."
@@ -1378,3 +1385,68 @@ obj/item/clothing/head/f13/army/beret
icon_state = "enclave_new"
item_state = "enclave_new"
armor = list("melee" = 45, "bullet" = 45, "laser" = 45, "energy" = 20, "bomb" = 50, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 50)
+
+//////////////
+//Salvatores//
+//////////////
+
+/obj/item/clothing/head/helmet/f13/salvatores/fedora
+ name = "salvatores fedora"
+ desc = "The family fedora of the Salvatores."
+ icon_state = "salvatores_fedora"
+ item_state = "salvatores_fedora"
+
+////////////
+//mordinos//
+////////////
+
+/obj/item/clothing/head/helmet/f13/mordinos/fedora
+ name = "mordino fedora"
+ desc = "The family fedora of the Mordinos."
+ icon_state = "mordinos_fedora"
+ item_state = "mordinos_fedora"
+///////////
+//bishops//
+///////////
+
+/obj/item/clothing/head/helmet/f13/bishops/fedora
+ name = "bishop fedora"
+ desc = "The family fedora of the Bishops."
+ icon_state = "bishops_fedora"
+ item_state = "bishops_fedora"
+////////////
+//wrights//
+////////////
+
+/obj/item/clothing/head/helmet/f13/wrights/tophat
+ name = "wright top hat"
+ desc = "The family top hat of the Wrights."
+ icon_state = "wrights_tophat"
+ item_state = "wrights_tophat"
+
+//////////
+//hotel//
+/////////
+
+/obj/item/clothing/head/helmet/f13/hotel/concierge/cap
+ name = "concierge cap"
+ desc = "A slightly worn out concierge cap."
+ icon_state = "concierge_cap"
+ item_state = "concierge_cap"
+
+/////////////
+//civilians//
+/////////////
+
+/obj/item/clothing/head/helmet/f13/civilians/ncr_police_helmet
+ name = "concierge cap"
+ desc = "A slightly worn out concierge cap."
+ armor = list("melee" = 35, "bullet" = 35, "laser" = 30, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25)
+ icon_state = "ahp_helmet"
+ item_state = "ahp_helmet"
+
+/obj/item/clothing/head/helmet/f13/foreign_hat
+ name = "formal hat"
+ desc = "A very well made hat."
+ icon_state = "schlimmhat"
+ item_state = "schlimmhat"
diff --git a/code/modules/clothing/suits/f13factionarmor.dm b/code/modules/clothing/suits/f13factionarmor.dm
index 621b60caaa..e285f62314 100644
--- a/code/modules/clothing/suits/f13factionarmor.dm
+++ b/code/modules/clothing/suits/f13factionarmor.dm
@@ -1002,3 +1002,130 @@
icon_state = "enclave_new"
item_state = "enclave_new"
armor = list("melee" = 45, "bullet" = 45, "laser" = 45, "energy" = 20, "bomb" = 50, "bio" = 60, "rad" = 10, "fire" = 60, "acid" = 20, "wound" = 50)
+
+//////////////
+//Salvatores//
+//////////////
+
+/obj/item/clothing/suit/armor/f13/salvatores/white_coat
+ name = "white coat"
+ desc = "An armored coat with large pockets."
+ icon_state = "white_coat"
+ item_state = "white_coat"
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) //up to change
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bulletbelt
+
+////////////
+//Mordinos//
+////////////
+
+/obj/item/clothing/suit/armor/f13/mordinos/grey_trench_coat
+ name = "grey trench coat"
+ desc = "An armored coat with large pockets."
+ icon_state = "grey_trench_coat"
+ item_state = "grey_trench_coat"
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) //up to change
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bulletbelt
+
+///////////
+//Bishops//
+///////////
+
+/obj/item/clothing/suit/armor/f13/bishops/blue_trench_coat
+ name = "blue trench coat"
+ desc = "An armored coat with large pockets."
+ icon_state = "blue_trench_coat"
+ item_state = "blue_trench_coat"
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) //up to change
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bulletbelt
+
+///////////
+//Wrights//
+///////////
+
+/obj/item/clothing/suit/armor/f13/wrights/armored_vest
+ name = "brown vest"
+ desc = "An armored vest with large interior pockets."
+ icon_state = "wrights_vest"
+ item_state = "wrights_vest"
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) //up to change
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bulletbelt
+
+/////////
+//Hotel//
+/////////
+
+/obj/item/clothing/suit/armor/f13/hotel/concierge/vest
+ name = "concierge vest"
+ desc = "A well enough kept red vest, meant for the hotel staff."
+ icon_state = "concierge_vest"
+ item_state = "concierge_vest"
+
+/obj/item/clothing/suit/armor/f13/hotel/concierge/coat
+ name = "concierge coat"
+ desc = "A well enough kept red suit, meant for the hotel staff."
+ icon_state = "concierge_coat"
+ item_state = "concierge_coat"
+
+/////////////
+//civilians//
+/////////////
+
+/obj/item/clothing/suit/armor/f13/civilians/ncr_police_coat
+ name = "NCR police coat"
+ desc = "A repurposed oldworld police coat."
+ icon_state = "ahp_suit"
+ item_state = "ahp_suit"
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) //up to change
+
+/obj/item/clothing/suit/armor/f13/civilians/schlimmcoat
+ name = "foreign coat"
+ desc = "A well made coat."
+ icon_state = "schlimmcoat"
+ item_state = "schlimmcoat"
+ armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) //up to change
+
+///////////
+//raiders//
+///////////
+
+/obj/item/clothing/suit/armor/f13/raiders/roadwarriors
+ name = "roadsign armor"
+ desc = "A couple of roadsigns put together, seemingly originating from highway 80 due to the sign on the back."
+ icon_state = "road_armor"
+ item_state = "road_armor"
+ armor = list("melee" = 35, "bullet" = 20, "laser" = 25, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) //up to change
+
+
+///////////
+//Misc//
+///////////
+
+/obj/item/clothing/suit/armor/f13/reno/bulletproof
+ name = "concealed kevlar armor"
+ desc = "A vest of kevlar that is concealable."
+ icon_state = "altbodyarmor"
+ item_state = "altbodyarmor"
+ armor = list("melee" = 20, "bullet" = 35, "laser" = 30, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) //up to change
+ body_parts_covered = CHEST
+
+/obj/item/clothing/suit/armor/f13/reno/bulletproof/lite
+ name = "crude concealed kevlar armor"
+ armor = list("melee" = 17, "bullet" = 20, "laser" = 20, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25)
+
+/obj/item/clothing/suit/armor/f13/ncrarmor/reno
+ name = "reserve NCR patrol vest"
+ desc = "A standard issue NCR Infantry vest."
+ icon_state = "ncr_infantry_vest"
+ item_state = "ncr_infantry_vest"
+ body_parts_covered = CHEST|GROIN|ARMS|LEGS
+ armor = list("melee" = 20, "bullet" = 25, "laser" = 10, "energy" = 20, "bomb" = 30, "bio" = 30, "rad" = 20, "fire" = 60, "acid" = 0)
+
+/obj/item/clothing/suit/armor/f13/ncrarmor/dresscoat/reno
+ name = "NCR dress coat"
+ desc = "A special issue NCR officer's armour with an added thick overcoat for protection from the elements."
+ icon_state = "ncr_dresscoat"
+ item_state = "ncr_dresscoat"
+ armor = list("melee" = 25, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 20, "rad" = 20, "fire" = 20, "acid" = 0)
+ body_parts_covered = CHEST|GROIN|ARMS|LEGS
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/bulletbelt
diff --git a/code/modules/clothing/under/f13.dm b/code/modules/clothing/under/f13.dm
index 9e6e200d2f..291e07fefc 100644
--- a/code/modules/clothing/under/f13.dm
+++ b/code/modules/clothing/under/f13.dm
@@ -9,6 +9,146 @@
/obj/item/clothing/under/f13/female
fitted = FEMALE_UNIFORM_TOP
+//Salvatores
+
+/obj/item/clothing/under/f13/salvatores/don
+ name = "don suit"
+ desc = "A white suit and tie, with a black undershirt."
+ icon_state = "salvatores_don"
+ item_state = "salvatores_don"
+
+/obj/item/clothing/under/f13/salvatores/officer
+ name = "officer suit"
+ desc = "A white suit and tie, with a black undershirt."
+ icon_state = "salvatores_officer"
+ item_state = "salvatores_officer"
+
+/obj/item/clothing/under/f13/salvatores/soldier
+ name = "salvatore family suit"
+ desc = "A white suit and tie, with a black undershirt."
+ icon_state = "salvatores_soldier"
+ item_state = "salvatores_soldier"
+
+//Mordinos
+
+/obj/item/clothing/under/f13/mordinos/boss
+ name = "stylish uuit"
+ desc = "A charcoal suit with a red shirt and black tie."
+ icon_state = "mordino_boss"
+ item_state = "mordino_boss"
+
+/obj/item/clothing/under/f13/mordinos/goon
+ name = "mordino family suit"
+ desc = "A black suit with a blue tie. Nice."
+ icon_state = "mordino_goon"
+ item_state = "mordino_goon"
+
+//Bishops
+
+/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."
+ icon_state = "bishop_boss"
+ item_state = "bishop_boss"
+
+/obj/item/clothing/under/f13/bishops/officer
+ name = "officer suit"
+ desc = "A navy blue suit with a light blue undershirt."
+ icon_state = "bishop_officer"
+ item_state = "bishop_officer"
+
+/obj/item/clothing/under/f13/bishops/soldier
+ name = "bishop family suit"
+ desc = "A light blue suit. Nice."
+ icon_state = "bishop_soldier"
+ item_state = "bishop_soldier"
+
+/obj/item/clothing/under/f13/bishops/casino_worker
+ name = "shark club uniform"
+ desc = "The standard uniform for workers at sharkclub"
+ icon_state = "bishop_casino_worker"
+ item_state = "bishop_casino_worker"
+
+//wrights
+
+/obj/item/clothing/under/f13/wrights/boss
+ name = "formal suit"
+ desc = "A neat, well maintained suit."
+ icon_state = "wright_boss"
+ item_state = "wright_boss"
+
+/obj/item/clothing/under/f13/wrights/officer
+ name = "wright officer suit"
+ desc = "A brown suit with a sense of formality to it."
+ icon_state = "wright_officer"
+ item_state = "wright_officer"
+
+/obj/item/clothing/under/f13/wrights/soldier
+ name = "wright family suit"
+ desc = "A suit with suspenders."
+ icon_state = "wright_soldier"
+ item_state = "wright_soldier"
+
+//hotel
+
+/obj/item/clothing/under/f13/hotel/concierge/uniform
+ name = "concierger uniform"
+ desc = "An old yellowish shirt with a black tie, intended for the hotel staff."
+ icon_state = "concierge_uniform"
+ item_state = "concierge_uniform"
+
+/obj/item/clothing/under/f13/hotel/concierge/uniform/skirt
+ name = "concierge skirt"
+ desc = "An old yellowish shirt with a black tie and a feminine skirt, intended for the hotel staff."
+ icon_state = "concierge_skirt"
+ item_state = "concierge_skirt"
+
+//religion
+
+/obj/item/clothing/under/f13/religion/priest
+ name = "priest clothing"
+ desc = "Typical priest clothing."
+ icon_state = "priest"
+ item_state = "priest"
+
+//civilian
+
+/obj/item/clothing/under/f13/hawaiian/red
+ name = "red hawaiian outfit"
+ desc = "Woooaahh, dude, party on."
+ icon_state = "hawaiianred_s"
+ item_state = "hawaiianred_s"
+
+/obj/item/clothing/under/f13/hawaiian/blue
+ name = "blue hawaiian outfit"
+ desc = "Woooaahh, dude, party on."
+ icon_state = "hawaiianblue_s"
+ item_state = "hawaiianblue_s"
+
+/obj/item/clothing/under/f13/hawaiian/orange
+ name = "orange hawaiian outfit"
+ desc = "Woooaahh, dude, party on."
+ icon_state = "hawaiianorange_s"
+ item_state = "hawaiianorange_s"
+
+/obj/item/clothing/under/f13/hawaiian/pink
+ name = "pink hawaiian outfit"
+ desc = "Woooaahh, dude, party on."
+ icon_state = "hawaiianpink_s"
+ item_state = "hawaiianpink_s"
+
+/obj/item/clothing/under/f13/ncr/police
+ name = "NCR police uniform"
+ desc = "A standard issue NCR police uniform, repurposed from the old world."
+ icon_state = "ahp_uniform"
+ item_state = "ahp_uniform"
+
+/obj/item/clothing/under/f13/brahminbaron/foreign_suit
+ name = "foreign suit"
+ desc = "A very well made suit."
+ icon_state = "schlimmsuit"
+ item_state = "schlimmsuit"
+
//ENCLAVE PEACEKEEPERS
/obj/item/clothing/under/f13/enclave/science
diff --git a/code/modules/fallout/machinery/light_sources/bar.dm b/code/modules/fallout/machinery/light_sources/bar.dm
index e5ceb077c2..a1aa46e4b3 100644
--- a/code/modules/fallout/machinery/light_sources/bar.dm
+++ b/code/modules/fallout/machinery/light_sources/bar.dm
@@ -90,3 +90,11 @@
density = 1
desc = "Where the west is still wild!"
light_color = LIGHT_COLOR_PINK
+
+/obj/machinery/light/sign/reno_sign
+ name = "new reno sign"
+ icon_state = "reno_sign"
+ base_state = "reno_sign"
+ icon = 'icons/fallout/objects/structures/reno.dmi'
+ desc = "The Biggest Little City in the World!"
+ light_color = LIGHT_COLOR_YELLOW
diff --git a/code/modules/fallout/obj/stack/f13Cash.dm b/code/modules/fallout/obj/stack/f13Cash.dm
index 39ce9452f8..3a32c98892 100644
--- a/code/modules/fallout/obj/stack/f13Cash.dm
+++ b/code/modules/fallout/obj/stack/f13Cash.dm
@@ -91,10 +91,34 @@
return BRUTELOSS
+/obj/item/stack/f13Cash/caps/onezero
+ amount = 10
+ merge_type = /obj/item/stack/f13Cash/caps
+
+/obj/item/stack/f13Cash/caps/threezero
+ amount = 30
+ merge_type = /obj/item/stack/f13Cash/caps
+
+/obj/item/stack/f13Cash/caps/fourzero
+ amount = 40
+ merge_type = /obj/item/stack/f13Cash/caps
+
+/obj/item/stack/f13Cash/caps/fivezero
+ amount = 50
+ merge_type = /obj/item/stack/f13Cash/caps
+
+/obj/item/stack/f13Cash/caps/sevenzero
+ amount = 70
+ merge_type = /obj/item/stack/f13Cash/caps
+
/obj/item/stack/f13Cash/caps/onezerozero
amount = 100
merge_type = /obj/item/stack/f13Cash/caps
+/obj/item/stack/f13Cash/caps/onefivezero
+ amount = 150
+ merge_type = /obj/item/stack/f13Cash/caps
+
/obj/item/stack/f13Cash/caps/fivezerozero
amount = 500
merge_type = /obj/item/stack/f13Cash/caps
@@ -103,11 +127,11 @@
amount = 350
merge_type = /obj/item/stack/f13Cash/caps
-
/obj/item/stack/f13Cash/caps/onezerozerozero
amount = 1000
merge_type = /obj/item/stack/f13Cash/caps
+
/obj/item/stack/f13Cash/Initialize()
. = ..()
update_desc()
@@ -274,6 +298,34 @@
/obj/item/stack/f13Cash/random/ncr
money_type = /obj/item/stack/f13Cash/ncr
+/obj/item/stack/f13Cash/ncr/onefivezero
+ amount = 150
+ merge_type = /obj/item/stack/f13Cash/ncr
+
+/obj/item/stack/f13Cash/ncr/onezerozero
+ amount = 100
+ merge_type = /obj/item/stack/f13Cash/ncr
+
+/obj/item/stack/f13Cash/ncr/sevenzero
+ amount = 70
+ merge_type = /obj/item/stack/f13Cash/ncr
+
+/obj/item/stack/f13Cash/ncr/fivezero
+ amount = 50
+ merge_type = /obj/item/stack/f13Cash/ncr
+
+/obj/item/stack/f13Cash/ncr/fourzero
+ amount = 40
+ merge_type = /obj/item/stack/f13Cash/ncr
+
+/obj/item/stack/f13Cash/ncr/threezero
+ amount = 30
+ merge_type = /obj/item/stack/f13Cash/ncr
+
+/obj/item/stack/f13Cash/ncr/onezero
+ amount = 10
+ merge_type = /obj/item/stack/f13Cash/ncr
+
/obj/item/stack/f13Cash/random/ncr/low
min_qty = TEMP3_MIN / CASH_NCR
max_qty = TEMP3_MAX / CASH_NCR
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 949e941cba..3fd8458c0b 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -251,6 +251,36 @@
icon_state = "absinthebottle"
list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100)
+/obj/item/reagent_containers/food/drinks/bottle/ale
+ name = "ale"
+ desc = "A type of beer brewed using a warm fermentation method, resulting in a sweet, full-bodied and fruity taste."
+ icon_state = "beerbottle"
+ list_reagents = list(/datum/reagent/consumable/ethanol/ale = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/creme_de_menthe
+ name = "creme de menthe"
+ desc = "A minty liqueur excellent for refreshing, cool drinks."
+ icon_state = "greenbottle"
+ list_reagents = list(/datum/reagent/consumable/ethanol/creme_de_menthe = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/creme_de_cacao
+ name = "creme de cacao"
+ desc = "A chocolatey liqueur excellent for adding dessert notes to beverages and bribing sororities."
+ icon_state = "darkbrownbottle"
+ list_reagents = list(/datum/reagent/consumable/ethanol/creme_de_cacao = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/creme_de_coconut
+ name = "creme de coconut"
+ desc = "A coconut liqueur for smooth, creamy, tropical drinks."
+ icon_state = "whitebottle"
+ list_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/triple_sec
+ name = "triple sec"
+ desc = "A sweet and vibrant orange liqueur."
+ icon_state = "beerbottle"
+ list_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 100)
+
/obj/item/reagent_containers/food/drinks/bottle/absinthe/empty
list_reagents = null
@@ -409,16 +439,16 @@
desc = "A bottle of rotgut. Its owner has applied some street wisdom to cleverly disguise it as a brown paper bag."
icon_state = "hoochbottle"
list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100)
-
+
/obj/item/reagent_containers/food/drinks/bottle/hooch/empty
list_reagents = null
-
+
/obj/item/reagent_containers/food/drinks/bottle/amaretto
name = "Luini Amaretto"
desc = "A gentle and syrup-like drink, tastes of almonds and apricots."
icon_state = "disaronno"
list_reagents = list(/datum/reagent/consumable/ethanol/amaretto = 100)
-
+
/obj/item/reagent_containers/food/drinks/bottle/amaretto/empty
list_reagents = null
@@ -561,6 +591,17 @@
list_reagents = list(/datum/reagent/consumable/strawberryjuice = 100)
foodtype = FRUIT
+/obj/item/reagent_containers/food/drinks/bottle/grapejuice
+ name = "Grape juice"
+ desc = "Wow! It's juice!"
+ icon_state = "eco_box"
+ item_state = "carton"
+ lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
+ isGlass = FALSE
+ list_reagents = list(/datum/reagent/consumable/grapejuice = 100)
+ foodtype = FRUIT
+
/obj/item/reagent_containers/food/drinks/bottle/menthol
name = "menthol"
desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
diff --git a/code/modules/jobs/job_types/bishops.dm b/code/modules/jobs/job_types/bishops.dm
new file mode 100644
index 0000000000..47f220afbb
--- /dev/null
+++ b/code/modules/jobs/job_types/bishops.dm
@@ -0,0 +1,296 @@
+/datum/job/bishops //do NOT use this for anything, it's just to store faction datums
+ department_flag = BISHOPS
+ selection_color = "#8CA2BD"
+ faction = FACTION_BISHOPS
+ exp_type = EXP_TYPE_BISHOPS
+ maptype = "reno"
+
+ access = list(ACCESS_BISHOPS)
+ minimal_access = list(ACCESS_BISHOPS)
+ forbids = "The Bishop family forbids: Due to their diplomatic nature there's little that the Bishop family would not admit nowadays, and the recent growth in numbers is in part because of this very reason. Nevertheless, the general rule ensued to all the members of the family is that they shouldn't act as common thugs, don't destroy property or steal from the casino, and don't pick unnecessary fights with the other gangs."
+ enforces = "The Bishops are an ambitious family; make sure to assert dominance among the other families of New Reno to let them know who is the most powerful gang in town. Make sure the Casino doesn't run short of money, alcohol and entretainment. Wearing the family suit is required, unless acting as an infiltrator."
+ objectivesList = list("Focus on managing the Shark Club casino.", "Extort the small businesses of New Reno to get a cut from their profits, but be weary, the other families may want a cut from them too.")
+
+
+/*--------------------------------------------------------------*/
+
+/datum/job/bishops/f13boss
+ title = "Bishops Boss"
+ flag = F13BISHOPSBOSS
+ department_flag = BISHOPS
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "Yourself"
+ 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 he 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. Nevertheless, the Bishops still rely on the other gangs of the city to provide them with new guns, chems, and alcohol. 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
+
+ outfit = /datum/outfit/job/bishops/f13boss
+
+/datum/outfit/job/bishops/f13boss
+ name = "Boss"
+ jobtype = /datum/job/bishops/f13boss
+
+ id = /obj/item/card/id/reno/bishops/ring/boss
+ backpack = /obj/item/storage/backpack/satchel/leather
+ ears = /obj/item/radio/headset
+ satchel = /obj/item/storage/backpack/satchel/leather
+ r_hand = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ mask = /obj/item/clothing/mask/cigarette/cigar/ncr
+ head = /obj/item/clothing/head/helmet/f13/bishops/fedora
+ neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ suit =/obj/item/clothing/suit/armor/f13/reno/bulletproof
+ uniform = /obj/item/clothing/under/f13/bishops/boss
+ belt = /obj/item/gun/ballistic/revolver/m29
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/ammo_box/m44 = 1,
+ /obj/item/storage/bag/money/small/reno/cap/onefivezero = 1,
+ /obj/item/circular_saw = 1,
+ /obj/item/melee/onehanded/knife/switchblade = 1,
+ )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/bishops/f13underboss
+ title = "Bishops Underboss"
+ flag = F13BISHOPSUNDERBOSS
+ department_flag = BISHOPS
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "Mordino Boss"
+ description = "You are the underboss of the Bishop family. Your role may vary from a simple consigliere, to a diplomat with the other families, to assigning soldiers to the capos, or even as the chief supervisor of the family casino; keep the dialogue with the boss constant and clear to know what he needs from you. In a world where treason is treated as common currency, a position such as a 'right hand man' for the boss is extremely valuable... nevertheless, should the boss be unable to lead the family, the job will fall unto you."
+ selection_color = "#7C93AF"
+ exp_requirements = EXP_TYPE_BISHOPS
+
+ outfit = /datum/outfit/job/bishops/f13underboss
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/bishops/f13underboss
+ name = "Underboss"
+ jobtype = /datum/job/bishops/f13underboss
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/bishops/ring/officer
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+// r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/onezerozero
+ r_pocket = /obj/item/ammo_box/m44
+ mask = /obj/item/clothing/mask/cigarette/cigar/ncr
+ head = /obj/item/clothing/head/helmet/f13/bishops/fedora
+ neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ suit =/obj/item/clothing/suit/armor/f13/reno/bulletproof
+ uniform = /obj/item/clothing/under/f13/bishops/officer
+ belt = /obj/item/gun/ballistic/revolver/m29
+// backpack_contents = list(
+// /obj/item/ammo_box/m44 = 1,
+// /obj/item/storage/bag/money/small/ncr = 1,
+// )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/bishops/f13capo
+ title = "Bishops Capo"
+ flag = F13BISHOPSCAPO
+ department_flag = BISHOPS
+ total_positions = 2
+ spawn_positions = 2
+ supervisors = "Bishop Underboss and the Bishop Boss"
+ 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 soldiers for the boss. You are the mediator between the head of the family and said soldiers, 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 soldiers not be assigned to you by the Boss or the Underboss, 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 superiors, keep the soldiers in line."
+ selection_color = "#8CA2BD"
+ exp_requirements = EXP_TYPE_BISHOPS
+
+ outfit = /datum/outfit/job/bishops/f13capo
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/bishops/f13capo
+ name = "Capo"
+ jobtype = /datum/job/bishops/f13capo
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/bishops/ring/officer
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+// r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/sevenzero //placeholder
+ r_pocket = /obj/item/ammo_box/c38
+ mask = /obj/item/clothing/mask/cigarette/cigar
+ head = /obj/item/clothing/head/helmet/f13/bishops/fedora
+// neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/bishops/officer
+ suit = /obj/item/clothing/suit/armor/f13/bishops/blue_trench_coat
+ belt = /obj/item/gun/ballistic/revolver/detective
+// backpack_contents = list(
+// /obj/item/ammo_box/m44 = 1,
+// /obj/item/storage/bag/money/small/ncr = 1,
+// )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/bishops/f13soldier
+ title = "Bishops Soldier"
+ flag = F13BISHOPSSOLDIER
+ department_flag = BISHOPS
+ total_positions = 7
+ spawn_positions = 7
+ supervisors = "Bishop Capos, the Underboss, and the Bishop Boss"
+ description = "You have been made a soldier of the Bishop Family. Expect to be assigned to follow the orders of one of the Capos, be it helping in the casino, extorting businesses, protecting your superiors during a meeting, and so on. Do not disturb the boss or the underboss with unnecessary affairs."
+ selection_color = "#8CA2BD"
+ exp_requirements = EXP_TYPE_BISHOPS
+
+ outfit = /datum/outfit/job/bishops/f13soldier
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/bishops/f13soldier
+ name = "Soldier"
+ jobtype = /datum/job/bishops/f13soldier
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/bishops/ring/soldier
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero //placeholder
+ head = /obj/item/clothing/head/helmet/f13/bishops/fedora
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/bishops/soldier
+ suit = /obj/item/clothing/suit/armor/f13/reno/bulletproof/lite
+
+/datum/outfit/job/bishops/f13soldier/pre_equip(mob/living/carbon/human/H)
+ . = ..()
+ r_hand = pick(
+ /obj/item/melee/onehanded/knife/switchblade, \
+ /obj/item/melee/onehanded/club, \
+ /obj/item/gun/ballistic/automatic/hobo/zipgun, \
+ /obj/item/twohanded/sledgehammer/simple, \
+ /obj/item/kitchen/knife, \
+ /obj/item/twohanded/baseball)
+
+/*--------------------------------------------------------------*/
+
+/datum/job/bishops/f13casinoworker
+ title = "Bishops Casino Worker"
+ flag = F13BISHOPCASINOWORKER
+ department_flag = BISHOPS
+ total_positions = 3
+ spawn_positions = 3
+ supervisors = "Bishop Capos, the Underboss, and the Bishop Boss"
+ description = "You are an employee of the Shark Club, the Bishop owned casino in New Reno. Though you're not a proper member of the family, you count with their protection and you're also expected to fulfill their demands. Serve drinks to the costumers, deal the cards on the tables, change money for casino chips (and viceversa), and keep a constant dialogue with whoever is keeping the casino safe to kick out drunkards, cheaters, and the more dangerous folks that may come to pay a visit to the family."
+ selection_color = "#8CA2BD"
+ exp_requirements = EXP_TYPE_BISHOPS
+
+ outfit = /datum/outfit/job/bishops/f13casinoworker
+
+/datum/outfit/job/bishops/f13casinoworker
+ name = "Casino Worker"
+ jobtype = /datum/job/bishops/f13casinoworker
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/bishops/papers/worker
+ //glasses =
+ gloves = /obj/item/clothing/gloves/color/white
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+// r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero
+ r_pocket = /obj/item/card/slotmachine
+// mask =
+// head =
+// neck =
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/bishops/casino_worker
+// suit =
+// belt =
+// backpack_contents = list(
+// /obj/item/ammo_box/m44 = 1,
+// /obj/item/storage/bag/money/small/ncr = 1,
+// )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/bishops/f13comedian
+ title = "Bishops Comedian"
+ flag = F13BISHOPCOMEDIAN
+ department_flag = BISHOPS
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "Bishop Capos, the Underboss, and the Bishop Boss"
+ description = "You are... well... the funny person of the Shark Club! Honk honk! This usually means you'll be expected to be funny to the tourists and whoever else is paying to see you. This is harder than it sounds."
+ selection_color = "#8CA2BD"
+ exp_requirements = EXP_TYPE_BISHOPS
+
+ outfit = /datum/outfit/job/bishops/f13bishopcomedian
+
+/datum/outfit/job/bishops/f13bishopcomedian
+ name = "comedian"
+ jobtype = /datum/job/bishops/f13comedian
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/bishops/papers/worker
+ gloves = /obj/item/clothing/gloves/color/white
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero
+ r_pocket = null
+ head = /obj/item/clothing/head/jester
+ shoes = /obj/item/clothing/shoes/jackboots
+ uniform = /obj/item/clothing/under/jester
+ backpack_contents = list(
+ /obj/item/reagent_containers/food/snacks/pie/cream = 5,
+ /obj/item/megaphone/clown = 1
+ )
diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm
index 2fdc1ff6ac..e103f20703 100644
--- a/code/modules/jobs/job_types/bos.dm
+++ b/code/modules/jobs/job_types/bos.dm
@@ -12,7 +12,7 @@ Main doors: ACCESS_CAPTAIN 20
minimal_access = list(ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
outfit = /datum/outfit/job/bos/
exp_type = EXP_TYPE_FALLOUT
- maptype = "yuma"
+ maptype = "brotherhood"
objectivesList = list("Leadership recommends the following goal for this week: Establish an outpost at the radio tower","Leadership recommends the following goal for this week: Acquire blueprints for research and preservation", "Leadership recommends the following goal for this week: Acquire or confiscate dangerous tech by any means necessary.")
diff --git a/code/modules/jobs/job_types/citizens.dm b/code/modules/jobs/job_types/citizens.dm
new file mode 100644
index 0000000000..8301546941
--- /dev/null
+++ b/code/modules/jobs/job_types/citizens.dm
@@ -0,0 +1,1053 @@
+/datum/job/citizens
+ department_flag = CITIZENS
+ exp_type = EXP_TYPE_CITIZENS
+ maptype = "reno"
+
+/datum/job/citizens/f13hotelowner
+ title = "Hotel Owner"
+ flag = F13HOTELOWNER
+ faction = FACTION_CITIZENS
+ total_positions = 1
+ spawn_positions = 1
+ description = "You are the owner of the only proper hotel in town. Yours is a simple, though demanding job: check the 'ins' and 'outs' of the tourists that pay for a room, charge extra for the good rooms, make sure their belongings are not stolen, give directions to the important landmarks in Reno, and keep the bums and vagrants out of the installations. the Hotel could be considered the only 'safe haven' for outsiders, with the only alternative being risking their lives by staying on the abandoned houses, so ensuring it remains safe for them should be a priority. For all of these endeavors, you will count with the hotel staff to use at your discretion. Yours is also a profitable business, so expect the other families to be aware of this and ask you for a cut."
+ supervisors = "Money"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13hotelowner
+
+ access = list(ACCESS_HOTEL)
+
+/datum/outfit/job/citizens/f13hotelowner
+ name = "Boss"
+ jobtype = /datum/job/citizens/f13hotelowner
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/hotel/papers/owner
+ glasses = /obj/item/clothing/glasses/monocle
+ gloves = /obj/item/clothing/gloves/color/white
+ backpack = /obj/item/storage/backpack/satchel/leather
+ suit = /obj/item/clothing/suit/armor/f13/reno/bulletproof
+ satchel = /obj/item/storage/backpack/satchel/leather
+ r_hand = /obj/item/cane
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/onezerozero //placeholder
+// r_pocket =
+ mask = /obj/item/clothing/mask/cigarette/cigar/ncr
+ head = /obj/item/clothing/head/bowler
+// neck =
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/rank/civilian/victorian_redsleeves
+ belt = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/melee/onehanded/knife/switchblade = 1,
+ /obj/item/clipboard = 1,
+ /obj/item/paper = 1,
+ )
+
+/*--------------------------------------------------------------*/
+/datum/job/citizens/f13hotelconcierge
+ title = "Hotel Concierges"
+ flag = F13HOTELCONCIERGE
+ faction = FACTION_CITIZENS
+ total_positions = 3
+ spawn_positions = 3
+ description = "You have been employed by the local Hotel to work as a member of the staff. Though you may not be making as much money as other people in town, you still have a well paid job and don't need to risk your life to make ends meet. Talk to the owner to know what he (or the costumers) need, accommodate the guests to their rooms, make sure their belongings are not stolen, help the owner to kick out bums and vagrants. Always ask for tips."
+ supervisors = "Hotel Owner"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13hotelconcierge
+
+ access = list(ACCESS_HOTEL)
+
+ loadout_options = list(
+ /datum/outfit/loadout/male_staff,
+ /datum/outfit/loadout/female_staff,
+ )
+
+
+/datum/outfit/job/citizens/f13hotelconcierge
+ name = "Hotel Concierge"
+ jobtype = /datum/job/citizens/f13hotelconcierge
+ id = /obj/item/card/id/reno/hotel/papers/worker
+ ears = /obj/item/radio/headset
+ gloves = /obj/item/clothing/gloves/color/white
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero //placeholder
+// r_pocket =
+ head = /obj/item/clothing/head/helmet/f13/hotel/concierge/cap
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/hotel/concierge/uniform
+ backpack_contents = list(
+ /obj/item/kitchen/knife/butcher = 1,
+ /obj/item/clipboard = 1,
+ /obj/item/paper = 1,
+ )
+
+/datum/outfit/loadout/male_staff
+ name = "butler"
+ suit = /obj/item/clothing/suit/armor/f13/hotel/concierge/coat
+ glasses = /obj/item/clothing/glasses/concierge_m
+ backpack_contents = list(
+ /obj/item/mop = 1,
+ /obj/item/storage/fancy/cigarettes/cigpack_cannabis=1,
+ /obj/item/reagent_containers/glass/bucket =1)
+
+/datum/outfit/loadout/female_staff
+ name = "maid"
+ suit = /obj/item/clothing/suit/armor/f13/hotel/concierge/vest
+ glasses = /obj/item/clothing/glasses/concierge_f
+ backpack_contents = list(
+ /obj/item/mop = 1,
+ /obj/item/storage/fancy/cigarettes/cigpack_cannabis=1,
+ /obj/item/reagent_containers/glass/bucket =1)
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13pharmacist
+ title = "Pharmacist"
+ flag = F13PHARMACIST
+ faction = FACTION_CITIZENS
+ total_positions = 1
+ spawn_positions = 1
+ description = "You are the independent owner of the town's Pharmacy, tasked to provide to tourists and citizens alike with the famous 'New Reno experience'. Tough you don't have a chemistry setup to manufacture any chems and medicine you intend to sell, there's a chance that the Mordinos (or any family controlling the chem business) will be willing and able to sell you mass produced goods for a cheap price. Since there are never enough chems in Reno, yours is also a profitable business, so expect the other families to be aware of this and ask you for a cut."
+ supervisors = "Money"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13pharmacist
+
+ access = list(ACCESS_PHAR)
+
+/datum/outfit/job/citizens/f13pharmacist
+ name = "Pharmacist"
+ jobtype = /datum/job/citizens/f13pharmacist
+
+ ears = /obj/item/pen
+ id = /obj/item/card/id/reno/pharmacy/owner
+ glasses = /obj/item/clothing/glasses/f13/biker
+ gloves = /obj/item/clothing/gloves/f13/leather
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ r_hand = /obj/item/gun/ballistic/automatic/autopipe
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/sevenzero //placeholder
+ //r_pocket =
+ mask = /obj/item/clothing/mask/ncr_facewrap
+ //head =
+// neck =
+ shoes = /obj/item/clothing/shoes/jackboots
+ uniform = /obj/item/clothing/under/f13/mechanic
+ belt = /obj/item/storage/belt/military/assault
+ backpack_contents = list(
+ /obj/item/ammo_box/magazine/autopipe = 1,
+ /obj/item/melee/onehanded/knife/hunting = 1,
+ )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13armsdealer
+ title = "Arms Dealer"
+ flag = F13ARMSDEALER
+ faction = FACTION_CITIZENS
+ total_positions = 1
+ spawn_positions = 1
+ description = "You are the independent owner of the town's arms store, tasked to provide to tourists and citizens alike with the means to defend themselves. Though you have a console to order most of the guns you will be selling, there's a chance that the Salvatores and the Wrights would be able to provide you a with better (and maybe even cheaper) arsenal. Since there are never enough guns in Reno, yours is also a profitable business, so expect the other families to be aware of this and ask you for a cut."
+ supervisors = "Money"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13armsdealer
+
+ access = list(ACCESS_NRA)
+
+/datum/outfit/job/citizens/f13armsdealer
+ name = "Arms Dealer"
+ jobtype = /datum/job/citizens/f13armsdealer
+
+ ears = /obj/item/pen
+ id = /obj/item/card/id/reno/nra/papers/owner
+ //glasses = /obj/item/clothing/glasses/monocle
+ gloves = /obj/item/clothing/gloves/color/black
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ //r_hand = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/sevenzero //placeholder
+// r_pocket =
+ //mask = /obj/item/clothing/mask/cigarette/cigar/ncr
+ //head = /obj/item/clothing/head/bowler
+// neck =
+ shoes = /obj/item/clothing/shoes/jackboots
+ uniform = /obj/item/clothing/under/syndicate/camo
+ suit= /obj/item/clothing/suit/jacket/miljacket
+ suit_store = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ belt = /obj/item/storage/belt/military/assault
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/melee/onehanded/knife/hunting = 1,
+ /obj/item/paper = 1,
+ )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13junglegymowner
+ title = "Jungle Gym Owner"
+ flag = F13JUNGLEGYMOWNER
+ faction = FACTION_CITIZENS
+ total_positions = 1
+ spawn_positions = 1
+ description = "You're sort of a jack of all trades in town. On one hand, you manage the local pawn shop, taking gamblers goods for money that they will lose in the casinos, and reselling said goods for double the price you paid it in the first place. On the other hand, next to the pawn shop, you're also the owner of the Jungle Gym, both coaching athletes who wants to put the installations to use and arranging box fights in the Gym's Ring and getting the visitors to place bets on the fighters. You will probably be making a fair amount of money in the process too, so expect the other families to be aware of this and ask you for a cut."
+ supervisors = "Money"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13junglegymowner
+
+ access = list(ACCESS_GYM)
+
+/datum/outfit/job/citizens/f13junglegymowner
+ name = "Host"
+ jobtype = /datum/job/citizens/f13junglegymowner
+
+ ears = /obj/item/pen
+ id = /obj/item/card/id/reno/junglegym/papers/owner
+ //glasses = /obj/item/clothing/glasses/monocle
+ //gloves = /obj/item/clothing/gloves/color/black
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ //r_hand = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/sevenzero //placeholder
+// r_pocket =
+ //mask = /obj/item/clothing/mask/cigarette/cigar/ncr
+ //head = /obj/item/clothing/head/bowler
+// neck =
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/bennys
+ //suit= /obj/item/clothing/suit/jacket/miljacket
+ //suit_store = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ belt = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/melee/unarmed/brass = 1,
+ /obj/item/paper = 1,
+ )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13renodoctor
+ title = "Reno Doctor"
+ flag = F13RENODOCTOR
+ faction = FACTION_CITIZENS
+ total_positions = 2
+ spawn_positions = 2
+ description = "You are a doctor for the small local clinic, the only entity providing healthcare to the people of New Reno. Since this is one of the few charities present in town, don't expect things to go smoothly. For one, you have no relation to the Followers of the Apocalypse, and although this allows you to not be bound by their rules, this also means that you are scrapping by with the few scarce resources you have at your disposition. Secondly, the families may not take kindly that you aid their hooked addicts, or heal their deceased rivals, so always be weary of what the gangs interests. Work discretely, heal your patients, aid the addicts, see if the priest may be able to lend a hand, and, if necessary, look for protection among the gangs, the Wrights probably being the most willing among them all."
+ selection_color = "#F7EFCF"
+
+ outfit = /datum/outfit/job/citizens/f13renodoctor
+
+ access = list(ACCESS_RENO_CLINIC)
+
+/datum/outfit/job/citizens/f13renodoctor
+ name = "Doctor"
+ jobtype = /datum/job/citizens/f13renodoctor
+
+ id = /obj/item/card/id/reno/clinic/papers
+ belt = /obj/item/storage/belt/medical
+ shoes = /obj/item/clothing/shoes/laceup
+ ears = null
+ r_pocket = /obj/item/flashlight/seclite
+ l_pocket = /obj/item/stack/f13Cash/ncr/fourzero
+ uniform = /obj/item/clothing/under/f13/doctor
+ suit = /obj/item/clothing/suit/toggle/labcoat/f13
+ backpack = /obj/item/storage/backpack/medic
+ gloves = /obj/item/clothing/gloves/color/white
+ //head = /obj/item/clothing/head/beret/durathread
+ mask = /obj/item/clothing/mask/surgical
+ backpack_contents = list(
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 2, \
+ /obj/item/healthanalyzer=1, \
+ /obj/item/storage/bag/money/small/wastelander)
+
+/datum/outfit/job/citizens/f13renodoctor/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ ..()
+ if(visualsOnly)
+ return
+ ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
+ ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)
+ ADD_TRAIT(H, TRAIT_MEDICALEXPERT, src)
+ ADD_TRAIT(H, TRAIT_SURGERY_MID, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/jet)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/turbo)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/psycho)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/medx)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/buffout)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/set_vrboard/den)
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13bum
+ title = "Bum"
+ flag = F13BUM
+ faction = FACTION_CITIZENS
+ total_positions = -1
+ spawn_positions = -1
+ description = "You are a Bum. For one reason or another you have hit rock bottom, with no money, no job, and no house. Nevertheless, this lack of prospects in your life have placed you in sort of an advantageous position: you are not bound to anything. Beg for money on the street, mug people when they refuse to spare some coins, try to find something valuable among the ruins of the town, work with other hobos to get an edge, occupy the empty residences of the town, bug some gangster to give you a job. Remember, you have nothing left to lose."
+ supervisors = "anyone with a bed"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13bum
+
+/datum/outfit/job/citizens/f13bum
+ name = "Bum"
+ jobtype = /datum/job/citizens/f13bum
+
+ id = null
+ ears = null
+ belt = null
+ backpack = null
+ satchel = null
+ shoes = null
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ gloves = /obj/item/clothing/gloves/f13/handwraps
+ r_pocket = /obj/item/reagent_containers/pill/patch/jet
+ l_pocket = /obj/item/reagent_containers/hypospray/medipen/medx
+
+
+/datum/outfit/job/citizens/f13bum/pre_equip(mob/living/carbon/human/H)
+ . = ..()
+ uniform = pick(
+ /obj/item/clothing/under/f13/brahmin, \
+ /obj/item/clothing/under/f13/rag, \
+ /obj/item/clothing/under/f13/raider_leather, \
+ /obj/item/clothing/under/f13/raiderrags, \
+ /obj/item/clothing/under/pants/f13/ghoul, \
+ /obj/item/clothing/under/jabroni)
+
+ r_hand = pick(
+ /obj/item/melee/onehanded/club, \
+ /obj/item/kitchen/knife, \
+ /obj/item/melee/onehanded/club/tireiron, \
+ /obj/item/gun/ballistic/revolver/hobo/pepperbox, \
+ /obj/item/melee/onehanded/knife/cosmicdirty, \
+ /obj/item/reagent_containers/food/drinks/beer)
+
+ var/datum/reagent/jet = new /datum/reagent/drug/jet
+ H.reagents.addiction_list.Add(jet)
+
+/*--------------------------------------------------------------*/
+/datum/job/citizens/f13mercenary
+ title = "Mercenary"
+ flag = F13MERCENARY
+ faction = FACTION_CITIZENS
+ total_positions = 3
+ spawn_positions = 3
+ description = "You have decided to try your luck as a gun for sale on the streets of New Reno. Though maybe not as profitable as joining one of the families, you're still your own boss, and you will not lack neither work or action, since tourists and gangsters alike may require of your assistance. Offer your services on the street to let people know that you're a merc, if possible use your money to buy better guns from the arms shop, and never work for free."
+ supervisors = "the highest bidder"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13mercenary
+
+
+ loadout_options = list(
+ /datum/outfit/loadout/iceman,
+ /datum/outfit/loadout/hiredguard,
+ )
+
+
+/datum/outfit/job/citizens/f13mercenary
+ name = "Mercenary"
+ jobtype = /datum/job/citizens/f13mercenary
+
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero
+ id = null
+ shoes = /obj/item/clothing/shoes/jackboots
+ backpack_contents = list(
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 2,
+ /obj/item/melee/onehanded/knife/trench = 1,
+ )
+/datum/outfit/job/citizens/f13mercenary/pre_equip(mob/living/carbon/human/H)
+ . = ..()
+ uniform = pick(
+ /obj/item/clothing/under/f13/merca, \
+ /obj/item/clothing/under/syndicate/camo, \
+ /obj/item/clothing/under/f13/mercc)
+
+/datum/outfit/loadout/iceman
+ name = "Iceman"
+ suit = /obj/item/clothing/suit/armored/light/vest/kevlar
+ belt = /obj/item/storage/belt/military/assault
+ mask = /obj/item/clothing/mask/russian_balaclava
+ backpack_contents = list(
+ /obj/item/suppressor = 1,
+ /obj/item/gun/ballistic/automatic/pistol/n99 = 1,
+ /obj/item/ammo_box/magazine/m10mm_adv/simple = 2)
+
+/datum/outfit/loadout/hiredguard
+ name = "Hired Guard"
+ suit = /obj/item/clothing/suit/armor/f13/metalarmor/steelbib
+ belt = /obj/item/storage/belt/military/assault
+ head = /obj/item/clothing/head/helmet/armyhelmet/heavy
+ mask = /obj/item/clothing/mask/russian_balaclava
+ uniform = /obj/item/clothing/under/syndicate/camo
+ backpack_contents = list(
+ /obj/item/gun/ballistic/automatic/autopipe = 1,
+ /obj/item/ammo_box/magazine/autopipe = 1)
+
+/*--------------------------------------------------------------*/
+/datum/job/citizens/f13priest
+ title = "Priest"
+ flag = F13PRIEST
+ faction = FACTION_CITIZENS
+ total_positions = 1
+ spawn_positions = 1
+ description = "You are the lone priest of the small local chapel, either as the leader of the local Temperance Faction, a New Canaanite Pastor, a Children of the Atom Cultist, or something entirely different. You have taken the bow to lead your flock, even here in the sinful city of New Reno, be it by feeding the poor, cooperating with the clinic, giving mass, and so on. Bug the gang members to make them reconsider their sinful ways, and also try to get the tourists and the citizens to stay away from chems and the casinos. If you push your proselytism too far, you may have to look for protection from the gangs... though consider that the Wrights will probably be the only ones willing to help."
+ supervisors = "the highest bidder"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13priest
+
+
+/datum/outfit/job/citizens/f13priest
+ name = "Priest"
+ jobtype = /datum/job/citizens/f13priest
+
+ //ears = /obj/item/pen
+ //gloves = /obj/item/clothing/gloves/color/white
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ id = null
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ l_pocket = /obj/item/stack/f13Cash/ncr/fourzero
+// r_pocket =
+ //head = /obj/item/clothing/head/helmet/f13/hotel/concierge/cap
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/religion/priest
+ backpack_contents = list(
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 2,
+ )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13yakuza
+ title = "Yakuza"
+ flag = F13YAKUZA
+ faction = FACTION_CITIZENS
+ total_positions = 3
+ spawn_positions = 3
+ description = "You are part of an small band of Yakuzas settled in New Reno, advocated to perpetuate the traditions of the old Japanese Mafia with your expertise in swordplay and customary attires. Unlike the big gangs of the city, there is no concrete hierarchy among your ranks, nor is there any type of manufacturing of chems, alcohol or guns, having only the old abandoned Dojo of the town to serve you as headquarters. Work as mercenaries for the big gangs, assault lone tourists on the streets, act as vigilantes for the town; whatever you decide to do with your small band of brothers is up to you, but remember: you're no simple raiders, fight with honor."
+ supervisors = "yourselves"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13yakuza
+
+ access = list(ACCESS_YAKUZA)
+
+/datum/outfit/job/citizens/f13yakuza
+ name = "Yakuza"
+ jobtype = /datum/job/citizens/f13yakuza
+
+ ears = /obj/item/pen
+ id = /obj/item/card/id/reno/yakuza/ring
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fourzero
+// r_pocket =
+ head = /obj/item/clothing/head/rice_hat
+ shoes = /obj/item/clothing/shoes/f13/raidertreads
+ uniform = /obj/item/clothing/under/f13/raider_leather
+ backpack_contents = list(
+ /obj/item/melee/onehanded/knife/throwing = 3,
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 2,
+ )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13peasant
+ title = "Peasant"
+ flag = F13PEASANT
+ faction = FACTION_CITIZENS
+ total_positions = 2
+ spawn_positions = 2
+ description = "You are part of a group of farmers who have settled outside the relatively safe walls of Reno. You make your living off of raising cattle and growing crops, selling the fruits of your labor to the various businesses within the city. Though you'll most likely prove to be of vital use for the businesses of New Reno, you may be forced to seek protection from those who would wish to destroy what is yours."
+ supervisors = "yourselves"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13peasant
+
+/datum/outfit/job/citizens/f13peasant
+ name = "Farmer"
+ jobtype = /datum/job/citizens/f13peasant
+
+ //ears = /obj/item/pen
+ gloves = /obj/item/clothing/gloves/color/brown
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ r_hand = /obj/item/gun/ballistic/rifle/hunting
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fourzero
+// r_pocket =
+ head = /obj/item/clothing/head/scarecrow_hat
+ mask = /obj/item/clothing/mask/facewrap
+ shoes = /obj/item/clothing/shoes/f13/rag
+ uniform = /obj/item/clothing/under/f13/settler
+ id = null
+// belt = obj/item/katana
+ backpack_contents = list(
+ /obj/item/ammo_box/a308 = 2,
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
+ /obj/item/reagent_containers/glass/beaker/waterbottle = 3,
+ /obj/item/reagent_containers/glass/bucket/wood = 1,
+ /obj/item/shovel/spade = 1,
+ /obj/item/cultivator/rake = 1,
+ )
+
+/*--------------------------------------------------------------*/
+/datum/job/citizens/f13renoraider
+ title = "Raider"
+ flag = F13RENORAIDER
+ faction = FACTION_CITIZENS
+ total_positions = -1
+ spawn_positions = -1
+ description = "You are a member of one of the infamous raider gangs of the wastes. Pillaging, robbing, murdering wasters are a recurrent chore for your people. Depending on their affiliation, though, raiders may vary from an illiterate chemhead, to a straight edge tribal, or even a member of a group with strong connections and an unique culture based on raiding, and all of this should be considered when defining your character. Form loose associations with other raiders to get an edge. Betray said raiders because of a dumb argument. Be weary of the inside of the city or destroying family businesses, since the gangs may not take kindly to your presence in town."
+ supervisors = "the man with the biggest stick"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13renoraider
+
+ loadout_options = list(
+ /datum/outfit/loadout/raider_fugitive,
+ /datum/outfit/loadout/raider_bandido,
+ /datum/outfit/loadout/raider_ncradeserter,
+ /datum/outfit/loadout/raider_denslaver,
+ /datum/outfit/loadout/raider_whiteleg,
+ /datum/outfit/loadout/raider_khans,
+ /datum/outfit/loadout/raider_vipers,
+ /datum/outfit/loadout/raider_jackals,
+ /datum/outfit/loadout/raider_80s,
+ /datum/outfit/loadout/raider_manhunter,
+ /datum/outfit/loadout/raider_psychotic,
+ /datum/outfit/loadout/raider_eyebot
+ )
+
+/datum/outfit/job/citizens/f13renoraider
+ name = "Reno Raider"
+ jobtype = /datum/job/citizens/f13renoraider
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ ears = null
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/onezero //placeholder
+ id = null
+ shoes = /obj/item/clothing/shoes/jackboots
+ backpack_contents = list(
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 2,
+ /obj/item/melee/onehanded/knife/trench = 1,
+ /obj/item/restraints/handcuffs = 2,
+ )
+/datum/outfit/job/citizens/f13renoraider/pre_equip(mob/living/carbon/human/H)
+ . = ..()
+ uniform = pick(
+ /obj/item/clothing/under/f13/merca, \
+ /obj/item/clothing/under/syndicate/camo, \
+ /obj/item/clothing/under/f13/mercc, \
+ /obj/item/clothing/under/f13/raider_leather, \
+ /obj/item/clothing/under/f13/raiderrags, \
+ /obj/item/clothing/under/pants/f13/ghoul, \
+ /obj/item/clothing/under/jabroni)
+
+/datum/outfit/loadout/raider_fugitive
+ name = "Fugitive"
+ suit = /obj/item/clothing/suit/armor/f13/ncrcfjacket
+ uniform = /obj/item/clothing/under/f13/ncrcf
+ mask = /obj/item/clothing/mask/russian_balaclava
+ backpack_contents = list(
+ /obj/item/gun/ballistic/revolver/caravan_shotgun = 1,
+ /obj/item/ammo_box/shotgun/improvised = 2,
+ /obj/item/melee/classic_baton = 1)
+
+/datum/outfit/loadout/raider_bandido
+ name = "Bandido"
+ belt = /obj/item/gun/ballistic/revolver/colt357
+ neck = /obj/item/storage/belt/holster
+ mask = /obj/item/clothing/mask/ncr_facewrap
+ uniform = /obj/item/clothing/under/f13/jamrock
+ head = /obj/item/clothing/head/helmet/f13/vaquerohat
+ glasses = /obj/item/clothing/glasses/f13/biker
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ backpack_contents = list(
+ /obj/item/ammo_box/a357 = 2,
+ /obj/item/kitchen/knife = 1)
+
+/datum/outfit/loadout/raider_ncradeserter
+ name = "NCRA Deserter"
+ suit = /obj/item/clothing/suit/armor/f13/ncrarmor
+ suit_store = /obj/item/gun/ballistic/rifle/hunting
+ belt = /obj/item/storage/belt/military/assault/ncr
+ mask = /obj/item/clothing/mask/ncr_facewrap
+ uniform = /obj/item/clothing/under/f13/ncr
+ head = /obj/item/clothing/head/f13/ncr/goggles
+ shoes = /obj/item/clothing/shoes/f13/military/ncr
+ backpack_contents = list(
+ /obj/item/melee/onehanded/knife/bayonet = 1,
+ /obj/item/ammo_box/a308 = 2)
+
+/datum/outfit/loadout/raider_denslaver
+ name = "Den Slaver"
+ suit = /obj/item/clothing/suit/armored/light/leather_jacketmk2
+ suit_store = /obj/item/gun/ballistic/automatic/autopipe
+ mask = /obj/item/clothing/mask/bandana/durathread
+ uniform = /obj/item/clothing/under/f13/navy
+ head = /obj/item/clothing/head/helmet/riot
+ glasses = /obj/item/clothing/glasses/f13/biker
+ shoes = /obj/item/clothing/shoes/jackboots
+ backpack_contents = list(
+ /obj/item/melee/classic_baton = 1,
+ /obj/item/restraints/legcuffs/bola/tactical = 3,
+ /obj/item/ammo_box/magazine/autopipe = 1)
+
+/datum/outfit/loadout/raider_whiteleg
+ name = "White Leg"
+ suit = /obj/item/clothing/suit/armor/f13/raider/badlands
+ suit_store = /obj/item/melee/onehanded/club/warclub
+ belt = /obj/item/storage/backpack/spearquiver
+ uniform = /obj/item/clothing/under/f13/whitelegs
+ backpack_contents = list(
+ /obj/item/clothing/under/f13/female/whitelegs = 1,
+ /obj/item/book/granter/trait/trekking = 1,
+ /obj/item/book/granter/trait/iron_fist = 1,
+ /obj/item/warpaint_bowl = 1,
+ /obj/item/book/granter/crafting_recipe/tribal/whitelegs = 1)
+
+/datum/outfit/loadout/raider_khans
+ name = "Khan"
+ suit = /obj/item/clothing/suit/toggle/labcoat/f13/khan_jacket
+ suit_store = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ uniform = /obj/item/clothing/under/f13/khan
+ gloves = /obj/item/melee/unarmed/brass/spiked
+ head = /obj/item/clothing/head/helmet/f13/khan/pelt
+ shoes = /obj/item/clothing/shoes/f13/military/khan_pelt
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/improvised = 2)
+
+/datum/outfit/loadout/raider_vipers
+ name = "Viper"
+ suit = /obj/item/clothing/suit/armored/light/duster/vet
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/n99
+ uniform = /obj/item/clothing/under/jabroni
+ glasses = /obj/item/clothing/glasses/f13/biker
+ shoes = /obj/item/clothing/shoes/jackboots
+ backpack_contents = list(
+ /obj/item/toy/plush/snakeplushie = 1,
+ /obj/item/viper_venom = 2,
+ /obj/item/ammo_box/magazine/m10mm_adv = 2)
+
+/datum/outfit/loadout/raider_jackals
+ name = "Jackal"
+ uniform = /obj/item/clothing/under/f13/raider_leather
+ shoes = /obj/item/clothing/shoes/f13/raidertreads
+ backpack_contents = list(
+ /obj/item/twohanded/fireaxe/bmprsword = 1,
+ /obj/item/reagent_containers/hypospray/medipen/medx = 1,
+ /obj/item/reagent_containers/food/snacks/meat/cutlet/plain/human = 2,
+ /obj/item/kitchen/knife/butcher = 1)
+
+/datum/outfit/loadout/raider_80s
+ name = "80s"
+ suit = /obj/item/clothing/suit/armor/f13/raiders/roadwarriors
+ belt = /obj/item/storage/backpack/spearquiver
+ uniform = /obj/item/clothing/under/pants/f13/warboy
+ head = /obj/item/clothing/head/helmet/f13/raider/arclight
+ glasses = /obj/item/clothing/glasses/f13/biker
+ shoes = /obj/item/clothing/shoes/jackboots
+ backpack_contents = list(
+ /obj/item/melee/onehanded/machete/scrapsabre = 1)
+
+/datum/outfit/loadout/raider_manhunter
+ name = "Manhunter"
+ suit = /obj/item/clothing/suit/armored/light/tribalraider
+ belt = /obj/item/storage/backpack/spearquiver
+ uniform = /obj/item/clothing/under/f13/exile/tribal
+ head = /obj/item/clothing/head/helmet/f13/deathskull
+ backpack_contents = list(
+ /obj/item/restraints/legcuffs/beartrap = 5,
+ /obj/item/nullrod/tribal_knife = 1)
+
+/datum/outfit/loadout/raider_psychotic
+ name = "Painspike"
+ suit = /obj/item/clothing/suit/armor/f13/raider/painspike
+ suit_store = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ head = /obj/item/clothing/head/helmet/f13/raider/psychotic
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/improvised = 1,
+ /obj/item/melee/onehanded/club/fryingpan = 1)
+
+/datum/outfit/loadout/raider_eyebot
+ name = "Eyebot"
+ suit = /obj/item/clothing/suit/armor/f13/raider/badlands
+ head = /obj/item/clothing/head/helmet/f13/raider/eyebot
+ backpack_contents = list(
+ /obj/item/pizzabox/bomb = 1,
+ /obj/item/restraints/legcuffs/beartrap = 3)
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13tourist
+ title = "Tourist"
+ flag = F13TOURIST
+ faction = FACTION_CITIZENS
+ total_positions = -1
+ spawn_positions = -1
+ description = "You have found you way to New Reno, The Biggest Little City in the World. Though the city itself is usually in a perpetual state of tension between the clashes among the families, the poor state of the charities, or the rampant hobo criminality, you don't need to think too much about it. You've come here to visit the landmarks, stay at the hotel, play some cards in the casinos, or enjoy the so called 'New Reno experience', and you have enough caps to make that happen."
+ supervisors = "hedonism"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13tourist
+
+ loadout_options = list(
+ /datum/outfit/loadout/tourist,
+ /datum/outfit/loadout/ncroffduty,
+ /datum/outfit/loadout/vaultcityscientist,
+ /datum/outfit/loadout/vaultcitytourist,
+ /datum/outfit/loadout/vaultcitydiplomat,
+ /datum/outfit/loadout/vaquero,
+ /datum/outfit/loadout/reporter,
+ /datum/outfit/loadout/detective,
+ /datum/outfit/loadout/ncrpolice,
+ /datum/outfit/loadout/gambler,
+ )
+
+/datum/outfit/job/citizens/f13tourist/pre_equip(mob/living/carbon/human/H)
+ . = ..()
+ uniform = pick(
+ /obj/item/clothing/under/f13/hawaiian/red, \
+ /obj/item/clothing/under/f13/hawaiian/blue, \
+ /obj/item/clothing/under/f13/hawaiian/orange, \
+ /obj/item/clothing/under/f13/hawaiian/pink)
+
+/datum/outfit/job/citizens/f13tourist
+ name = "Tourist"
+ jobtype = /datum/job/citizens/f13tourist
+
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ ears = /obj/item/pen
+ id = null
+ ///l_pocket =
+ shoes = /obj/item/clothing/shoes/f13/brownie
+ backpack_contents = list(
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
+ )
+
+/datum/outfit/loadout/tourist
+ name = "Tourist"
+ backpack_contents = list(
+ /obj/item/card/id/dogtag/town/ncr = 1,
+ /obj/item/melee/onehanded/club = 1,
+ /obj/item/storage/bag/money/small/reno/cap/onezerozero = 2)
+
+/datum/outfit/loadout/ncroffduty
+ name = "NCRA Off-Duty"
+ suit = /obj/item/clothing/suit/armor/f13/ncrarmor/ncr_dressjack
+ suit_store = /obj/item/gun/ballistic/rifle/hunting
+ belt = /obj/item/storage/belt/military/assault/ncr
+ mask = /obj/item/clothing/mask/ncr_facewrap
+ uniform = /obj/item/clothing/under/f13/ncr
+ head = /obj/item/clothing/head/beret/ncr_dresscap
+ shoes = /obj/item/clothing/shoes/f13/military/ncr
+ backpack_contents = list(
+ /obj/item/clothing/under/f13/ncr/ncr_officer = 1,
+ /obj/item/clothing/under/f13/ncr/ncr_shorts = 1,
+ /obj/item/clothing/shoes/f13/military/ncr_officer_boots = 1,
+ /obj/item/card/id/dogtag/town/ncr = 1,
+ /obj/item/melee/onehanded/knife/bayonet = 1,
+ /obj/item/clothing/under/f13/ncr/ncr_shorts = 1,
+ /obj/item/ammo_box/a308 = 2,
+ /obj/item/storage/bag/money/small/reno/cap/threezero = 2)
+
+/datum/outfit/loadout/vaultcityscientist
+ name = "Vault City Scientist"
+ belt = /obj/item/storage/belt/medical
+ uniform = /obj/item/clothing/under/f13/vault/vcity
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit = /obj/item/clothing/suit/toggle/labcoat/f13
+ glasses = /obj/item/clothing/glasses/hud/health/f13
+ backpack_contents = list(
+ /obj/item/book/granter/trait/chemistry = 1,
+ /obj/item/book/granter/trait/midsurgery = 1,
+ /obj/item/melee/onehanded/knife/survival = 1,
+ /obj/item/pda = 1,
+ /obj/item/card/id/selfassign = 1,
+ /obj/item/storage/backpack/duffelbag/med/surgery = 1,
+ /obj/item/storage/bag/money/small/reno/cap/fivezero = 1)
+
+/datum/outfit/loadout/vaultcitytourist
+ name = "Vault City Tourist"
+ uniform = /obj/item/clothing/under/f13/vault/vcity
+ shoes = /obj/item/clothing/shoes/jackboots
+ backpack_contents = list(
+ /obj/item/melee/classic_baton/telescopic = 1,
+ /obj/item/card/id/selfassign = 1,
+ /obj/item/pda = 1,
+ /obj/item/storage/bag/money/small/reno/cap/onezerozero = 2)
+
+/datum/outfit/loadout/vaultcitydiplomat
+ name = "Vault City Diplomat"
+ uniform = /obj/item/clothing/under/f13/vault/vcity
+ shoes = /obj/item/clothing/shoes/jackboots
+ backpack_contents = list(
+ /obj/item/card/id/selfassign = 1,
+ /obj/item/gun/ballistic/automatic/hobo/zipgun = 1,
+ /obj/item/pda = 1,
+ /obj/item/pen = 1,
+ /obj/item/storage/secure/briefcase = 1,
+ /obj/item/storage/bag/money/small/reno/cap/fivezero = 1)
+
+/datum/outfit/loadout/vaquero
+ name = "Vaquero"
+ belt = /obj/item/gun/ballistic/revolver/colt357
+ neck = /obj/item/storage/belt/holster
+ mask = /obj/item/clothing/mask/ncr_facewrap
+ uniform = /obj/item/clothing/under/f13/jamrock
+ head = /obj/item/clothing/head/helmet/f13/vaquerohat
+ glasses = /obj/item/clothing/glasses/f13/biker
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ backpack_contents = list(
+ /obj/item/ammo_box/a357 = 1,
+ /obj/item/card/id/dogtag/town/ncr = 1,
+ /obj/item/storage/bag/money/small/reno/cap/sevenzero = 1)
+
+/datum/outfit/loadout/reporter
+ name = "Reporter"
+ uniform = /obj/item/clothing/under/lawyer/blacksuit
+ shoes = /obj/item/clothing/shoes/laceup
+ backpack_contents = list(
+ /obj/item/card/id/selfassign = 1,
+ /obj/item/card/id/dogtag/town/ncr = 1,
+ /obj/item/taperecorder = 1,
+ /obj/item/pda = 1,
+ /obj/item/pen = 1,
+ /obj/item/paper = 1,
+ /obj/item/camera = 1,
+ /obj/item/gun/energy/disabler = 1,
+ /obj/item/reagent_containers/spray/pepper = 1,
+ /obj/item/wallframe/newscaster = 1,
+ /obj/item/storage/bag/money/small/reno/cap/sevenzero = 1)
+
+/datum/outfit/loadout/detective
+ name = "Detective"
+ suit = /obj/item/clothing/suit/det_suit/grey
+ uniform = /obj/item/clothing/under/f13/detectivealt
+ head = /obj/item/clothing/head/f13/det_hat_alt
+ shoes = /obj/item/clothing/shoes/laceup
+ r_pocket = /obj/item/flashlight/flare
+ r_hand = /obj/item/storage/backpack/satchel/explorer
+ suit_store = /obj/item/gun/ballistic/revolver/police
+ backpack_contents = list(
+ /obj/item/pda/detective = 1,
+ /obj/item/card/id/dogtag/town/ncr = 1,
+ /obj/item/card/id/syndicate = 1,
+ /obj/item/camera/detective = 1,
+ /obj/item/toy/crayon/white = 1,
+ /obj/item/detective_scanner = 1,
+ /obj/item/storage/box/gloves = 1,
+ /obj/item/storage/box/evidence = 1,
+ /obj/item/ammo_box/a357 = 1,
+ /obj/item/storage/bag/money/small/reno/cap/threezero =1)
+
+/datum/outfit/loadout/ncrpolice
+ name = "NCR Police"
+ suit = /obj/item/clothing/suit/armor/f13/civilians/ncr_police_coat
+ uniform = /obj/item/clothing/under/f13/ncr/police
+ head = /obj/item/clothing/head/helmet/f13/civilians/ncr_police_helmet
+ shoes = /obj/item/clothing/shoes/jackboots
+ r_pocket = /obj/item/flashlight/flare
+ r_hand = /obj/item/storage/backpack/satchel/explorer
+ suit_store = /obj/item/gun/ballistic/revolver/police
+ backpack_contents = list(
+ /obj/item/pda = 1,
+ /obj/item/card/id/selfassign = 1,
+ /obj/item/card/id/dogtag/town/ncr = 1,
+ /obj/item/ammo_box/a357 = 1,
+ /obj/item/storage/bag/money/small/reno/cap/threezero = 1)
+
+/datum/outfit/loadout/gambler
+ name = "Gambler"
+ uniform = /obj/item/clothing/under/suit/checkered
+ head = /obj/item/clothing/head/fedora
+ shoes = /obj/item/clothing/shoes/laceup
+ r_pocket = /obj/item/flashlight/flare
+ r_hand = /obj/item/storage/backpack/satchel/leather/withwallet
+ backpack_contents = list(
+ /obj/item/card/id/dogtag/town/ncr = 1,
+ /obj/item/ammo_box/a357 = 1,
+ /obj/item/storage/bag/money/small/reno/cap/onefivezero = 2)
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13brahminbaron
+ title = "Brahmin Baron"
+ flag = F13BRAHMINBARON
+ faction = FACTION_CITIZENS
+ total_positions = 1
+ spawn_positions = 1
+ description = "You have found you way to New Reno, The Biggest Little City in the World. Unlike the common tourists, you are a well known landowner with a significant political influence inside the New California Republic and more than enough money to spend. You may have just come to visit the city, stay in the hotel, and gamble in the casinos... or maybe you actually intend to invest your money in some of the families businesses to leave New Reno with more money than you had when you arrived. Whatever it is the case, yours is a prominent arrival in the city, and people will notice. Hire a mercenary to escort you if possible, and if you plan to invest, try to arrange a meeting with the big shots of the families and be ready to concern yourself with the political intricacies of New Reno."
+ supervisors = "money"
+ selection_color = "#F7EFCF"
+ exp_requirements = EXP_TYPE_CITIZENS
+
+ outfit = /datum/outfit/job/citizens/f13brahminbaron
+
+/datum/outfit/job/citizens/f13brahminbaron
+ name = "Brahmin Baron"
+ jobtype = /datum/job/citizens/f13brahminbaron
+
+ ears = /obj/item/pen
+ backpack = /obj/item/storage/backpack/satchel/leather/withwallet
+ satchel = /obj/item/storage/backpack/satchel/leather/withwallet
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/sixzerozero
+ r_pocket = /obj/item/gun/ballistic/revolver/m29/snub
+ head = /obj/item/clothing/head/helmet/f13/marlowhat
+ id = null
+ shoes = /obj/item/clothing/shoes/f13/brownie
+ uniform = /obj/item/clothing/under/f13/brahminbaron/foreign_suit
+ suit = /obj/item/clothing/suit/armor/f13/civilians/schlimmcoat
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/f13/foreign_hat = 1,
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 2,
+ /obj/item/storage/bag/money/small/reno/cap/onefivezero = 1)
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13ambassador
+ title = "NCR Ambassador"
+ flag = F13AMBASSADOR
+ faction = FACTION_CITIZENS
+ access = list(ACCESS_NCR, ACCESS_NCR_ARMORY, ACCESS_NCRREP)
+ total_positions = 1
+ spawn_positions = 1
+ description = "You are an influential representative for the NCR and experienced bureaucrat. You are here to further the objective and ensure the interests of the NCR. Attempt to establish relations with the gangs of Reno, and keep close ties with the Bishops, your only real 'allies' in the city. Manage recruitment and make deals with the gangs. YOU represent the NCR in New Reno."
+ supervisors = "the Republic"
+ selection_color = "#c7b775"
+ outfit = /datum/outfit/job/citizens/f13ambassador
+
+/datum/outfit/job/citizens/f13ambassador
+ name = "NCR Ambassador"
+ uniform = /obj/item/clothing/under/suit/burgundy
+ shoes = /obj/item/clothing/shoes/laceup
+ jobtype = /datum/job/ncr/f13representative
+ id = /obj/item/card/id/dogtag/ncrrep
+ ears = /obj/item/radio/headset/headset_ncr
+ neck = /obj/item/storage/belt/holster/legholster
+ backpack = /obj/item/storage/backpack/satchel/leather
+ backpack_contents = list(
+ /obj/item/gun/ballistic/revolver/m29 = 1,
+ /obj/item/ammo_box/m44 = 1,
+ /obj/item/storage/bag/money/small/reno/cap/onefivezero = 1
+ )
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13provostmarshal
+ title = "NCRA Provost Marshal"
+ flag = F13HEADMP
+ faction = FACTION_CITIZENS
+ access = list(ACCESS_NCR, ACCESS_NCR_ARMORY, ACCESS_CHANGE_IDS, ACCESS_NCRREP, ACCESS_NCR_COMMAND)
+ total_positions = 1
+ spawn_positions = 1
+ description = "You are the Provost Marshal, you are in charge of the embassy's and ambassador's security. You'll need to manage your MPs, attempt to prevent gang wars, and ensure the safety and security of NCR citizens. If able, you may want to provide humanitarian support to NCR citizens."
+ supervisors = "NCR Ambassador"
+ selection_color = "#c7b775"
+ outfit = /datum/outfit/job/citizens/f13provostmarshal
+
+/datum/outfit/job/citizens/f13provostmarshal
+ name = "NCR Provost Marshal"
+ jobtype = /datum/job/citizens/f13provostmarshal
+ id = /obj/item/card/id/dogtag/ncrlieutenant
+ neck = /obj/item/storage/belt/holster/legholster
+ accessory = /obj/item/clothing/accessory/ncr/LT2
+ glasses = /obj/item/clothing/glasses/sunglasses/big
+ head = /obj/item/clothing/head/beret/ncr/reno
+ backpack = /obj/item/storage/backpack/trekker
+ satchel = /obj/item/storage/backpack/satchel/trekker
+ belt = /obj/item/storage/belt/military/assault/ncr
+ suit = /obj/item/clothing/suit/armor/f13/ncrarmor/dresscoat/reno
+ uniform = /obj/item/clothing/under/f13/ncr/ncr_officer
+ gloves = /obj/item/clothing/gloves/f13/leather
+ shoes = /obj/item/clothing/shoes/f13/military/ncr_officer_boots
+ ears = /obj/item/radio/headset/headset_ncr
+ backpack = /obj/item/storage/backpack/satchel/trekker
+ suit_store = null
+ backpack_contents = list(
+ /obj/item/gun/ballistic/revolver/m29 = 1,
+ /obj/item/ammo_box/m44 = 1,
+ /obj/item/storage/bag/money/small/reno/cap/onezerozero = 1,
+ /obj/item/melee/classic_baton/militarypolice = 1,
+ /obj/item/clothing/head/f13/ncr/steelpot_mp
+ )
+
+/datum/outfit/job/citizens/f13provostmarshal/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ ..()
+ if(visualsOnly)
+ return
+ ADD_TRAIT(H, TRAIT_GENERIC, src)
+ ADD_TRAIT(H, TRAIT_SELF_AWARE, src)
+ ADD_TRAIT(H, TRAIT_HARD_YARDS, src)
+ ADD_TRAIT(H, TRAIT_LIFEGIVER, src)
+
+/*--------------------------------------------------------------*/
+
+/datum/job/citizens/f13militarypolice
+ title = "NCRA Military Police"
+ flag = F13MILITARYPOLICE
+ faction = FACTION_CITIZENS
+ total_positions = 3
+ spawn_positions = 3
+ description = "You are an MP of the Reno Embassy, either a wonderful or horrible assignment based on your disposition. You are to protect the embassy, ensure the security of the NCR citizens, and protect the ambassador at all costs. Preform humanitarian efforts and prevent any fights from happening between the gangs to prevent things from getting too heated."
+ supervisors = "Provost Marshall"
+ selection_color = "#c7b775"
+ outfit = /datum/outfit/job/citizens/f13militarypolice
+ access = list(ACCESS_NCR)
+
+/datum/outfit/job/citizens/f13militarypolice
+ name = "NCRA Military Police"
+ jobtype = /datum/job/citizens/f13militarypolice
+ id = /obj/item/card/id/dogtag/ncrsergeant
+ ears = /obj/item/radio/headset/headset_ncr
+ neck = null
+ accessory = /obj/item/clothing/accessory/armband/black
+ glasses = /obj/item/clothing/glasses/sunglasses/big
+ head = /obj/item/clothing/head/f13/ncr/steelpot_mp
+ suit = /obj/item/clothing/suit/armor/f13/ncrarmor/reno
+ gloves = /obj/item/clothing/gloves/f13/leather/fingerless
+ backpack = /obj/item/storage/backpack/satchel/trekker
+ suit_store = /obj/item/gun/ballistic/revolver/police
+ backpack = /obj/item/storage/backpack/trekker
+ satchel = /obj/item/storage/backpack/satchel/trekker
+ uniform = /obj/item/clothing/under/f13/ncr
+ belt = /obj/item/storage/belt/military/assault/ncr
+ shoes = /obj/item/clothing/shoes/f13/military/ncr
+ backpack_contents = list(
+ /obj/item/ammo_box/a357 = 1,
+ /obj/item/storage/bag/money/small/reno/cap/threezero =1,
+ /obj/item/melee/classic_baton/militarypolice = 1,
+ /obj/item/storage/survivalkit_aid = 1
+ )
+
+/datum/outfit/job/citizens/f13militarypolice/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+ if(visualsOnly)
+ return
+ ADD_TRAIT(H, TRAIT_IRONFIST, src)
+ ADD_TRAIT(H, TRAIT_HARD_YARDS, src)
+
+
diff --git a/code/modules/jobs/job_types/mordinos.dm b/code/modules/jobs/job_types/mordinos.dm
new file mode 100644
index 0000000000..c093cdef3b
--- /dev/null
+++ b/code/modules/jobs/job_types/mordinos.dm
@@ -0,0 +1,362 @@
+/datum/job/mordinos //do NOT use this for anything, it's just to store faction datums
+ department_flag = MORDINOS
+ selection_color = "#FF7566"
+ faction = FACTION_MORDINOS
+ exp_type = EXP_TYPE_MORDINOS
+ maptype = "reno"
+
+ access = list(ACCESS_MORDINOS)
+ minimal_access = list(ACCESS_MORDINOS)
+ forbids = "The Mordino family forbids: The Mordinos are picky when it comes to recruiting new enforcers; due to this policy, anyone not deemed strong enough will not make it into the family, so a strong willed personality is expected of the actual members (though not from the chemists and the casino workers). The family is also well known for their traditional understanding of gender roles, so women, although already rare in the family, will probably not make it past capos."
+ enforces = "The Mordino family demands: Honor is the main (and possibly the only) core tenet of the Mordino family; never allow anyone to put in doubt the honor of the family, not even a joke should be left without consequences. Wearing the family suit is required, unless acting as an infiltrator."
+ objectivesList = list("Focus on the mass production of chems.", "Focus on managing the Desperado casino", "Extort the small businesses of New Reno to get a cut from their profits, but be weary, the other families may want a cut from them too.")
+
+/*--------------------------------------------------------------*/
+
+/datum/job/mordinos/f13boss
+ title = "Mordinos Boss"
+ flag = F13MORDINOBOSS
+ department_flag = MORDINOS
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "Yourself"
+ description = "You are the head of the Mordino family. As such, you control most of the local production of chems as well as the ownership of one of the big casinos. Outside of the walls of the city, there lies the family stable, where the chems are produced; be certain that the needs of your chemists are met and make sure to stay in top of the chem business in New Reno. Keep an eye in the casino to ensure it's well managed and fulfilling all of it's needs (alcohol, payouts, and so on). Though risky, slavery and prostitution has been practiced by the Mordinos before, so it is an option to be considered. 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. 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 = "#FF4733"
+ exp_requirements = EXP_TYPE_MORDINOS
+
+ outfit = /datum/outfit/job/mordinos/f13boss
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/mordinos/f13boss
+ name = "Boss"
+ jobtype = /datum/job/mordinos/f13boss
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/mordinos/ring/boss
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ r_hand = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ //l_hand =
+ //l_pocket = /obj/item/storage/bag/money/small/ncr //placeholder
+ r_pocket = /obj/item/stock_parts/cell/ammo/ec
+ mask = /obj/item/clothing/mask/cigarette/cigar/ncr
+ head = /obj/item/clothing/head/helmet/f13/mordinos/fedora
+ neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ suit = /obj/item/clothing/suit/armor/f13/reno/bulletproof
+ uniform = /obj/item/clothing/under/f13/mordinos/boss
+ belt = /obj/item/gun/ballistic/revolver/m29
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/ammo_box/m44 = 1,
+ /obj/item/storage/bag/money/small/reno/cap/onefivezero = 1,
+ /obj/item/circular_saw = 1,
+ /obj/item/melee/onehanded/knife/switchblade = 1,
+ )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/mordinos/f13underboss
+ title = "Mordinos Underboss"
+ flag = F13MORDINOUNDERBOSS
+ department_flag = MORDINOS
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "Mordino Boss"
+ description = "You are the underboss of the Mordinos family. Your role may vary from a simple consigliere, to a diplomat with the other families, to assigning soldiers to the capos, or even as the chief supervisor of the family businesses; keep the dialogue with the boss constant and clear to know what he needs from you. In a world where treason is treated as common currency, a position such as a 'right hand man' for the boss is extremely valuable... nevertheless, should the boss be unable to lead the family, the job will fall unto you."
+ selection_color = "#FF4733"
+ exp_requirements = EXP_TYPE_MORDINOS
+
+ outfit = /datum/outfit/job/mordinos/f13underboss
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/mordinos/f13underboss
+ name = "Underboss"
+ jobtype = /datum/job/mordinos/f13underboss
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/mordinos/ring/officer
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+// r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/onezerozero //placeholder
+ r_pocket = /obj/item/ammo_box/m44
+ mask = /obj/item/clothing/mask/cigarette/cigar/ncr
+ head = /obj/item/clothing/head/helmet/f13/mordinos/fedora
+ neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ suit =/obj/item/clothing/suit/armor/f13/reno/bulletproof
+ uniform = /obj/item/clothing/under/suit/charcoal
+ belt = /obj/item/gun/ballistic/revolver/m29
+// backpack_contents = list(
+// /obj/item/ammo_box/m44 = 1,
+// /obj/item/storage/bag/money/small/ncr = 1,
+// )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/mordinos/f13capo
+ title = "Mordinos Capo"
+ flag = F13MORDINOCAPO
+ department_flag = MORDINOS
+ total_positions = 2
+ spawn_positions = 2
+ supervisors = "Mordino Underboss and the Mordino Boss"
+ description = "You have proven your worth as an earner for the Mordino Family and, as such, it has been trusted to you to lead a small band of soldiers for the boss. You are the mediator between the head of the family and said soldiers, 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 soldiers not be assigned to you by the Boss or the Underboss, the decision will fall unto you and the other capos. Follow the orders of your superiors, protect the family premises and distribute the fabricated chems on the streets of New Reno. Remember though: don't get high on your own supply."
+ selection_color = "#FF7566"
+ exp_requirements = EXP_TYPE_MORDINOS
+
+ outfit = /datum/outfit/job/mordinos/f13capo
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/mordinos/f13capo
+ name = "Capo"
+ jobtype = /datum/job/mordinos/f13capo
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/mordinos/ring/officer
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+// r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/sevenzero
+ r_pocket = /obj/item/ammo_box/c38
+ mask = /obj/item/clothing/mask/cigarette/cigar
+ head = /obj/item/clothing/head/helmet/f13/mordinos/fedora
+// neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/suit/charcoal
+ suit = /obj/item/clothing/suit/armor/f13/mordinos/grey_trench_coat
+ belt = /obj/item/gun/ballistic/revolver/detective
+// backpack_contents = list(
+// /obj/item/ammo_box/m44 = 1,
+// /obj/item/storage/bag/money/small/ncr = 1,
+// )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/mordinos/f13goon
+ title = "Mordinos Goon"
+ flag = F13MORDINOGOON
+ department_flag = MORDINOS
+ total_positions = 5
+ spawn_positions = 5
+ supervisors = "Mordino Capos, the Underboss, and the Mordino Boss"
+ description = "You have been made a soldier of the Mordino Family. Expect to be assigned to follow the orders of one of the Capos, be it pushing chems on the street, protecting the casino, delivering the family's goods to some other private entity, and so on. Do not disturb the boss or the underboss with unnecessary affairs. Do not allow anyone to question the honor of your family."
+ selection_color = "#FF7566"
+ exp_requirements = EXP_TYPE_MORDINOS
+
+ outfit = /datum/outfit/job/mordinos/f13goon
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/mordinos/f13goon
+ name = "Goon"
+ jobtype = /datum/job/mordinos/f13goon
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/mordinos/ring/soldier
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+// r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero
+ mask = /obj/item/clothing/mask/cigarette/bigboss
+ head = /obj/item/clothing/head/helmet/f13/mordinos/fedora
+// neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/mordinos/goon
+ suit = /obj/item/clothing/suit/armor/f13/reno/bulletproof/lite
+// belt = /obj/item/gun/ballistic/revolver/detective
+// backpack_contents = list(
+// /obj/item/ammo_box/m44 = 1,
+// /obj/item/storage/bag/money/small/ncr = 1,
+// )
+
+/datum/outfit/job/mordinos/f13goon/pre_equip(mob/living/carbon/human/H)
+ . = ..()
+ r_hand = pick(
+ /obj/item/melee/onehanded/knife/switchblade, \
+ /obj/item/melee/onehanded/club, \
+ /obj/item/gun/ballistic/automatic/hobo/zipgun, \
+ /obj/item/twohanded/sledgehammer/simple , \
+ /obj/item/kitchen/knife, \
+ /obj/item/twohanded/baseball)
+
+/*--------------------------------------------------------------*/
+
+/datum/job/mordinos/f13casinoworker
+ title = "Mordinos Casino Worker"
+ flag = F13MORDINOCASINOWORKER
+ department_flag = MORDINOS
+ total_positions = 2
+ spawn_positions = 2
+ supervisors = "Mordino Capos, the Underboss, and the Mordino Boss"
+ description = "You are an employee of the Desperado, the Mordinos owned casino in New Reno. Though you're not a proper member of the family, you count with their protection and you're also expected to fulfill their demands. Serve drinks to the costumers, deal the cards on the tables, change money for casino chips (and viceversa), and keep a constant dialogue with whoever is keeping the casino safe to kick out drunkards, cheaters, and the more dangerous folks that may come to pay a visit to the family."
+ selection_color = "#FF7566"
+ exp_requirements = EXP_TYPE_MORDINOS
+
+ outfit = /datum/outfit/job/mordinos/f13casinoworker
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/mordinos/f13casinoworker
+ name = "Casino Worker"
+ jobtype = /datum/job/mordinos/f13casinoworker
+
+ ears = /obj/item/radio/headset
+ backpack = /obj/item/storage/backpack/satchel/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ id = /obj/item/card/id/reno/mordinos/papers/worker
+ r_pocket = /obj/item/card/slotmachine
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/bartenderalt
+
+/*--------------------------------------------------------------*/
+
+/datum/job/mordinos/f13chemist
+ title = "Mordinos Chemist"
+ flag = F13MORDINOCHEMIST
+ department_flag = MORDINOS
+ total_positions = 2
+ spawn_positions = 2
+ supervisors = "Mordino Capos, the Underboss, and the Mordino Boss"
+ description = "You are a chemist for the Mordino family. Instead of working on the city itself, you have been assigned to the family stables, outside of the main walls, in the relative safety of the countryside. Though you are not a proper member of the family, you count with their protection and you're also expected to fulfill their demands. Keep up the expected production of chems, prepare medicine if needed, and be prepared to manage the actual cattle, should it be requested by a superior."
+ selection_color = "#FF7566"
+ exp_requirements = EXP_TYPE_MORDINOS
+
+ outfit = /datum/outfit/job/mordinos/f13chemist
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/mordinos/f13chemist
+ name = "Mordinos Chemist"
+ jobtype = /datum/job/mordinos/f13chemist
+
+ id = /obj/item/card/id/reno/mordinos/papers/chemist
+ belt = /obj/item/storage/belt/medical
+ shoes = /obj/item/clothing/shoes/laceup
+ ears = /obj/item/radio/headset
+ r_pocket = /obj/item/flashlight/seclite
+ uniform = /obj/item/clothing/under/suit/charcoal
+ suit = /obj/item/clothing/suit/toggle/labcoat/chemist
+ backpack = /obj/item/storage/backpack/medic
+ gloves = /obj/item/clothing/gloves/color/white
+ head = /obj/item/clothing/head/beret/durathread
+ mask = /obj/item/clothing/mask/bandana/durathread
+ backpack_contents = list(
+ /obj/item/reagent_containers/hypospray/medipen/stimpak=2, \
+ /obj/item/healthanalyzer=1, \
+ /obj/item/storage/bag/money/small/reno/cap/fourzero)
+
+/datum/outfit/job/mordinos/f13chemist/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ ..()
+ if(visualsOnly)
+ return
+ ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
+ ADD_TRAIT(H, TRAIT_CHEMWHIZ, src)
+ ADD_TRAIT(H, TRAIT_MEDICALEXPERT, src)
+ ADD_TRAIT(H, TRAIT_SURGERY_MID, src)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/jet)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/turbo)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/psycho)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/medx)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/buffout)
+ H.mind.teach_crafting_recipe(/datum/crafting_recipe/set_vrboard/den)
diff --git a/code/modules/jobs/job_types/salvatores.dm b/code/modules/jobs/job_types/salvatores.dm
new file mode 100644
index 0000000000..590485fb3c
--- /dev/null
+++ b/code/modules/jobs/job_types/salvatores.dm
@@ -0,0 +1,331 @@
+/datum/job/salvatores //do NOT use this for anything, it's just to store faction datums
+ department_flag = SALVATORES
+ selection_color = "#F3F3F3"
+ faction = FACTION_SALVATORES
+ exp_type = EXP_TYPE_SALVATORES
+ maptype = "reno"
+
+ access = list(ACCESS_SALVATORES)
+ minimal_access = list(ACCESS_SALVATORES)
+ forbids = "The Salvatore family forbids: Both the West Side Massacre and the old Salvatore glory fading with age have made the family grown reclusive and distant from the rest of the gangs of New Reno. It wasn't until the Enclave started providing laser guns to the family that they became relevant again, and by this point, they were already bitter schemers. Avoid talking about the family secrets to the outside world, be it their relation to the Enclave, or any schemes that the boss may be planning."
+ enforces = "The Salvatore family is not of many taboos and will consider most types of business a 'fair game', but due to the lack of proper numbers to confront the big families, subterfuge and scheming should be favored instead of direct confrontation. Dispose of anyone digging among the family affairs. Do not allow your family to be insulted."
+ objectivesList = list("Focus on the acquisition and selling of laser weaponry.", "Focus on managing the Salvatore's Bar", "Extort the small businesses of New Reno to get a cut from their profits, but be weary, the other families may want a cut from them too; 'Extend loans to the tourists and gamblers, break their legs when they're unwilling (or unable) to pay'.")
+
+/*--------------------------------------------------------------*/
+
+/datum/job/salvatores/f13don
+ title = "Salvatores Don"
+ flag = F13SALVATRESDON
+ department_flag = SALVATORES
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "Yourself"
+ description = "You are the head of the Salvatore family. Your family may be considered the weakest one in New Reno due the fact that you do not own any of the top casinos, nor do you have any important numbers among your ranks, nor do you produce any kind of substance. Nevertheless, the Salvatore family still stands, thanks to their anonymous benefactors, as the only entity in New Reno with access to laser weaponry to a fair price. Make sure the bar is well managed, sell the laser weaponry to the private entities of New Reno (or hoard it exclusively for your family), and do anything necessary to regain the influence your family once had in the city. Remember: quality is much more important than quantity."
+ selection_color = "#E1E1E1"
+ exp_requirements = EXP_TYPE_SALVATORES
+
+ outfit = /datum/outfit/job/salvatores/f13don
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/salvatores/f13don
+ name = "Don"
+ jobtype = /datum/job/salvatores/f13don
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/salvatores/ring/don
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ //r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/onefivezero
+ r_pocket = /obj/item/stock_parts/cell/ammo/ec
+ mask = /obj/item/clothing/mask/cigarette/pipe
+ head = /obj/item/clothing/head/helmet/f13/salvatores/fedora
+ neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ suit =/obj/item/clothing/suit/armor/f13/reno/bulletproof
+ uniform = /obj/item/clothing/under/f13/salvatores/don
+ belt = /obj/item/gun/energy/laser/pistol
+ //backpack_contents =
+
+/*--------------------------------------------------------------*/
+
+/datum/job/salvatores/f13underboss
+ title = "Salvatores Underboss"
+ flag = F13SALVATRESUNDERBOSS
+ department_flag = SALVATORES
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "The Don"
+ description = "You have proven your worth as an earner for the Salvatore Family and, as such, it has been trusted to you to lead a small band of soldiers for the boss. You are the mediator between the head of the family and said soldiers, 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 soldiers not be assigned to you by the Boss or the Underboss, the decision will fall unto you and the other capos. The Salvatore family does not have many taboos regarding what kind of businesses they involve themselves into, so focus on following the orders of your superiors and protecting the family premises. Keep the affairs of the family as a secret, by any means necessary"
+ selection_color = "E1E1E1"
+ exp_requirements = EXP_TYPE_SALVATORES
+
+ outfit = /datum/outfit/job/salvatores/f13underboss
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/salvatores/f13underboss
+ name = "Underboss"
+ jobtype = /datum/job/salvatores/f13underboss
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/salvatores/ring/officer
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ //r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/onezerozero
+ r_pocket = /obj/item/stock_parts/cell/ammo/ec
+ mask = /obj/item/clothing/mask/cigarette/cigar
+ head = /obj/item/clothing/head/helmet/f13/salvatores/fedora
+ neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ suit =/obj/item/clothing/suit/armor/f13/reno/bulletproof
+ uniform = /obj/item/clothing/under/f13/salvatores/officer
+ belt = /obj/item/gun/energy/laser/wattz/magneto
+ //backpack_contents =
+
+/*--------------------------------------------------------------*/
+
+/datum/job/salvatores/f13capo
+ title = "Salvatores Capo"
+ flag = F13SALVATRESCAPO
+ department_flag = SALVATORES
+ total_positions = 2
+ spawn_positions = 2
+ supervisors = "The Underboss and the Don"
+ description = "You have proven your worth as an earner for the Salvatore Family and, as such, it has been trusted to you to lead a small band of soldiers for the boss. You are the mediator between the head of the family and said soldiers, 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 soldiers not be assigned to you by the Boss or the Underboss, the decision will fall unto you and the other capos. The Salvatore family does not have many taboos regarding what kind of businesses they involve themselves into, so focus on following the orders of your superiors and protecting the family premises. Keep the affairs of the family as a secret, by any means necessary."
+ selection_color = "#F2F2F2"
+ exp_requirements = EXP_TYPE_SALVATORES
+
+ outfit = /datum/outfit/job/salvatores/f13capo
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/salvatores/f13capo
+ name = "Capo"
+ jobtype = /datum/job/salvatores/f13capo
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/salvatores/ring/officer
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+ //r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/sevenzero
+ r_pocket = null
+ mask = /obj/item/clothing/mask/cigarette/cigar
+ head = /obj/item/clothing/head/helmet/f13/salvatores/fedora
+ neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/salvatores/officer
+ suit = /obj/item/clothing/suit/armor/f13/salvatores/white_coat
+ belt = /obj/item/gun/energy/laser/wattz/magneto
+ //backpack_contents =
+
+/*--------------------------------------------------------------*/
+
+/datum/job/salvatores/f13soldier
+ title = "Salvatores Soldier"
+ flag = F13SALVATRESSOLDIER
+ department_flag = SALVATORES
+ total_positions = 5
+ spawn_positions = 5
+ supervisors = "Your capo, the underboss, and the Don"
+ description = "You have been made a soldier of the Salvatore Family. Expect to be assigned to follow the orders of one of the Capos, be it selling laser guns, extorting businesses, protecting the bar, delivering the family's goods to some private entity, working on discrete sabotage missions, and so on. Do not disturb the boss or the underboss with unnecessary affairs. Do not mention the affairs of the family to any outsider."
+ selection_color = "#F2F2F2"
+ exp_requirements = EXP_TYPE_SALVATORES
+
+ outfit = /datum/outfit/job/salvatores/f13soldier
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/salvatores/f13soldier
+ name = "Soldier"
+ jobtype = /datum/job/salvatores/f13soldier
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/salvatores/ring/soldier
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+ //r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero
+ r_pocket = /obj/item/stock_parts/cell/ammo/ec
+ //mask = /obj/item/clothing/mask/cigarette/cigar
+ head = /obj/item/clothing/head/helmet/f13/salvatores/fedora
+ //neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/salvatores/soldier
+ suit = /obj/item/clothing/suit/armor/f13/reno/bulletproof/lite
+ belt = null
+ //backpack_contents =
+
+/datum/outfit/job/salvatores/f13soldier/pre_equip(mob/living/carbon/human/H)
+ . = ..()
+ r_hand = pick(
+ /obj/item/melee/onehanded/knife/switchblade, \
+ /obj/item/melee/onehanded/club, \
+ /obj/item/gun/ballistic/automatic/hobo/zipgun, \
+ /obj/item/twohanded/sledgehammer/simple , \
+ /obj/item/kitchen/knife, \
+ /obj/item/twohanded/baseball)
+
+/*--------------------------------------------------------------*/
+
+/datum/job/salvatores/f13bartender
+ title = "Salvatores Bartender"
+ flag = F13SALVATRESBARTENDER
+ department_flag = SALVATORES
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "the capos, the underboss, and the Don"
+ description = "You are the sole employee of the old Salvatore's bar. Though you're not a proper member of the family, you count with their protection and you're also expected to fulfill their demands. Serve drinks and food to the costumers and the family members, make sure the the place stays clean, and keep a constant dialogue with whoever is keeping the bar safe to kick drunkards, bums, or the more dangerous folks that may come pay a visit to the family."
+ selection_color = "#F2F2F2"
+ exp_requirements = EXP_TYPE_SALVATORES
+
+ outfit = /datum/outfit/job/salvatores/f13chef
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/chef,
+ /datum/outfit/loadout/bartender,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/salvatores/f13chef
+ name = "Chef"
+ jobtype = /datum/job/salvatores/f13bartender
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/salvatores/papers/worker
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+ r_hand = /obj/item/book/manual/chef_recipes
+ l_hand = /obj/item/storage/box/ingredients/italian
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero
+ r_pocket = /obj/item/stock_parts/cell/ammo/ec
+ mask = /obj/item/clothing/mask/fakemoustache/italian
+ head = /obj/item/clothing/head/chefhat
+ //neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/rank/chef
+ suit = /obj/item/clothing/suit/toggle/chef
+ belt = null
+ //backpack_contents =
+
+/*--------------------------------------------------------------*/
+
+/datum/job/salvatores/f13roboticist
+ title = "Salvatores Roboticist"
+ flag = F13SALVATRESROBOTICIST
+ department_flag = SALVATORES
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "the underboss, and the Don"
+ description = "You are a contractor from Vault City employed by the Salvatores to maintain certain technologies given to them by a third party."
+ selection_color = "#F2F2F2"
+ exp_requirements = EXP_TYPE_SALVATORES
+
+ outfit = /datum/outfit/job/salvatores/f13roboticist
+
+/datum/outfit/job/salvatores/f13roboticist
+ name = "Roboticist"
+ jobtype = /datum/job/salvatores/f13roboticist
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/salvatores/papers/worker
+ belt = /obj/item/storage/belt/utility/full
+ uniform = /obj/item/clothing/under/f13/vault/vcity
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit = /obj/item/clothing/suit/toggle/labcoat/f13
+ glasses = /obj/item/clothing/glasses/hud/health
+ backpack_contents = list(
+ /obj/item/gun/energy/laser/wattz/magneto = 1,
+ /obj/item/pda = 1,
+ /obj/item/storage/bag/money/small/reno/cap/fivezero = 1)
+
+/datum/outfit/job/salvatores/f13roboticist/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ ..()
+ if(visualsOnly)
+ return
+ ADD_TRAIT(H, TRAIT_TECHNOPHREAK, src)
+ ADD_TRAIT(H, TRAIT_MEDICALEXPERT, src)
+ ADD_TRAIT(H, TRAIT_SURGERY_MID, src)
diff --git a/code/modules/jobs/job_types/tribals.dm b/code/modules/jobs/job_types/tribals.dm
index e447e029dc..542e66bb02 100644
--- a/code/modules/jobs/job_types/tribals.dm
+++ b/code/modules/jobs/job_types/tribals.dm
@@ -5,6 +5,7 @@
forbids = "The use of pre-collapse technology, especially pre-collapse weapons of war."
enforces = "The tribe operate as if they are a part of a singular clan. Any harm dealt upon another member is likened to harm placed upon your brother or sister. Above all things, the tribe comes first."
objectivesList = list("Leadership recommends the following goal for this week: Recruit worthy outlanders into the tribe","Leadership recommends the following goal for this week: Hunt dangerous creatures to improve the clan's standing", "Leadership recommends the following goal for this week: Preserve dangerous technology to prevent it from falling into the wrong hands.")
+ maptype = "yuma"
/datum/outfit/job/tribal/
name = "TRIBALdatums"
diff --git a/code/modules/jobs/job_types/vault.dm b/code/modules/jobs/job_types/vault.dm
index af5aa8c7c6..b4004d3ba9 100644
--- a/code/modules/jobs/job_types/vault.dm
+++ b/code/modules/jobs/job_types/vault.dm
@@ -43,6 +43,7 @@ Overseer
selection_color = "#95bd95"
req_admin_notify = 1
exp_requirements = 1500
+ maptype = "yuma"
outfit = /datum/outfit/job/vault/f13overseer
diff --git a/code/modules/jobs/job_types/wasteland.dm b/code/modules/jobs/job_types/wasteland.dm
index c37f20c2e6..472e4d5155 100644
--- a/code/modules/jobs/job_types/wasteland.dm
+++ b/code/modules/jobs/job_types/wasteland.dm
@@ -1,5 +1,6 @@
/datum/job/wasteland
department_flag = WASTELAND
+ maptype = "yuma"
////////////////
// GREAT KHAN //
@@ -18,7 +19,7 @@
selection_color = "#ff915e"
exp_requirements = 1000
exp_type = EXP_TYPE_FALLOUT
- maptype = "yuma" //Hopefully this makes Khans not selectable outside of Yuma
+ maptype = "khan"
outfit = /datum/outfit/job/wasteland/f13pusher
diff --git a/code/modules/jobs/job_types/wrights.dm b/code/modules/jobs/job_types/wrights.dm
new file mode 100644
index 0000000000..fe3910fba8
--- /dev/null
+++ b/code/modules/jobs/job_types/wrights.dm
@@ -0,0 +1,252 @@
+/datum/job/wrights //do NOT use this for anything, it's just to store faction datums
+ department_flag = WRIGHTS
+ selection_color = "#B3875E"
+ faction = FACTION_WRIGHTS
+ exp_type = EXP_TYPE_WRIGHTS
+ maptype = "reno"
+
+ access = list(ACCESS_WRIGHTS)
+ minimal_access = list(ACCESS_WRIGHTS)
+ forbids = "The Wright family forbids: Due to the relations of the family with the Temperance Faction of New Reno, gambling, prostitution, and drugs are forbidden. Also, due to the close blood ties among the members of the families, ghouls are not allowed."
+ enforces = "The Wright family demands: The Wrights are the only Reno family that are a literal family, so it is expected of all of its members to have blood ties to the family. Due to this, extreme loyalty and obedience to a strong chain of command are also expected of its members. Wearing the family suit is required, unless acting as an infiltrator."
+ objectivesList = list ("Focus on the mass production of cheap guns.", "Focus on the mass production of alcohol to provide to the other families and the people of New Reno.", "Extort the small businesses of New Reno to get a cut from their profits, but be weary, the other families may want a cut from them too.")
+/*--------------------------------------------------------------*/
+
+/datum/job/wrights/f13boss
+ title = "Wrights Boss"
+ flag = F13WRIGHTSBOSS
+ department_flag = WRIGHTS
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "yourself"
+ 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/f13boss
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/wrights/f13boss
+ name = "Boss"
+ jobtype = /datum/job/wrights/f13boss
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/wrights/ring/boss
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ r_hand = /obj/item/gun/ballistic/revolver/caravan_shotgun
+ r_pocket = /obj/item/stock_parts/cell/ammo/ec
+ mask = /obj/item/clothing/mask/cigarette/pipe
+ head = /obj/item/clothing/head/helmet/f13/wrights/tophat
+ neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ suit =/obj/item/clothing/suit/armor/f13/reno/bulletproof
+ uniform = /obj/item/clothing/under/f13/wrights/boss
+ belt = /obj/item/gun/ballistic/revolver/m29
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/buck = 1,
+ /obj/item/ammo_box/m44 = 1,
+ /obj/item/storage/bag/money/small/reno/cap/onefivezero = 1,
+ /obj/item/circular_saw = 1,
+ /obj/item/melee/onehanded/knife/switchblade = 1,
+ /obj/item/reagent_containers/food/snacks/grown/tobacco/dried = 2,
+ )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/wrights/f13underboss
+ title = "Wrights Underboss"
+ flag = F13WRIGHTSUNDERBOSS
+ department_flag = WRIGHTS
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "Wright Boss"
+ description = "You are one of the most trusted members of the family and, as such, you have been assigned to answer directly to the Boss himself. Your role may vary from a simple consigliere, to a diplomat with the other families, to assigning soldiers to the capos, or even as the chief supervisor of the family businesses; keep the dialogue with the boss constant and clear to know what he needs from you. Assert the core tenets of the Wright family to your subordinates by making them avoid drugs and prostitution, and enforce loyalty as well among the ranks. Remember that you are also bound by these tenets; treason against the boss is out of the question. Should the boss be unable to lead the family, the job will fall unto you."
+ selection_color = "#A27954"
+ exp_requirements = EXP_TYPE_MORDINOS
+
+ outfit = /datum/outfit/job/wrights/f13underboss
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/wrights/f13underboss
+ name = "Underboss"
+ jobtype = /datum/job/wrights/f13underboss
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/wrights/ring/officer
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+// r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/onezerozero
+ r_pocket = /obj/item/ammo_box/m44
+ //mask =
+ head = /obj/item/clothing/head/helmet/f13/wrights/tophat
+ neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ suit =/obj/item/clothing/suit/armor/f13/reno/bulletproof
+ uniform = /obj/item/clothing/under/f13/wrights/officer
+ belt = /obj/item/gun/ballistic/revolver/m29
+ backpack_contents = list(
+ /obj/item/melee/onehanded/knife/switchblade = 1,
+ )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/wrights/f13capo
+ title = "Wrights Capo"
+ flag = F13WRIGHTSCAPO
+ department_flag = WRIGHTS
+ total_positions = 2
+ spawn_positions = 2
+ supervisors = "Wright Underboss and the Wright Boss"
+ description = "You have proven your worth as an earner for the Wright Family and, as such, it has been trusted to you to lead a small band of soldiers for the boss. You are the mediator between the head of the family and said soldiers, 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 soldiers not be assigned to you by the Boss or the Underboss, the decision will fall unto you and the other capos. Assert the core tenets of the Wright family to your subordinates by making them avoid drugs and prostitution, and enforce loyalty as well among the ranks. Remember that you are also bound by these tenets; treason against your superiors is out of the question. Follow the orders of your superiors, protect the family premises and help produce and distribute the fabricated alcohol on the streets of New Reno."
+ selection_color = "#B3875E"
+ exp_requirements = EXP_TYPE_WRIGHTS
+
+ outfit = /datum/outfit/job/wrights/f13capo
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/wrights/f13capo
+ name = "Capo"
+ jobtype = /datum/job/wrights/f13capo
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/wrights/ring/officer
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+ r_hand = /obj/item/gun/ballistic/revolver/detective
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/sevenzero
+ r_pocket = /obj/item/ammo_box/a556/sport/improvised
+ mask = /obj/item/clothing/mask/cigarette/cigar
+ head =/obj/item/clothing/head/helmet/f13/wrights/tophat
+// neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/wrights/soldier
+ suit = /obj/item/clothing/suit/armor/f13/wrights/armored_vest
+ suit_store = /obj/item/gun/ballistic/revolver/hobo/piperifle
+ belt = null
+// backpack_contents = list(
+// /obj/item/ammo_box/m44 = 1,
+// /obj/item/storage/bag/money/small/ncr = 1,
+// )
+
+/*--------------------------------------------------------------*/
+
+/datum/job/wrights/f13soldier
+ title = "Wrights Soldier"
+ flag = F13WRIGHTSSOLDIER
+ department_flag = WRIGHTS
+ total_positions = 6
+ spawn_positions = 6
+ supervisors = "Wright Capos, the Underboss, and the Wright Boss"
+ description = "You have been made a soldier of the Wright Family. Expect to be assigned to follow the orders of one of the Capos. Do not disturb the boss or the underboss with unnecessary affairs. Remember to follow the core tenets of the Wright family by avoiding drugs and prostitution, and keeping yourself loyal to your superiors whatever the cost."
+ selection_color = "#B3875E"
+ exp_requirements = EXP_TYPE_WRIGHTS
+
+ outfit = /datum/outfit/job/wrights/f13soldier
+/*
+ loadout_options = list(
+ /datum/outfit/loadout/pr,
+ /datum/outfit/loadout/pw,
+ )
+
+ access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_CLINIC, ACCESS_KITCHEN, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ minimal_access = list(ACCESS_BAR, ACCESS_CARGO_BOT, ACCESS_MINT_VAULT, ACCESS_KITCHEN, ACCESS_CLINIC, ACCESS_MINING, ACCESS_FORENSICS_LOCKERS)
+ matchmaking_allowed = list(
+ /datum/matchmaking_pref/friend = list(
+ /datum/job/oasis,
+ ),
+ /datum/matchmaking_pref/rival = list(
+ /datum/job/oasis,
+ ),
+ )
+*/
+/datum/outfit/job/wrights/f13soldier
+ name = "Soldier"
+ jobtype = /datum/job/wrights/f13soldier
+
+ ears = /obj/item/radio/headset
+ id = /obj/item/card/id/reno/wrights/ring/soldier
+ //glasses =
+ //gloves =
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+// r_hand =
+ //l_hand =
+ l_pocket = /obj/item/storage/bag/money/small/reno/cap/fivezero
+ //r_pocket =
+// mask = /obj/item/clothing/mask/cigarette/cigar
+ head = /obj/item/clothing/head/bowler
+// neck = /obj/item/storage/belt/holster/legholster
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/f13/wrights/soldier
+ suit = /obj/item/clothing/suit/armor/f13/reno/bulletproof/lite
+// belt = /obj/item/gun/ballistic/revolver/detective
+// backpack_contents = list(
+// /obj/item/ammo_box/m44 = 1,
+// /obj/item/storage/bag/money/small/ncr = 1,
+// )
+
+/datum/outfit/job/wrights/f13soldier/pre_equip(mob/living/carbon/human/H)
+ . = ..()
+ r_hand = pick(
+ /obj/item/melee/onehanded/knife/switchblade, \
+ /obj/item/melee/onehanded/club, \
+ /obj/item/gun/ballistic/automatic/hobo/zipgun, \
+ /obj/item/twohanded/sledgehammer/simple, \
+ /obj/item/kitchen/knife, \
+ /obj/item/twohanded/baseball)
+
diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index 30e4cf13a8..263ac6ed9d 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -280,6 +280,60 @@ GLOBAL_LIST_INIT(followers_positions, list(
"Followers Scientist",
))
+GLOBAL_LIST_INIT(salvatores_positions, list(
+ "Salvatores Don",
+ "Salvatores Underboss",
+ "Salvatores Capo",
+ "Salvatores Soldier",
+ "Salvatores Bartender",
+ "Salvatores Roboticist",
+))
+
+GLOBAL_LIST_INIT(mordinos_positions, list(
+ "Mordinos Boss",
+ "Mordinos Underboss",
+ "Mordinos Capo",
+ "Mordinos Goon",
+ "Mordinos Casino Worker",
+ "Mordinos Chemist",
+))
+
+GLOBAL_LIST_INIT(bishops_positions, list(
+ "Bishops Boss",
+ "Bishops Underboss",
+ "Bishops Capo",
+ "Bishops Soldier",
+ "Bishops Casino Worker",
+ "Bishops Comedian",
+))
+
+GLOBAL_LIST_INIT(wrights_positions, list(
+ "Wrights Boss",
+ "Wrights Underboss",
+ "Wrights Capo",
+ "Wrights Soldier",
+))
+
+GLOBAL_LIST_INIT(citizens_positions, list(
+ "Hotel Owner",
+ "Hotel Concierges",
+ "Pharmacist",
+ "Arms Dealer",
+ "Jungle Gym Owner",
+ "Reno Doctor",
+ "Bum",
+ "Mercenary",
+ "Priest",
+ "Yakuza",
+ "Peasant",
+ "Raider",
+ "Tourist",
+ "Brahmin Baron",
+ "NCR Ambassador",
+ "NCRA Provost Marshal",
+ "NCRA Military Police",
+))
+
// job categories for rendering the late join menu
GLOBAL_LIST_INIT(position_categories, list(
EXP_TYPE_NCR = list("jobs" = ncr_positions, "color" = "#ffeeaa"),
@@ -291,6 +345,11 @@ GLOBAL_LIST_INIT(position_categories, list(
EXP_TYPE_OASIS = list("jobs" = oasis_positions, "color" = "#d7b088"),
EXP_TYPE_TRIBAL = list("jobs" = tribal_positions, "color" = "#006666"),
EXP_TYPE_VAULT = list("jobs" = vault_positions, "color" = "#ccffcc"),
+ EXP_TYPE_SALVATORES = list("jobs" = salvatores_positions, "color" = "#ffeeaa"),
+ EXP_TYPE_MORDINOS = list("jobs" = mordinos_positions, "color" = "#D50000"),
+ EXP_TYPE_BISHOPS = list("jobs" = bishops_positions, "color" = "#8CA2BD"),
+ EXP_TYPE_WRIGHTS = list("jobs" = wrights_positions, "color" = "#B3875E"),
+ EXP_TYPE_CITIZENS = list("jobs" = citizens_positions, "color" = "#F7EFCF"),
))
GLOBAL_LIST_INIT(exp_jobsmap, list(
@@ -304,7 +363,7 @@ GLOBAL_LIST_INIT(exp_jobsmap, list(
EXP_TYPE_SILICON = list("titles" = list("AI","Cyborg")),
EXP_TYPE_SERVICE = list("titles" = civilian_positions),
- EXP_TYPE_FALLOUT = list("titles" = brotherhood_positions | oasis_positions | legion_positions | ncr_positions | vault_positions | wasteland_positions | tribal_positions | followers_positions | enclave_positions),
+ EXP_TYPE_FALLOUT = list("titles" = brotherhood_positions | oasis_positions | legion_positions | ncr_positions | vault_positions | wasteland_positions | tribal_positions | followers_positions | enclave_positions | salvatores_positions | mordinos_positions | bishops_positions | wrights_positions | citizens_positions),
EXP_TYPE_OUTLAW = list("titles" = list("Outlaw","Den Mob Boss","Den Mob Enforcer","Den Doctor",)),
EXP_TYPE_BROTHERHOOD = list("titles" = brotherhood_positions),
@@ -319,6 +378,11 @@ GLOBAL_LIST_INIT(exp_jobsmap, list(
EXP_TYPE_RANGER = list("titles" = list("NCR Veteran Ranger","NCR Ranger")),
EXP_TYPE_SCRIBE = list("titles" = list("Scribe")),
EXP_TYPE_DECANUS = list("titles" = list("Legion Decanus")),
+ EXP_TYPE_SALVATORES = list("titles" = salvatores_positions),
+ EXP_TYPE_MORDINOS = list("titles" = mordinos_positions),
+ EXP_TYPE_BISHOPS = list("titles" = bishops_positions),
+ EXP_TYPE_WRIGHTS = list("titles" = wrights_positions),
+ EXP_TYPE_CITIZENS = list("titles" = citizens_positions),
EXP_TYPE_TRIBALCOMMAND = list("titles" = list("Chief","Shaman","Head Hunter")),
EXP_TYPE_FOLLOWERSCOMMAND = list("titles" = list("Followers Administrator")),
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index 2a938791b2..0a23031492 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -127,3 +127,82 @@
new /obj/item/stack/f13Cash/random/high(src)
//mob boss, reasonably wealthy
+////////
+//Reno//
+////////
+
+/obj/item/storage/bag/money/small/reno/threezerozero/PopulateContents()
+ // ~300 worth of assorted money
+ new /obj/item/stack/f13Cash/ncr/onefivezero(src)
+ new /obj/item/stack/f13Cash/ncr/onefivezero(src)
+
+/obj/item/storage/bag/money/small/reno/onefivezero/PopulateContents()
+ // ~150 worth of assorted money
+ new /obj/item/stack/f13Cash/ncr/onefivezero(src)
+
+/obj/item/storage/bag/money/small/reno/onezerozero/PopulateContents()
+ // ~100 worth of assorted money
+ new /obj/item/stack/f13Cash/ncr/onezerozero(src)
+
+/obj/item/storage/bag/money/small/reno/sevenzero/PopulateContents()
+ // ~70 worth of assorted money
+ new /obj/item/stack/f13Cash/ncr/sevenzero(src)
+
+/obj/item/storage/bag/money/small/reno/fivezero/PopulateContents()
+ // ~50 worth of assorted money
+ new /obj/item/stack/f13Cash/ncr/fivezero(src)
+
+/obj/item/storage/bag/money/small/reno/fourzero/PopulateContents()
+ // ~40 worth of assorted money
+ new /obj/item/stack/f13Cash/ncr/fourzero(src)
+
+/obj/item/storage/bag/money/small/reno/threezero/PopulateContents()
+ // ~30 worth of assorted money
+ new /obj/item/stack/f13Cash/ncr/threezero(src)
+
+/obj/item/storage/bag/money/small/reno/onezero/PopulateContents()
+ // ~10 worth of assorted money
+ new /obj/item/stack/f13Cash/ncr/onezero(src)
+
+
+//Reno Cap Placeholders
+
+/obj/item/storage/bag/money/small/reno/cap/sixzerozero/PopulateContents()
+ // ~600 worth of assorted money
+ new /obj/item/stack/f13Cash/caps/onefivezero(src)
+ new /obj/item/stack/f13Cash/caps/onefivezero(src)
+ new /obj/item/stack/f13Cash/caps/onefivezero(src)
+ new /obj/item/stack/f13Cash/caps/onefivezero(src)
+
+/obj/item/storage/bag/money/small/reno/cap/threezerozero/PopulateContents()
+ // ~300 worth of assorted money
+ new /obj/item/stack/f13Cash/caps/onefivezero(src)
+ new /obj/item/stack/f13Cash/caps/onefivezero(src)
+
+/obj/item/storage/bag/money/small/reno/cap/onefivezero/PopulateContents()
+ // ~150 worth of assorted money
+ new /obj/item/stack/f13Cash/caps/onefivezero(src)
+
+/obj/item/storage/bag/money/small/reno/cap/onezerozero/PopulateContents()
+ // ~100 worth of assorted money
+ new /obj/item/stack/f13Cash/caps/onezerozero(src)
+
+/obj/item/storage/bag/money/small/reno/cap/sevenzero/PopulateContents()
+ // ~70 worth of assorted money
+ new /obj/item/stack/f13Cash/caps/sevenzero(src)
+
+/obj/item/storage/bag/money/small/reno/cap/fivezero/PopulateContents()
+ // ~50 worth of assorted money
+ new /obj/item/stack/f13Cash/caps/fivezero(src)
+
+/obj/item/storage/bag/money/small/reno/cap/fourzero/PopulateContents()
+ // ~40 worth of assorted money
+ new /obj/item/stack/f13Cash/caps/fourzero(src)
+
+/obj/item/storage/bag/money/small/reno/cap/threezero/PopulateContents()
+ // ~30 worth of assorted money
+ new /obj/item/stack/f13Cash/caps/threezero(src)
+
+/obj/item/storage/bag/money/small/reno/cap/onezero/PopulateContents()
+ // ~10 worth of assorted money
+ new /obj/item/stack/f13Cash/caps/onezero(src)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index e2f5026b45..4bc15aeea2 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -554,9 +554,15 @@
dat += "
"
var/column_counter = 0
// render each category's available jobs
+ var/list/mapjobs = GLOB.position_categories
+ if (SSmaptype.maptype == "reno")
+ mapjobs = list("Salvatores", "Wrights", "Mordinos", "Bishops", "Citizens")
- for(var/category in GLOB.position_categories)
+ if (SSmaptype.maptype == "sunnyvale")
+ mapjobs = list("Vault", "Followers", "NCR", "Legion", "Town", "Enclave", "Wasteland")
+
+ for(var/category in mapjobs)
// position_categories contains category names mapped to available jobs and an appropriate color
var/cat_color = GLOB.position_categories[category]["color"]
dat += "