Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
8,303 workflow run results
8,303 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

XM4 Armor Integral Motion Detector Check for merge conflicts #19577: Pull request #5586 synchronize by MobiusWon
February 12, 2024 23:41 10s
February 12, 2024 23:41 10s
Reverts flare buff from #4229 Check for merge conflicts #19576: Pull request #5709 opened by Mister-moon1
February 12, 2024 22:48 2m 41s
February 12, 2024 22:48 2m 41s
Changelog icon size fix (tgfont updates port) Check for merge conflicts #19575: Pull request #5708 opened by SabreML
February 12, 2024 22:47 13s
February 12, 2024 22:47 13s
fixes drop pouch not being given to vendors and makes it scale the same as base webbing Check for merge conflicts #19574: Pull request #5706 synchronize by Red-byte3D
February 12, 2024 21:34 18s
February 12, 2024 21:34 18s
Thour tiny tutorial tweaks (and a unit test) (#5695) Check for merge conflicts #19573: Commit 153b7cf pushed by github-merge-queue bot
February 12, 2024 21:17 4m 13s master
master
February 12, 2024 21:17 4m 13s
fixes drop pouch not being given to vendors and makes it scale the same as base webbing Check for merge conflicts #19572: Pull request #5706 synchronize by Red-byte3D
February 12, 2024 21:04 9s
February 12, 2024 21:04 9s
fixes drop pouch not being given to vendors and makes it scale the same as base webbing Check for merge conflicts #19571: Pull request #5706 opened by Red-byte3D
February 12, 2024 20:56 14s
February 12, 2024 20:56 14s
(WIP) Yautja Weapon Gimmicks, Round Two Check for merge conflicts #19570: Pull request #5392 synchronize by realforest2001
February 12, 2024 20:28 11s
February 12, 2024 20:28 11s
Update to some ultra ancient sprites Check for merge conflicts #19569: Pull request #5678 synchronize by Blundir
February 12, 2024 19:28 16s
February 12, 2024 19:28 16s
(WIP) Yautja Weapon Gimmicks, Round Two Check for merge conflicts #19568: Pull request #5392 synchronize by realforest2001
February 12, 2024 18:35 10s
February 12, 2024 18:35 10s
Xeno strains refactor Check for merge conflicts #19567: Pull request #5542 synchronize by SabreML
February 12, 2024 18:30 11s
February 12, 2024 18:30 11s
XM4 Armor Integral Motion Detector Check for merge conflicts #19566: Pull request #5586 synchronize by MobiusWon
February 12, 2024 14:49 13s
February 12, 2024 14:49 13s
handle permanent and sticky bans in database Check for merge conflicts #19565: Pull request #5628 synchronize by harryob
February 12, 2024 11:16 11s
February 12, 2024 11:16 11s
handle permanent and sticky bans in database Check for merge conflicts #19564: Pull request #5628 synchronize by harryob
February 12, 2024 11:01 13s
February 12, 2024 11:01 13s
Thour tiny tutorial tweaks (and a unit test) Check for merge conflicts #19563: Pull request #5695 synchronize by SabreML
February 12, 2024 10:13 12s
February 12, 2024 10:13 12s
Allows the MOU53 to be stored in the shotgun scabbard. Check for merge conflicts #19562: Pull request #5705 opened by Staykeu
February 12, 2024 05:23 11s
February 12, 2024 05:23 11s
Reagent tanks can now be dragged faster Check for merge conflicts #19561: Pull request #5704 opened by iloveloopers
February 12, 2024 05:06 13s
February 12, 2024 05:06 13s
XM4 Armor Integral Motion Detector Check for merge conflicts #19560: Pull request #5586 synchronize by MobiusWon
February 12, 2024 02:49 11s
February 12, 2024 02:49 11s
Dropship turf direction sprites Check for merge conflicts #19559: Pull request #3642 ready_for_review by mullenpaul
February 12, 2024 01:25 10s
February 12, 2024 01:25 10s
Refactor the file watercloset.dm leaving toilet code in it and moving… Check for merge conflicts #19558: Commit c5c89b8 pushed by github-merge-queue bot
February 12, 2024 01:20 4m 14s master
master
February 12, 2024 01:20 4m 14s
Adds One ACCESSORY ONLY Slot for Helmets (#5573) Check for merge conflicts #19557: Commit ebafd17 pushed by github-merge-queue bot
February 12, 2024 01:01 4m 15s master
master
February 12, 2024 01:01 4m 15s
removes dead tor code (#5629) Check for merge conflicts #19556: Commit dde13a9 pushed by github-merge-queue bot
February 12, 2024 00:45 4m 13s master
master
February 12, 2024 00:45 4m 13s
Revive Lesser Drone and Facehugger temporary communication restrictions Check for merge conflicts #19555: Pull request #5688 synchronize by Drulikar
February 12, 2024 00:31 12s
February 12, 2024 00:31 12s
Adds One ACCESSORY ONLY Slot for Helmets Check for merge conflicts #19554: Pull request #5573 synchronize by Staykeu
February 12, 2024 00:05 11s
February 12, 2024 00:05 11s
Dynamic price for omnisentryguns round 3 Check for merge conflicts #19553: Pull request #5702 synchronize by cuberound
February 11, 2024 22:23 9s
February 11, 2024 22:23 9s