Skip to content

Actions: Contrabang/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
238 workflow runs
238 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

making a terminal now unbreaks the SMES (#26871) Merge Conflict Detection #212: Commit cbb735f pushed by Contrabang
September 24, 2024 15:45 27s master
master
September 24, 2024 15:45 27s
Updates chat selectors (#26863) Merge Conflict Detection #211: Commit aae804e pushed by Contrabang
September 21, 2024 16:57 27s master
master
September 21, 2024 16:57 27s
[FIX] Dead cats no longer chase mice (#26826) Merge Conflict Detection #210: Commit a8668cc pushed by Contrabang
September 19, 2024 16:45 27s master
master
September 19, 2024 16:45 27s
Administration tool: Build mode offer tool to quickly offer large amo… Merge Conflict Detection #209: Commit a091516 pushed by Contrabang
September 19, 2024 13:13 33s master
master
September 19, 2024 13:13 33s
Improved cloning UI (#26753) Merge Conflict Detection #208: Commit 9adbe39 pushed by Contrabang
September 18, 2024 11:51 30s master
master
September 18, 2024 11:51 30s
Adds Syndicate organizations (#24040) Merge Conflict Detection #207: Commit 20f47a7 pushed by Contrabang
September 12, 2024 21:40 27s master
master
September 12, 2024 21:40 27s
fix: R&D rework: convert rest of tgui_alert choices to lists (#26721) Merge Conflict Detection #206: Commit da4e519 pushed by Contrabang
September 9, 2024 01:17 28s master
master
September 9, 2024 01:17 28s
fix all occurrences of uppercase links in markdown (#26684) Merge Conflict Detection #205: Commit ef10113 pushed by Contrabang
September 5, 2024 02:09 31s master
master
September 5, 2024 02:09 31s
Makes two modules inherent laws (#26576) Merge Conflict Detection #204: Commit 71c1ba5 pushed by Contrabang
August 26, 2024 14:45 31s master
master
August 26, 2024 14:45 31s
replace magic numbers related to emp and explosion severity with defi… Merge Conflict Detection #203: Commit 777910d pushed by Contrabang
August 18, 2024 05:03 25s master
master
August 18, 2024 05:03 25s
Minor changes to table frames (#26313) Merge Conflict Detection #202: Commit 42c50a5 pushed by Contrabang
August 1, 2024 21:50 27s master
master
August 1, 2024 21:50 27s
Corrects the price comments for alot of the syndicate bundles (#26293) Merge Conflict Detection #201: Commit f84f09b pushed by Contrabang
July 30, 2024 17:04 31s master
master
July 30, 2024 17:04 31s
Update human_update_icons.dm (#26305) Merge Conflict Detection #200: Commit 1e59b55 pushed by Contrabang
July 29, 2024 15:25 34s master
master
July 29, 2024 15:25 34s
[FIX]Plant DNA manipulator now drops seed and disks on destruction (#… Merge Conflict Detection #199: Commit 8c7c9d3 pushed by Contrabang
July 12, 2024 23:21 30s master
master
July 12, 2024 23:21 30s
Miscellaneous Code Tidying (#26180) Merge Conflict Detection #198: Commit e3d67c4 pushed by Contrabang
July 10, 2024 11:32 27s master
master
July 10, 2024 11:32 27s
Update diona_organs.dm (#26004) Merge Conflict Detection #197: Commit 39000c7 pushed by Contrabang
June 30, 2024 00:29 30s master
master
June 30, 2024 00:29 30s
last tweaks (#26060) Merge Conflict Detection #196: Commit 5ccce78 pushed by Contrabang
June 27, 2024 23:53 33s master
master
June 27, 2024 23:53 33s
Ah. Separate checks on robotics.dm I see. (#25998) Merge Conflict Detection #195: Commit 2645a94 pushed by Contrabang
June 22, 2024 13:57 27s master
master
June 22, 2024 13:57 27s
One use only please (#25967) Merge Conflict Detection #194: Commit 7acefde pushed by Contrabang
June 19, 2024 14:04 35s master
master
June 19, 2024 14:04 35s
Changelings now get an option to be revived by defibrillator when fak… Merge Conflict Detection #193: Commit 439918f pushed by Contrabang
June 13, 2024 02:21 39s master
master
June 13, 2024 02:21 39s
lwap no longer points out invisible admins, revenants, or fully steal… Merge Conflict Detection #192: Commit 076e463 pushed by Contrabang
June 12, 2024 00:26 30s master
master
June 12, 2024 00:26 30s
Minor fixes to typos in Hydroponics (#25739) Merge Conflict Detection #191: Commit 4ae0913 pushed by Contrabang
June 11, 2024 07:58 28s master
master
June 11, 2024 07:58 28s
Adds impact wrench noise for power wrench (#25747) Merge Conflict Detection #190: Commit b742130 pushed by Contrabang
June 10, 2024 03:21 28s master
master
June 10, 2024 03:21 28s
Mecha Actions: Fixes #25828 and #25826 (#25830) Merge Conflict Detection #189: Commit 2a4f4c6 pushed by Contrabang
June 6, 2024 02:29 36s master
master
June 6, 2024 02:29 36s
Cryo storage can no longer be exploded by malf AI (#25782) Merge Conflict Detection #188: Commit 95d682f pushed by Contrabang
June 4, 2024 01:11 27s master
master
June 4, 2024 01:11 27s