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
251 workflow run results
251 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Refinements to Violet Protocol (#5933) Check for merge conflicts #2450: Commit 93d6e49 pushed by silicons
September 10, 2023 22:30 43s master
master
September 10, 2023 22:30 43s
Fixes Graves (#5946) Check for merge conflicts #2449: Commit f38ebf6 pushed by silicons
September 10, 2023 22:29 47s master
master
September 10, 2023 22:29 47s
Restores Old Crate Sprites, Leaves New Render System Intact (#5951) Check for merge conflicts #2448: Commit 6103cd2 pushed by silicons
September 10, 2023 22:29 36s master
master
September 10, 2023 22:29 36s
Replaces Surt Emergency Double Airlock (#5956) Check for merge conflicts #2447: Commit 82f865f pushed by silicons
September 10, 2023 22:29 47s master
master
September 10, 2023 22:29 47s
Caliber updates (#5941) Check for merge conflicts #2446: Commit 5ec7719 pushed by Captain277
September 10, 2023 22:21 48s master
master
September 10, 2023 22:21 48s
Mortar Hivebot Nerf Hotfix (#5947) Check for merge conflicts #2445: Commit 3963de5 pushed by Captain277
September 9, 2023 05:00 38s master
master
September 9, 2023 05:00 38s
fixes hf machete (#5953) Check for merge conflicts #2444: Commit 95c3d9e pushed by Captain277
September 9, 2023 04:59 45s master
master
September 9, 2023 04:59 45s
Fixes and creates variants of the Opaque Gas Mask (#5954) Check for merge conflicts #2443: Commit 545d184 pushed by Captain277
September 9, 2023 04:59 45s master
master
September 9, 2023 04:59 45s
biogenerator fixes (#5955) Check for merge conflicts #2442: Commit 83a9051 pushed by Captain277
September 9, 2023 04:58 39s master
master
September 9, 2023 04:58 39s
fixes a list referencing oopsie (#5957) Check for merge conflicts #2441: Commit f25cc08 pushed by Captain277
September 9, 2023 04:58 1m 0s master
master
September 9, 2023 04:58 1m 0s
fixes nitrogen breathing (#5952) Check for merge conflicts #2440: Commit dc982d2 pushed by Captain277
September 7, 2023 23:59 55s master
master
September 7, 2023 23:59 55s
Restores CentCom (Demeter) Landmark (#5945) Check for merge conflicts #2439: Commit 3cec451 pushed by silicons
September 5, 2023 19:31 47s master
master
September 5, 2023 19:31 47s
fixes gas reagents + action buttons when dead (#5937) Check for merge conflicts #2438: Commit e22bf52 pushed by Captain277
September 4, 2023 16:07 43s master
master
September 4, 2023 16:07 43s
The Hive Awakens (#5940) Check for merge conflicts #2437: Commit 784efe9 pushed by Captain277
September 4, 2023 16:06 1m 15s master
master
September 4, 2023 16:06 1m 15s
disables tether holomap smooshing (#5942) Check for merge conflicts #2436: Commit 3a25073 pushed by Captain277
September 4, 2023 16:04 52s master
master
September 4, 2023 16:04 52s
better admin tooling and character profiles (#5931) Check for merge conflicts #2435: Commit 64b75c4 pushed by TheLordME
September 2, 2023 19:48 47s master
master
September 2, 2023 19:48 47s
Fixes climbing interruptions letting you climb anyway (#5935) Check for merge conflicts #2434: Commit fd359e5 pushed by TheLordME
September 1, 2023 18:23 1m 3s master
master
September 1, 2023 18:23 1m 3s
add reagent typepath support to gas reagents (#5932) Check for merge conflicts #2433: Commit 51b6784 pushed by Captain277
August 31, 2023 21:32 55s master
master
August 31, 2023 21:32 55s
Restores Old Biohazard Bin (#5924) Check for merge conflicts #2432: Commit d1b0e4a pushed by silicons
August 31, 2023 04:36 40s master
master
August 31, 2023 04:36 40s
robotic remains now turn to ash when interacted with like all other r… Check for merge conflicts #2431: Commit b61f73e pushed by silicons
August 31, 2023 04:35 46s master
master
August 31, 2023 04:35 46s
reworks pathfinding (#5907) Check for merge conflicts #2430: Commit 2b8c889 pushed by Captain277
August 31, 2023 02:28 55s master
master
August 31, 2023 02:28 55s
Fixes Maint Ladder Issue (#5923) Check for merge conflicts #2429: Commit c24e083 pushed by silicons
August 31, 2023 00:31 54s master
master
August 31, 2023 00:31 54s
fixes wing spreading (#5926) Check for merge conflicts #2428: Commit 7c8fd18 pushed by Captain277
August 30, 2023 20:50 49s master
master
August 30, 2023 20:50 49s
fixes scrubbers (#5927) Check for merge conflicts #2427: Commit a22021c pushed by Captain277
August 30, 2023 20:30 49s master
master
August 30, 2023 20:30 49s
Renames Daemon to Dremic (#5887) Check for merge conflicts #2426: Commit 5992b5d pushed by timothyteakettle
August 29, 2023 01:12 48s master
master
August 29, 2023 01:12 48s