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

Town Houses, Inn & Mercenary Guild #1261

Merged

Conversation

Aegledis
Copy link
Contributor

@Aegledis Aegledis commented Jan 8, 2025

About The Pull Request

MercenaryGuild2
MercenaryGuild1
TownerHouses2
TownerHouses1
Innlounge1

Why It's Good For The Game

It adds the Mercenary Guild building, a lounge to the Inn and 4 new towner houses which are currently missing in Stonehamlet.

Pre-Merge Checklist

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

@BadAtThisGame302
Copy link
Contributor

The roof without a second floor, with the large house, there is a stone wall on the roof above the wall instead of a roof tile, maybe misplaced?

@BadAtThisGame302
Copy link
Contributor

image

@Aegledis
Copy link
Contributor Author

Aegledis commented Jan 8, 2025

The roof without a second floor, with the large house, there is a stone wall on the roof above the wall instead of a roof tile, maybe misplaced?

I haven't actually touched that. I believe it's just supposed to be a chimney. You can see them on multiple rooves 1z level above hearths.

@BadAtThisGame302
Copy link
Contributor

The roof without a second floor, with the large house, there is a stone wall on the roof above the wall instead of a roof tile, maybe misplaced?

I haven't actually touched that. I believe it's just supposed to be a chimney. You can see them on multiple rooves 1z level above hearths.

Alright I see, no worries then.

@ThePainkiller ThePainkiller added the Merge conflict This PR won't compile due to merge conflics label Jan 8, 2025
/obj/structure/mineral_door/wood/fancywood{
name = "mercenary guild";
locked = 1;
lockid = mercenary
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Find out this "mercenary guild" fancy wood door, and modify its lockid var to be between quotation marks to identify it as a string rather than a variable (Should be "mercenary", not just mercenary). Mapdiffbot is throwing an error out of this. Once it's fixed, we can merge.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for pointing it out, I fixed it for a few other doors too.

@BadAtThisGame302 BadAtThisGame302 added Map This PR makes changes to one or more maps and removed Merge conflict This PR won't compile due to merge conflics labels Jan 8, 2025
Copy link
Contributor

@ThePainkiller ThePainkiller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks good, sensible use of available, unused space, and all compiles as well.

@ThePainkiller ThePainkiller merged commit 0b30703 into Darkrp-community:main Jan 9, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map This PR makes changes to one or more maps
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants