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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Revert to a working rust_g. (#6842) Check for merge conflicts #3219: Commit d6fd202 pushed by BlueWildrose
November 5, 2024 23:43 41s master
master
November 5, 2024 23:43 41s
prevents jitter while dead, and collects some /mob variables from var… Check for merge conflicts #3218: Commit 391293b pushed by silicons
November 5, 2024 19:34 40s master
master
November 5, 2024 19:34 40s
make circuit error slightly more verbose (#6839) Check for merge conflicts #3217: Commit 6a7d9d0 pushed by TheLordME
November 5, 2024 18:30 32s master
master
November 5, 2024 18:30 32s
Buffs Gammawraith and Demoncore (#6837) Check for merge conflicts #3216: Commit 453f6bd pushed by TheLordME
November 5, 2024 18:29 48s master
master
November 5, 2024 18:29 48s
Soulcatcher projections no longer have their overlays explode when a … Check for merge conflicts #3215: Commit 9f06a55 pushed by TheLordME
November 5, 2024 18:29 51s master
master
November 5, 2024 18:29 51s
Adds xenomeat back to xenomorphs (#6838) Check for merge conflicts #3214: Commit eca2a14 pushed by TheLordME
November 5, 2024 18:28 1m 0s master
master
November 5, 2024 18:28 1m 0s
opendream fixes (#6809) Check for merge conflicts #3213: Commit da0eb91 pushed by silicons
November 5, 2024 15:12 36s master
master
November 5, 2024 15:12 36s
Fix linters (#6841) Check for merge conflicts #3212: Commit 8a2b3f5 pushed by silicons
November 5, 2024 14:46 39s master
master
November 5, 2024 14:46 39s
Updates tgui backend libraries (typescript, eslint, compiler tools, e… Check for merge conflicts #3211: Commit 736d224 pushed by TheLordME
November 5, 2024 14:30 36s master
master
November 5, 2024 14:30 36s
repository subsystem touchups & moves materials/designs over (#6832) Check for merge conflicts #3210: Commit 6ace2af pushed by TheLordME
November 5, 2024 14:22 40s master
master
November 5, 2024 14:22 40s
update filter (#6836) Check for merge conflicts #3209: Commit 219bb26 pushed by silicons
November 5, 2024 14:15 30s master
master
November 5, 2024 14:15 30s
shello & playsound (#6834) Check for merge conflicts #3208: Commit da45aa9 pushed by silicons
November 5, 2024 14:14 54s master
master
November 5, 2024 14:14 54s
update ci again (#6811) Check for merge conflicts #3207: Commit 81bf2d9 pushed by silicons
November 5, 2024 06:05 44s master
master
November 5, 2024 06:05 44s
Init-&-co (#6833) Check for merge conflicts #3206: Commit d38246b pushed by silicons
November 3, 2024 18:06 33s master
master
November 3, 2024 18:06 33s
gateway spawner (#6831) Check for merge conflicts #3205: Commit 34a4db9 pushed by silicons
November 3, 2024 18:06 46s master
master
November 3, 2024 18:06 46s
radio cleanup 1 (#6835) Check for merge conflicts #3204: Commit d0f62d5 pushed by silicons
November 3, 2024 18:04 37s master
master
November 3, 2024 18:04 37s
Client Initializations Updates (#6822) Check for merge conflicts #3203: Commit b6c0db4 pushed by TheLordME
November 1, 2024 07:28 36s master
master
November 1, 2024 07:28 36s
reagents: reactions (#6816) Check for merge conflicts #3202: Commit a13176a pushed by TheLordME
October 31, 2024 18:35 37s master
master
October 31, 2024 18:35 37s
Nsv endeavour Fixes 1 (#6824) Check for merge conflicts #3201: Commit e0b522b pushed by silicons
October 30, 2024 16:34 39s master
master
October 30, 2024 16:34 39s
Halloween 2024 Finale: The Blacklaw Legacy (#6808) Check for merge conflicts #3200: Commit 1a7bf6a pushed by TheLordME
October 28, 2024 08:32 37s master
master
October 28, 2024 08:32 37s
Andromeda Haven (#6799) Check for merge conflicts #3199: Commit 46f28c8 pushed by TheLordME
October 28, 2024 08:32 45s master
master
October 28, 2024 08:32 45s
yanks MIT headers from atmos (#6814) Check for merge conflicts #3198: Commit 38e7007 pushed by TheLordME
October 28, 2024 08:25 38s master
master
October 28, 2024 08:25 38s
Optimize circuit examiner and revert CD (#6805) Check for merge conflicts #3197: Commit 15f4b9a pushed by TheLordME
October 27, 2024 17:04 37s master
master
October 27, 2024 17:04 37s
[s] fixes client security autobans (#6820) Check for merge conflicts #3196: Commit 7c4e7d8 pushed by TheLordME
October 27, 2024 16:39 36s master
master
October 27, 2024 16:39 36s
makes the SM delam chamber not a pipe bomb (#6818) Check for merge conflicts #3195: Commit b580491 pushed by TheLordME
October 27, 2024 16:37 37s master
master
October 27, 2024 16:37 37s