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
Conversation
@@ -1344,9 +1344,6 @@ | |||
/turf/simulated/floor/tiled, | |||
/area/security/vacantoffice2) | |||
"acK" = ( | |||
/obj/structure/bed/chair/office/dark{ |
There was a problem hiding this comment.
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 ?
There was a problem hiding this comment.
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.
I guess this didn't make it into the march goal. I thought it had. Anyone want to review it? |
There seems to be an issue with mapmerge 40k changes |
I don't really see why this is marked as Bypass Development @Lohikar However did you mapmerge properly? |
@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. |
In that case @Kaedwuff Is there any reason this is targeting master instead of dev? Master is typically reserved for bug-fixes. |
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? |
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.