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
788 workflow runs
788 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Docking update and bug fixes (i got rid of the funny name) (#6953) Check for merge conflicts #3308: Commit 9793e79 pushed by silicons
January 1, 2025 20:38 40s master
master
January 1, 2025 20:38 40s
add minHealth which controls when carbons die so we can set it in spe… Check for merge conflicts #3307: Commit faa992a pushed by TheLordME
December 31, 2024 13:35 42s master
master
December 31, 2024 13:35 42s
Fixes to areas, and a couple bad airless tiles (#6951) Check for merge conflicts #3306: Commit 15240f4 pushed by silicons
December 30, 2024 02:27 26s master
master
December 30, 2024 02:27 26s
Endeavour Deck 1 maints and wire fixes (#6952) Check for merge conflicts #3305: Commit 9a3e110 pushed by silicons
December 30, 2024 02:27 1m 13s master
master
December 30, 2024 02:27 1m 13s
Endeavour deck 3 maints update (#6943) Check for merge conflicts #3304: Commit 692667f pushed by silicons
December 30, 2024 02:26 31s master
master
December 30, 2024 02:26 31s
Endeavour deck 4 maints update (#6945) Check for merge conflicts #3303: Commit 6aa45e3 pushed by silicons
December 30, 2024 02:26 43s master
master
December 30, 2024 02:26 43s
Update nanomapgen.dm (#6941) Check for merge conflicts #3302: Commit b8ff885 pushed by TheLordME
December 29, 2024 18:25 39s master
master
December 29, 2024 18:25 39s
maybe fixes the hub (#6949) Check for merge conflicts #3301: Commit e3a3742 pushed by TheLordME
December 29, 2024 18:20 39s master
master
December 29, 2024 18:20 39s
Fixes Scorian Surgery Tools (#6948) Check for merge conflicts #3300: Commit ed77abf pushed by TheLordME
December 29, 2024 18:19 35s master
master
December 29, 2024 18:19 35s
removes shadekin death qdel (#6946) Check for merge conflicts #3299: Commit d061dea pushed by TheLordME
December 29, 2024 18:19 37s master
master
December 29, 2024 18:19 37s
fix hub (#6935) Check for merge conflicts #3298: Commit 4d9274e pushed by timothyteakettle
December 24, 2024 21:55 1m 1s master
master
December 24, 2024 21:55 1m 1s
Maints update deck 1 (#6932) Check for merge conflicts #3297: Commit 067946e pushed by BlueWildrose
December 23, 2024 23:28 35s master
master
December 23, 2024 23:28 35s
Endeavour Deck 2 Maints update 1: First pass at filling maints on Dec… Check for merge conflicts #3296: Commit c0f74e6 pushed by BlueWildrose
December 23, 2024 23:28 37s master
master
December 23, 2024 23:28 37s
Delete sql_old directory (#6937) Check for merge conflicts #3295: Commit fc7c253 pushed by BlueWildrose
December 23, 2024 23:23 23s master
master
December 23, 2024 23:23 23s
Endeavour deck 3 portside tweaking (#6928) Check for merge conflicts #3294: Commit 788a0f9 pushed by BlueWildrose
December 23, 2024 23:23 37s master
master
December 23, 2024 23:23 37s
running bugfix PR (#6914) Check for merge conflicts #3293: Commit 85e2450 pushed by BlueWildrose
December 23, 2024 23:22 38s master
master
December 23, 2024 23:22 38s
Bump nanoid from 3.3.6 to 3.3.8 in /tgui (#6911) Check for merge conflicts #3292: Commit 67f4fa4 pushed by dependabot bot
December 23, 2024 02:22 40s master
master
December 23, 2024 02:22 40s
fixing the atlas explo shuttle cargo transfer system (#6922) Check for merge conflicts #3291: Commit 556ccfb pushed by TheLordME
December 20, 2024 07:01 37s master
master
December 20, 2024 07:01 37s
updates emoji_32x32.dmi (#6930) Check for merge conflicts #3290: Commit 940755b pushed by TheLordME
December 20, 2024 07:00 37s master
master
December 20, 2024 07:00 37s
516 tgui support (#6931) Check for merge conflicts #3289: Commit afba3a6 pushed by silicons
December 20, 2024 06:36 42s master
master
December 20, 2024 06:36 42s
IC drill update (#6926) Check for merge conflicts #3288: Commit ee00e4c pushed by silicons
December 19, 2024 14:35 26s master
master
December 19, 2024 14:35 26s
fix admin fax viewing (#6927) Check for merge conflicts #3287: Commit 38df570 pushed by silicons
December 19, 2024 14:35 41s master
master
December 19, 2024 14:35 41s
use native color procs (#6925) Check for merge conflicts #3286: Commit 6a02353 pushed by silicons
December 18, 2024 15:11 42s master
master
December 18, 2024 15:11 42s
Resurrect Cargonia (#6916) Check for merge conflicts #3285: Commit cd9c99d pushed by silicons
December 16, 2024 19:12 47s master
master
December 16, 2024 19:12 47s
IC Health scanner, HEV sounds, Sound cooldown rework (#6894) Check for merge conflicts #3284: Commit e3c9c22 pushed by silicons
December 16, 2024 03:03 46s master
master
December 16, 2024 03:03 46s