Skip to content
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.

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

Kebab Blackwater fusion #361

Merged
merged 28 commits into from
Feb 3, 2024

Conversation

DeltaDav
Copy link
Contributor

Adds Blackwater to Kebab.
MAkes the old town a supermutant outpost.

About The Pull Request

Since Kebab his now a way nicer town to live in, and that we are low pop, there is no need for two towns. o, this PR brings Blackwater to Kebab ! The south christian church is now part of kebab, and the new home of the blackwater settlers ! The Deputy, part of the Kebab Militia, also have a lil jailhouse.

The Church has a now a shop, a lil bar, and some rooms. Outside, fields, and animal pents. The whole area, part of Kebab, has a unfinished wall arround it.

Sadly, the Old OG Blackwater is now a Supermutant hideout, with a lot of muties, guns and a a lil FEV2 bottle.

Why It's Good For The Game

Well, No need for 2 town.
It also doesn't remove Blackwater roles.

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Changelog

🆑
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

@DeltaDav
Copy link
Contributor Author

Lil problem with the PR. Please don't merge

@DeltaDav
Copy link
Contributor Author

image

ssnif :,c

@DeltaDav
Copy link
Contributor Author

It should be fixed now, but did some modification.

The supermutant blackwater has no FEV.
The New blackwater community center church now got a barber shop.

But yeah, I listened to the suggestion.
Kebab still has some shithole parts.
(Middle Kebab, the shithole)
image

South Blackwater - Kebab
image

The church, center of Blackwater Kebab
image

Lil Jail house (Upper and ground)
image

image

Appartement (upper floor of the church)

image

@Aurrain
Copy link
Contributor

Aurrain commented Nov 29, 2023

Does this include your prior map changes from #350 ?

@DeltaDav
Copy link
Contributor Author

Does this include your prior map changes from #350 ?

Yup !

@DeltaDav
Copy link
Contributor Author

DeltaDav commented Dec 5, 2023

Added some christmas trees in kebab,
Job modification (The Blackwater Deputy and Settler got renamed)
They also have acces to Kebab IDs, and get a extra town headset.
Citizens gets 2 new Loadout :
Legion subjects, where they get a smithing hammer
And Nouveau Riche, where they get suits and 100 extra caps.

@Aurrain Aurrain added Awaiting Input Code has been checked, waiting for other's input on the subject Mapping this PR changes the map labels Dec 7, 2023
@Aurrain
Copy link
Contributor

Aurrain commented Dec 7, 2023

I'm not sure how I feel about the roles for Blackwater being moved into the town proper & labeled "Kebab Blackwater Settler" etc. I honestly think it'd be easier if we adjusted role-count for the Kebab-centric versions & commented Blackwater roles out for the time being.

I'd like your opinion too, of course.

@DeltaDav
Copy link
Contributor Author

DeltaDav commented Dec 7, 2023 via email

@Aurrain
Copy link
Contributor

Aurrain commented Dec 7, 2023

So you want Blackwater roles to still remain outside and or independent of town? Other thing I can do: Simply add the Blackwater Settlers loadouts for kebab citizens

Yeah, it'd be a lot easier to have loadouts instead of duplicate roles for the same faction (Kebabtown).
The idea behind commenting them out of course being in case we need them later.

@Aurrain Aurrain added Feature This Pull Request adds one or more Features and removed Awaiting Input Code has been checked, waiting for other's input on the subject labels Feb 3, 2024
@Aurrain Aurrain merged commit 9360cc4 into Foundation-19:master Feb 3, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This Pull Request adds one or more Features Mapping this PR changes the map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants