Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,792 workflow runs
1,792 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Changes advisory level to reflect the current storyteller (#3989) Check for merge conflicts #1913: Commit 072dacf pushed by ThePooba
November 5, 2024 22:21 38s master
master
November 5, 2024 22:21 38s
Bardrone ghost spawner (#4088) Check for merge conflicts #1912: Commit ee476e6 pushed by ThePooba
November 5, 2024 22:10 49s master
master
November 5, 2024 22:10 49s
Fixes a few species code and bugs (#4106) Check for merge conflicts #1911: Commit 4bc77ee pushed by ThePooba
November 5, 2024 05:43 53s master
master
November 5, 2024 05:43 53s
[not modular sorry] adds 325 new vox lines for the ai (#2889) Check for merge conflicts #1910: Commit a9534ae pushed by ThePooba
November 5, 2024 05:43 2m 53s master
master
November 5, 2024 05:43 2m 53s
Prevents AI radio speech sounds from stacking (#4058) Check for merge conflicts #1909: Commit 6a1c9a7 pushed by Absolucy
November 4, 2024 23:29 39s master
master
November 4, 2024 23:29 39s
Fix jaunts sending you to kingdom come after roundend (#4065) Check for merge conflicts #1908: Commit d12e29f pushed by Absolucy
November 4, 2024 23:26 49s master
master
November 4, 2024 23:26 49s
Mice/rats can nibble food + basic mob emote support (#4047) Check for merge conflicts #1907: Commit 4972e61 pushed by ThePooba
November 4, 2024 20:10 45s master
master
November 4, 2024 20:10 45s
Minor teratoma buffs (#3760) Check for merge conflicts #1906: Commit c4fe42e pushed by ThePooba
November 4, 2024 17:03 38s master
master
November 4, 2024 17:03 38s
Makes gulag more secure (#4076) Check for merge conflicts #1905: Commit 193f9e4 pushed by ThePooba
November 4, 2024 02:02 41s master
master
November 4, 2024 02:02 41s
Blueshift Security Access Cleanup (#4089) Check for merge conflicts #1904: Commit 57d1242 pushed by ThePooba
November 4, 2024 01:57 40s master
master
November 4, 2024 01:57 40s
Theseus Securty Cleanup (#4092) Check for merge conflicts #1903: Commit 67e4835 pushed by ThePooba
November 4, 2024 01:56 39s master
master
November 4, 2024 01:56 39s
Moves voidraptor modsuits to armor (#4093) Check for merge conflicts #1902: Commit 51a2321 pushed by ThePooba
November 4, 2024 01:56 41s master
master
November 4, 2024 01:56 41s
Stuff for things (#3969) Check for merge conflicts #1901: Commit 8863df2 pushed by wraith-54321
November 3, 2024 23:47 43s master
master
November 3, 2024 23:47 43s
Fixes moon heretic ascension not working as intended (#87631) (#4086) Check for merge conflicts #1900: Commit 883b0c3 pushed by Absolucy
November 3, 2024 21:45 40s master
master
November 3, 2024 21:45 40s
Fixes RPG titles alignment (#81077) (#4085) Check for merge conflicts #1899: Commit a62faef pushed by Absolucy
November 3, 2024 21:38 41s master
master
November 3, 2024 21:38 41s
Fix some artifact stuff (#4072) Check for merge conflicts #1898: Commit 2f49e32 pushed by Absolucy
November 3, 2024 21:38 53s master
master
November 3, 2024 21:38 53s
auxlua -> dreamluau conversion (#4027) Check for merge conflicts #1897: Commit 7d38ebf pushed by Absolucy
November 3, 2024 06:52 49s master
master
November 3, 2024 06:52 49s
Shuttle docker console camera eyes now refresh if the offset/range is… Check for merge conflicts #1896: Commit f2050bb pushed by Absolucy
November 3, 2024 06:51 47s master
master
November 3, 2024 06:51 47s
Changes the airlock access leading to perma on voidraptor to use perm… Check for merge conflicts #1895: Commit d16275b pushed by Absolucy
November 2, 2024 16:28 49s master
master
November 2, 2024 16:28 49s
Fixes incorrect access on the Blueshift aux base (#4000) Check for merge conflicts #1894: Commit f301890 pushed by Absolucy
November 2, 2024 16:27 37s master
master
November 2, 2024 16:27 37s
PORT #86725 (#4039) Check for merge conflicts #1893: Commit 6494eb8 pushed by Absolucy
November 2, 2024 16:27 1m 18s master
master
November 2, 2024 16:27 1m 18s
boop (#4069) Check for merge conflicts #1892: Commit c55ef30 pushed by Absolucy
November 2, 2024 15:46 53s master
master
November 2, 2024 15:46 53s
Heavy bleeder warning (#3946) Check for merge conflicts #1891: Commit 74c28db pushed by Absolucy
November 1, 2024 23:59 50s master
master
November 1, 2024 23:59 50s
Barber(ing) the station (#3733) Check for merge conflicts #1890: Commit fb597a4 pushed by Absolucy
November 1, 2024 22:24 47s master
master
November 1, 2024 22:24 47s
Cybernetic Revolution adjustments + New leg cybernetic 'sprinter' (#4… Check for merge conflicts #1889: Commit 44b9c49 pushed by ThePooba
November 1, 2024 21:12 38s master
master
November 1, 2024 21:12 38s