Skip to content

Actions: Citadel-Station-13/Citadel-Station-13-RP

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
783 workflow runs
783 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

The Krisitik Species (#6062) Check for merge conflicts #2558: Commit ca4ef53 pushed by Captain277
October 18, 2023 20:10 1m 28s master
master
October 18, 2023 20:10 1m 28s
stops lowwall window stacking (#6085) Check for merge conflicts #2557: Commit 5bec137 pushed by Captain277
October 18, 2023 19:48 55s master
master
October 18, 2023 19:48 55s
Gives the Triumph SMES room expansion wires (#6081) Check for merge conflicts #2556: Commit 6a77cd5 pushed by Captain277
October 18, 2023 19:47 38s master
master
October 18, 2023 19:47 38s
carry weight fixes (#6073) Check for merge conflicts #2555: Commit ec4004b pushed by Captain277
October 18, 2023 19:47 49s master
master
October 18, 2023 19:47 49s
Connects Lower Medbay Maint, adds CE/CMO request consoles (#6079) Check for merge conflicts #2554: Commit d620416 pushed by TheLordME
October 18, 2023 15:39 59s master
master
October 18, 2023 15:39 59s
fixes signlang (#6080) Check for merge conflicts #2553: Commit 5983f9b pushed by timothyteakettle
October 16, 2023 00:00 54s master
master
October 16, 2023 00:00 54s
Belly dancer outfit as halloween costume (#6078) Check for merge conflicts #2552: Commit de1c555 pushed by Captain277
October 15, 2023 20:38 38s master
master
October 15, 2023 20:38 38s
Adds the Cosmic Winter Coat to the Loadout System (#6069) Check for merge conflicts #2551: Commit 1346c1a pushed by Captain277
October 15, 2023 20:38 1m 8s master
master
October 15, 2023 20:38 1m 8s
adds a range (3 tiles) to subtle notification message (#6077) Check for merge conflicts #2550: Commit 98c0eb8 pushed by TheLordME
October 15, 2023 09:55 46s master
master
October 15, 2023 09:55 46s
fixes faxes not showing up in command consoles (#6075) Check for merge conflicts #2549: Commit cd46744 pushed by TheLordME
October 15, 2023 09:55 46s master
master
October 15, 2023 09:55 46s
fixes vore prefbreaks (#6074) Check for merge conflicts #2548: Commit 6a5b6de pushed by TheLordME
October 15, 2023 09:22 38s master
master
October 15, 2023 09:22 38s
fixes holopad signing (#6067) Check for merge conflicts #2547: Commit 845b9d0 pushed by TheLordME
October 15, 2023 09:22 44s master
master
October 15, 2023 09:22 44s
[s] fixes subtler (#6071) Check for merge conflicts #2546: Commit 82d8589 pushed by TheLordME
October 15, 2023 09:18 51s master
master
October 15, 2023 09:18 51s
Bump postcss from 8.3.6 to 8.4.31 in /tgui (#6058) Check for merge conflicts #2545: Commit b1f0a4f pushed by dependabot bot
October 14, 2023 23:23 50s master
master
October 14, 2023 23:23 50s
Carry weight (#5791) Check for merge conflicts #2544: Commit 1dfc2cf pushed by TheLordME
October 12, 2023 09:05 55s master
master
October 12, 2023 09:05 55s
Fixes inflatables being inflatable when torn (#6064) Check for merge conflicts #2543: Commit a2815aa pushed by BlueWildrose
October 12, 2023 03:42 53s master
master
October 12, 2023 03:42 53s
fixes stasis bag attack hand, makes stasis bags reusable (#6063) Check for merge conflicts #2542: Commit be7e375 pushed by BlueWildrose
October 12, 2023 03:41 53s master
master
October 12, 2023 03:41 53s
Revert "bellydancer outfit in halloween loadout" (#6065) Check for merge conflicts #2541: Commit 5d785a9 pushed by TheLordME
October 10, 2023 16:40 1m 2s master
master
October 10, 2023 16:40 1m 2s
Adds an Invisible Satchel to the Seasonal Halloween Loadout (#6040) Check for merge conflicts #2540: Commit c6710e9 pushed by silicons
October 10, 2023 09:47 53s master
master
October 10, 2023 09:47 53s
Returns Security Vest and Helmet to Lockers (#6055) Check for merge conflicts #2539: Commit 87ec0aa pushed by silicons
October 9, 2023 06:27 51s master
master
October 9, 2023 06:27 51s
Fixes Toy Sword Icon & Rewrites It to Use E-Sword Procs. (#6054) Check for merge conflicts #2538: Commit 36a3b1c pushed by silicons
October 9, 2023 06:27 1m 4s master
master
October 9, 2023 06:27 1m 4s
bellydancer outfit in halloween loadout (#6039) Check for merge conflicts #2537: Commit 32cf4cf pushed by silicons
October 9, 2023 06:26 53s master
master
October 9, 2023 06:26 53s
Antediluvian dress + more heels (#6057) Check for merge conflicts #2536: Commit 13a6873 pushed by silicons
October 9, 2023 06:26 52s master
master
October 9, 2023 06:26 52s
Fixes Sealed Food Inheritance (#6059) Check for merge conflicts #2535: Commit 8911e50 pushed by silicons
October 9, 2023 06:26 42s master
master
October 9, 2023 06:26 42s
Adds the Kenjyu Kimono Donator Item (#6060) Check for merge conflicts #2534: Commit 9ef47a6 pushed by silicons
October 9, 2023 06:25 1m 1s master
master
October 9, 2023 06:25 1m 1s
ProTip! You can narrow down the results and go further in time using created:<2023-10-09 or the other filters available.