Tiles with Bunk Beds and ---Merge Conflict Marker---s in the new Charlie and Bravo Briefing Rooms.

[stagda]

Testmerges

BYOND Version: 515.1610 Server revision compiled on: 2023-11-06T17:19:32+00:00 Master commit: c05a9cb The following pull requests are currently test merged: #4475: 'Adds drawing to tacmaps' by Cthulhu80 at commit 1a02644 #4812: 'Dropship weapons console TGUI' by mullenpaul at commit ccde22c #4793: 'ports the tg profiler subsystem' by harryob at commit 4b06b80 #4756: 'Minor Code Maintenance Bundle (deletes, standards, runtimes)' by fira at commit 3edaadc #4750: 'Code maintenace of Stats Entities' by fira at commit ac81df4 Local commit: ffbb9fef4be9435c73f7bfc649defa18bf056aa2 TGS version: 5.16.2 DMAPI version: 5.6.2

Round ID

19407

Description of the bug

There is a set of bunk beds in the new Bravo and Charlie squad briefing rooms that share a tile with a '--- Merge Conflict Marker---'

What's the difference with what should have happened?

There should just be chairs on those tiles.

How do we reproduce this bug?

1. Examine the tile with the bunk beds on them in the relevant squad briefing room(s).

...

Issue Bingo

• Issue could be reproduced at least once
• Issue happened in a recent (less than 7 days ago) round
• Couldn't find an existing issue about this (https://github.com/cmss13-devs/cmss13/issues)

[stagda]

Looking into merged PRs, I think I see this occured with #4801 by @BeagleGaming1 it looks like MapDiff bot is showing changes to the tiles in question

[Huffie56]

it's been fixed no idea what PR did it ....