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

Moved IAA spawn to their office. #4297

Merged
merged 1 commit into from Mar 16, 2018
Merged

Conversation

Kaedwuff
Copy link
Contributor

The IAA spawns were moved to their office chairs.

I also removed the chairs in the security briefing room that they previously occupied. There is now a bit of imposing space between the HoS and the rest of his team, which I like.

@Lohikar Lohikar added 🗺️ Mapping - Aurora The PR touches the Aurora map files. Bypass Development labels Feb 17, 2018
@Kaedwuff Kaedwuff changed the base branch from master to development February 17, 2018 07:16
@Kaedwuff Kaedwuff changed the base branch from development to master February 17, 2018 07:16
@@ -1344,9 +1344,6 @@
/turf/simulated/floor/tiled,
/area/security/vacantoffice2)
"acK" = (
/obj/structure/bed/chair/office/dark{
Copy link
Member

Choose a reason for hiding this comment

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

It seems you have deleted a chair in the IA office.
Intentional ?

Copy link
Member

Choose a reason for hiding this comment

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

Actually, never mind. its mentioned in the title.

@Kaedwuff Kaedwuff closed this Mar 14, 2018
@Kaedwuff Kaedwuff deleted the iaa branch March 14, 2018 22:20
@Kaedwuff Kaedwuff restored the iaa branch March 14, 2018 22:21
@Kaedwuff Kaedwuff reopened this Mar 14, 2018
@Kaedwuff
Copy link
Contributor Author

I guess this didn't make it into the march goal. I thought it had.

Anyone want to review it?

@Arrow768
Copy link
Member

Arrow768 commented Mar 15, 2018

There seems to be an issue with mapmerge 40k changes

@LordFowl
Copy link
Contributor

I don't really see why this is marked as Bypass Development @Lohikar
But in that case it does not need to be merged according to dev cycles.

However did you mapmerge properly?

@LordFowl LordFowl added the Stale Has not been updated by its author for a long time. label Mar 16, 2018
@Lohikar
Copy link
Contributor

Lohikar commented Mar 16, 2018

@LordFowl It was marked bypass dev as it is targeting master.

Large number of changes might be a result of the resolver tool, though not optimal.

@LordFowl
Copy link
Contributor

In that case @Kaedwuff Is there any reason this is targeting master instead of dev? Master is typically reserved for bug-fixes.

@Kaedwuff
Copy link
Contributor Author

Mostly because when Lohikar was explaining the process to me, I was pretty sure he told me map changes to to master. I might have misunderstood?

@Kaedwuff Kaedwuff changed the base branch from master to development March 16, 2018 04:44
@Kaedwuff Kaedwuff closed this Mar 16, 2018
@Kaedwuff Kaedwuff reopened this Mar 16, 2018
@LordFowl LordFowl removed Bypass Development Stale Has not been updated by its author for a long time. labels Mar 16, 2018
@LordFowl LordFowl added this to the April Update milestone Mar 16, 2018
@Arrow768 Arrow768 merged commit 3796847 into Aurorastation:development Mar 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting Merge 🗺️ Mapping - Aurora The PR touches the Aurora map files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants