Skip to content

One Major Faction maps : Pahrump and Yuma #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DeltaDav wants to merge 1 commit into from
Closed

One Major Faction maps : Pahrump and Yuma #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,421 changes: 1,873 additions & 1,548 deletions _maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm
View file
Open in desktop

Large diffs are not rendered by default.

5,433 changes: 3,159 additions & 2,274 deletions _maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm
View file
Open in desktop

Large diffs are not rendered by default.

7,960 changes: 4,555 additions & 3,405 deletions _maps/map_files/Pahrump-AB/Pahrump-AB.dmm
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions _maps/map_files/Pahrump-AB/job_changes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ MAP_REMOVE_JOB(f13baltimorepilot)
MAP_REMOVE_JOB(f13minutemen)
MAP_REMOVE_JOB(enclave)
MAP_REMOVE_JOB(khan)
MAP_REMOVE_JOB(holiday)
1 change: 1 addition & 0 deletions _maps/map_files/Tipton/job_changes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ MAP_REMOVE_JOB(f13minutemen)
MAP_REMOVE_JOB(enclave)
MAP_REMOVE_JOB(smutant_boss)
MAP_REMOVE_JOB(smutant)
MAP_REMOVE_JOB(eastwood)
30 changes: 30 additions & 0 deletions code/__DEFINES/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,22 @@
#define F13BALTIMOREPILOT (1<<12)
#define F13BALTIMORERADIOHOST (1<<13)

#define DEP_HOLIDAY (1<<6)

#define F13HOLIDAYSHERIFF (1<<0)
#define F13HOLIDAYDENDOC (1<<1)
#define F13HOLIDAYSETTLER (1<<2)
#define F13HOLIDAYFARMER (1<<3)
#define F13HOLIDAYPROSPECTOR (1<<4)
#define F13HOLIDAYDEPUTY (1<<5)
#define F13HOLIDAYMAYOR (1<<6)
#define F13HOLIDAYSECRETARY (1<<7)
#define F13HOLIDAYPREACHER (1<<8)
#define F13HOLIDAYSHOPKEEPER (1<<9)
#define F13HOLIDAYQUARTERMASTER (1<<10)
#define F13HOLIDAYBARKEEP (1<<11)
#define F13HOLIDAYRADIOHOST (1<<12)

#define JOB_AVAILABLE 0
#define JOB_UNAVAILABLE_GENERIC 1
#define JOB_UNAVAILABLE_BANNED 2
Expand Down Expand Up @@ -429,4 +445,18 @@

#define JOB_DISPLAY_ORDER_F13MINUTEMEN 154

#define JOB_DISPLAY_ORDER_F13HOLIDAYSHERIFF 155
#define JOB_DISPLAY_ORDER_F13HOLIDAYDENDOC 156
#define JOB_DISPLAY_ORDER_F13HOLIDAYSETTLER 157
#define JOB_DISPLAY_ORDER_F13HOLIDAYFARMER 158
#define JOB_DISPLAY_ORDER_F13HOLIDAYPROSPECTOR 159
#define JOB_DISPLAY_ORDER_F13HOLIDAYDEPUTY 160
#define JOB_DISPLAY_ORDER_F13HOLIDAYMAYOR 161
#define JOB_DISPLAY_ORDER_F13HOLIDAYSECRETARY 162
#define JOB_DISPLAY_ORDER_F13HOLIDAYPREACHER 163
#define JOB_DISPLAY_ORDER_F13HOLIDAYSHOPKEEPER 164
#define JOB_DISPLAY_ORDER_F13HOLIDAYQUARTERMASTER 165
#define JOB_DISPLAY_ORDER_F13HOLIDAYBARKEEP 166
#define JOB_DISPLAY_ORDER_F13HOLIDAYRADIOHOST 167

GLOBAL_LIST_INIT(faction_list, list(FACTION_NCR, FACTION_LEGION, FACTION_BROTHERHOOD, FACTION_EASTWOOD, FACTION_ENCLAVE, FACTION_WASTELAND, FACTION_RAIDERS, FACTION_SMUTANT, FACTION_ATLANTIC, FACTION_LOCUST))
46 changes: 46 additions & 0 deletions code/game/objects/effects/landmarks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,3 +1032,49 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer
icon_state = "Banker"


// Holiday

/obj/effect/landmark/start/f13/f13holidayf13holidaymayor
name = "Mayor"
icon_state = "Banker"

/obj/effect/landmark/start/f13/f13holidaysecretary
name = "Secretary"
icon_state = "Lawyer"

/obj/effect/landmark/start/f13/f13holidaysheriff
name = "Sheriff"
icon_state = "Chief of Police"

/obj/effect/landmark/start/f13/f13holidaydeputy
name = "Deputy"
icon_state = "Officer"

/obj/effect/landmark/start/f13/f13holidayfarmer
name = "Farmer"

/obj/effect/landmark/start/f13/f13holidayprospector
name = "Prospector"

/obj/effect/landmark/start/f13/f13holidaysettler
name = "Citizen"
icon_state = "Settler"

/obj/effect/landmark/start/f13/f13holidayradio_host
name = "Radio Host"
icon_state = "Radio-Host"

/obj/effect/landmark/start/f13/f13holidaydendoc
name = "Doctor"

/obj/effect/landmark/start/f13/f13holidayquartermaster
name = "Quartermaster"
icon_state = "Shopkeeper"

/obj/effect/landmark/start/f13/f13holidayshopkeeper
name = "Shopkeeper"
icon_state = "Shopkeeper"

/obj/effect/landmark/start/f13/f13holidaybarkeep
name = "Barkeep"
icon_state = "Barkeep"
80 changes: 57 additions & 23 deletions code/modules/jobs/job_types/eastwood.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ Mayor
total_positions = 1
spawn_positions = 1
supervisors = "Eastwood"
description = "You are the civil leader of the Town of Eastwood. You were chosen by the people to represent and lead them from your manor. Your town is in a terse situation with the slaver town to the south, Redwater. While not at war, you will have to work to keep your people safe from their predations. The Tribals to the south east are also a nuisance but it's best not to provoke them needlessly. Do what's best for the town, and it's people. All while lining your pockets occasionally, of course."
enforces = "The Secretary is your stand-in replacement, and under this the Sheriff."
description = "You are the civil leader of the Town of Eastwood, but with the NCR being in control of taxes, and armed forces.\
You were chosen by the people to represent and lead them, and defend their interess. You co-write the laws with the NCR Officials.\
You are in a pickle, since the town is under the NCR, and you must cooperate (or not) with them."
enforces = "The Civilian gouvernement is made of yourself on top of the ladder, with NCR officers. Under you is the secretary, and under them is the Sheriff. The priest is often viewed as the forth head of town."
selection_color = "#d7b088"

exp_requirements = 600
Expand All @@ -71,7 +73,8 @@ Mayor
/datum/outfit/loadout/highroller,
/datum/outfit/loadout/clinicdirector,
/datum/outfit/loadout/richman,
/datum/outfit/loadout/eastchief
/datum/outfit/loadout/eastchief,
/datum/outfit/loadout/ncrally,
)


Expand Down Expand Up @@ -187,6 +190,17 @@ Mayor
/obj/item/twohanded/sledgehammer/warmace = 1,
/obj/item/storage/box/medicine/poultice5 = 1
)

/datum/outfit/loadout/ncrally
name = "NCR Ally"
backpack_contents = list(
/obj/item/clothing/under/f13/ncr_formal_uniform = 1,
/obj/item/clothing/under/f13/ncr_female_officer = 1,
/obj/item/gun/ballistic/automatic/pistol/deagle = 1,
/obj/item/ammo_box/magazine/m44 = 2,
/obj/item/clothing/shoes/laceup = 1,
/obj/item/clothing/mask/cigarette/pipe/cobpipe = 1
)
/*--------------------------------------------------------------*/

/datum/job/eastwood/f13secretary
Expand All @@ -196,8 +210,11 @@ Mayor
total_positions = 1
spawn_positions = 1
supervisors = "The Mayor"
description = "The settlement of Eastwood is a busy place, and the Mayor often can't handle everything by themselves. You are here to help them with anything and everything they require, and make sure the more trivial problems do not concern them. You handle clerical work, hear complaints, and set meetings within the manor. An efficient and smooth running town means a happy Mayor - just remember that if things go wrong, you're a convenient scapegoat."
enforces = "You are the stand-in leader of Eastwood if a Mayor does not exist."
description = "Even under NCR, The settlement of Eastwood is a busy place, and the Mayor often can't handle everything by themselves.\
You are here to help them with anything and everything they require, and make sure the more trivial problems do not concern them.\
You handle clerical work, hear complaints, and set meetings within the manor.\
An efficient and smooth running town means a happy Mayor - just remember that if things go wrong, you're a convenient scapegoat."
enforces = "You are the stand-in leader of Eastwood if a Mayor does not exist. Then the Sheriff is third. Note that the priest may be fourth, and do not forget the NCR Officials."
selection_color = "#d7b088"
exp_requirements = 0

Expand Down Expand Up @@ -292,8 +309,11 @@ Mayor
head_announce = list("Security")
total_positions = 1
spawn_positions = 1
supervisors = "The Mayor"
description = "You are the civil enforcer of Eastwood, keeping the settlement within firm control under the authority of the Mayor. With your loyal patrolmen, you maintain your claim to authority by keeping the peace, managing disputes, and protecting the citizens from threats within and without. Never leave Eastwood undefended, and don't let its people die out. If this town falls, new conquerors don't tend to look kindly upon the old law."
supervisors = "The Mayor."
description = "You are the civil enforcer of Eastwood, keeping the settlement within firm control under the authority of the Mayor.\
With your loyal patrolmen, you maintain your claim to authority by keeping the peace, managing disputes, and protecting the citizens from threats within and without.\
While you can't exactly arrest NCR soldiers, that being the job of the NCR MP, you are here to warn them of any misbehavior.\
Never leave Eastwood undefended, and don't let its people die out. Protect the Mayor too."
enforces = "You are the stand-in leader of Eastwood if a Mayor or Secretary does not exist."
selection_color = "#d7b088"
exp_requirements = 400
Expand Down Expand Up @@ -384,8 +404,12 @@ Mayor
total_positions = 4
spawn_positions = 4
supervisors = "The Sheriff"
description = "You are a loyal protector of Eastwood, keeping the settlement within firm control under the authority of the Mayor. The sheriff is your direct superior, and you should expect to take your day-to-day orders from them. Maintain your claim to authority by keeping the peace, managing disputes, and protecting the citizens from threats within and without. Never leave Eastwood undefended, and don't let its people die out."
enforces = "You may be elected temporary Sheriff if one does not exist. This may make you the stand-in leader of Eastwood if a Mayor or Secretary does not exist."
description = "Those NCR soldiers doesn't scare you, because your cause is just.\
You are here keeping the settlement within firm control under the authority of the Mayor.\
The sheriff is your direct superior, and you should expect to take your day-to-day orders from them.\
Maintain your claim to authority by keeping the peace, managing disputes, and protecting the citizens from threats within and without.\
While you can't arrest the NCR Soldiers, with a bit of luck the MPs will do their work. Protect the mayor at all cost."
enforces = "You may be elected temporary Sheriff if one does not exist. This may make you the stand-in leader of Eastwood if a Mayor, Secretary or even priest does not exist."
selection_color = "#dcba97"
exp_type = EXP_TYPE_EASTWOOD
exp_requirements = 0
Expand Down Expand Up @@ -494,8 +518,10 @@ Mayor
total_positions = 4
spawn_positions = 4
supervisors = "Eastwood laws"
description = "You are a farmer living in Eastwood. Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace."
enforces = "Farming is a public service, and you are under control of local governance - and you are expected to produce food."
description = "Being a farmer in Eastwood is now a bit harder, since the NCR are putting their hands everywhere.\
While working for Eastwood, the NCR might ask you to make them food for them.\
Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace."
enforces = "Farming is a public service, and you are under control of local governance : The Mayorial office and/or NCR Officials - and you are expected to produce food."
selection_color = "#dcba97"

outfit = /datum/outfit/job/den/f13farmer
Expand Down Expand Up @@ -576,7 +602,10 @@ Mayor
total_positions = 4
spawn_positions = 4
supervisors = "The Mayor"
description = "Prospecting is a complicated business. Some call it scrounging or looting, but there is more to it than sifting through rubble - few can boast the valuable skills of mining and scavenging the ruins of fallen empires. The settlement of Eastwood understands the value of this, and you've found purpose within their mines. Sell the materials you find to the highest bidder - the local store may be particularly interested in metals."
description = "Prospecting is a complicated business.\
Some call it scrounging or looting, but there is more to it than sifting through rubble - few can boast the valuable skills of mining and scavenging the ruins of fallen empires.\
The settlement of Eastwood, and NCR understands the value of this, and you've found purpose within the city.\
Sell the materials you find to the highest bidder - the local store may be particularly interested in metals, but the NCR migth also be a good buyer."
enforces = "Mining is a public service, and you are under control of local governance - but by default you are expected to work with private businesses and individual clients."
selection_color = "#dcba97"

Expand Down Expand Up @@ -662,9 +691,11 @@ Mayor
department_flag = DEP_EASTWOOD
total_positions = 3
spawn_positions = 3
supervisors = "The Mayor"
description = "Handy with a scalpel and scanner, your expertise in the practice of medicine makes you an indispensible asset to the settlement of Eastwood. Just remember that you're not a Follower - medicine doesn't come for free, and you aren't here out of the kindness of your heart. Make sure to turn a profit on your services, or the Mayor might reconsider your position, if you're bad enough the sherrif might even kick you out!"
enforces = "Medicine is a public service, and you are under control of local governance - but remember public doesn't equate to free."
supervisors = "The Mayor, The NCR Medical Officer"
description = "Handy with a scalpel and scanner, your expertise in the practice of medicine makes you an indispensible asset to the settlement of Eastwood.\
Just remember that you're not a Follower - medicine doesn't come for free, and you aren't here out of the kindness of your heart.\
Make sure to turn a profit on your services, or the Mayor might reconsider your position, and if you're bad enough the NCR chief medical officer will order for your arrest !"
enforces = "Medicine is a public service, and you are under control of local governance, and the NCR chief medical officer - but remember public doesn't equate to free."
selection_color = "#dcba97"

loadout_options = list(
Expand Down Expand Up @@ -770,7 +801,7 @@ Mayor
total_positions = 2
spawn_positions = 2
supervisors = "the free market and Eastwood's Laws"
description = "As a proprietor of the bar, you are responsible for ensuring both citizens and travellers in Eastwood can get some food, drink and rest. Speak to the farmers for fresh produce!"
description = "As a proprietor of the bar, you are responsible for ensuring both NCR soldiers, citizens and travellers in Eastwood can get some food, drink and rest. Speak to the farmers for fresh produce!"
enforces = " The bar is a private business and you can decide who is welcome there. However, you are still subject to the overarching laws of Eastwood."
selection_color = "#dcba97"

Expand Down Expand Up @@ -855,7 +886,7 @@ Mayor
total_positions = -1
spawn_positions =-1
supervisors = "Eastwood's laws"
description = "You are a citizen living in Eastwood. Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace. One of the local businesses may have work if you require funds."
description = "You are a citizen living in Eastwood. Now under the NCR, you are also technically a NCR citizen. Treat your town with respect and make sure to follow the laws in place, as your premium status may be revoked if you are considered a danger to the populace. One of the local businesses may have work if you require funds."
selection_color = "#dcba97"

outfit = /datum/outfit/job/den/f13settler
Expand Down Expand Up @@ -1178,13 +1209,16 @@ Mayor
/*--------------------------------------------------------------*/

/datum/job/eastwood/f13banker
title = "Banker"
title = "NCR Tax Collector"
flag = F13BANKER
department_flag = DEP_EASTWOOD
total_positions = 0
spawn_positions = 0
supervisors = "The Mayor"
description = "No matter the nature of society, fortune and profit are there to be made! It is up to you to make deals, distribute caps and earn interest - an easy first venture might be safekeeping possessions in the strongboxes of your vault within the First Bank of Eastwood. Ensure you make a profit and retain enough capital for your day-to-day operations. You are under the governance of Eastwood, but perhaps deal-making will take you into other alliances."
faction = FACTION_NCR
access = list(ACCESS_NCR)
minimal_access = list(ACCESS_NCR)
total_positions = 1
spawn_positions = 1
supervisors = "No one, NCR laws"
description = "You were send by the NCR to deal with the economical and political side of the settlement of Eastwood.\
You have a say over the tax rate and the laws, and must work with the mayor (or not) over taxe rate. This is a dangerous job, so make sure to be guarded. You can also serve as a banker."
enforces = "Your bank is a private business and you are not under direct control of local governance, but are subject to their laws."
selection_color = "#dcba97"
outfit = /datum/outfit/job/den/f13banker
Expand Down
Loading
Loading