Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
6,424 workflow run results
6,424 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

hotfixes opendream download script Check for merge conflicts #19004: Commit 5e71dc6 pushed by harryob
January 25, 2024 22:32 2m 14s master
master
January 25, 2024 22:32 2m 14s
refactor : turn some "# and use the proper define from colour.dm for 21 files. Check for merge conflicts #19003: Pull request #5553 synchronize by harryob
January 25, 2024 22:30 11s
January 25, 2024 22:30 11s
hotfix for opendream killing tags Check for merge conflicts #19002: Commit b570660 pushed by harryob
January 25, 2024 22:30 2m 12s master
master
January 25, 2024 22:30 2m 12s
refactor : turn some "# and use the proper define from colour.dm for 21 files. Check for merge conflicts #19001: Pull request #5553 ready_for_review by Huffie56
January 25, 2024 21:05 11s
January 25, 2024 21:05 11s
refactor : turn some "# and use the proper define from colour.dm for 21 files. Check for merge conflicts #19000: Pull request #5553 opened by Huffie56
January 25, 2024 20:48 14s
January 25, 2024 20:48 14s
Fixes xeno tunnel tracking Check for merge conflicts #18999: Pull request #5536 synchronize by SabreML
January 25, 2024 19:43 12s
January 25, 2024 19:43 12s
Adds procs for applying root (immobilise) Check for merge conflicts #18998: Pull request #5551 synchronize by Birdtalon
January 25, 2024 19:02 13s
January 25, 2024 19:02 13s
reduces effects of impact ammo with range, proof of concept numbers can be adjusted Check for merge conflicts #18997: Pull request #5552 synchronize by cuberound
January 25, 2024 18:59 12s
January 25, 2024 18:59 12s
Finishes #5128 (Paygrade defines) & Fixes Syndie ID (#5260) Check for merge conflicts #18996: Commit 7830684 pushed by github-merge-queue bot
January 25, 2024 18:41 4m 19s master
master
January 25, 2024 18:41 4m 19s
XM4 Armor Slowdown Change Check for merge conflicts #18995: Pull request #5548 synchronize by MobiusWon
January 25, 2024 17:18 15s
January 25, 2024 17:18 15s
Xeno strains refactor Check for merge conflicts #18994: Pull request #5542 ready_for_review by SabreML
January 25, 2024 16:48 14s
January 25, 2024 16:48 14s
reduces effects of impact ammo with range, proof of concept numbers can be adjusted Check for merge conflicts #18993: Pull request #5552 ready_for_review by cuberound
January 25, 2024 16:44 14s
January 25, 2024 16:44 14s
reduces effects of impact ammo with range, proof of concept numbers can be adjusted Check for merge conflicts #18992: Pull request #5552 opened by cuberound
January 25, 2024 16:44 13s
January 25, 2024 16:44 13s
Xeno strains refactor Check for merge conflicts #18991: Pull request #5542 synchronize by SabreML
January 25, 2024 16:30 12s
January 25, 2024 16:30 12s
Adds procs for applying root (immobilise) Check for merge conflicts #18990: Pull request #5551 opened by Birdtalon
January 25, 2024 13:58 14s
January 25, 2024 13:58 14s
Oppressor tailstab nerf Check for merge conflicts #18989: Pull request #5544 synchronize by Red-byte3D
January 25, 2024 13:09 11s
January 25, 2024 13:09 11s
Oppressor tailstab nerf Check for merge conflicts #18988: Pull request #5544 synchronize by Red-byte3D
January 25, 2024 13:08 9s
January 25, 2024 13:08 9s
Oppressor tailstab nerf Check for merge conflicts #18987: Pull request #5544 synchronize by Red-byte3D
January 25, 2024 13:06 11s
January 25, 2024 13:06 11s
Oppressor tailstab nerf Check for merge conflicts #18986: Pull request #5544 synchronize by Red-byte3D
January 25, 2024 13:02 14s
January 25, 2024 13:02 14s
Raises the amount of magazines in the MP handgun cases to 6 (#5528) Check for merge conflicts #18985: Commit 0606046 pushed by github-merge-queue bot
January 25, 2024 11:04 4m 16s master
master
January 25, 2024 11:04 4m 16s
turns oxygentank into fueltank fixes issue #5512 (#5524) Check for merge conflicts #18984: Commit 9c89e49 pushed by github-merge-queue bot
January 25, 2024 07:15 4m 18s master
master
January 25, 2024 07:15 4m 18s
Port TG Tooling Fix in MapMerge (#5527) Check for merge conflicts #18983: Commit fc82825 pushed by github-merge-queue bot
January 25, 2024 07:07 2m 16s master
master
January 25, 2024 07:07 2m 16s
XM4 Armor Slowdown Change Check for merge conflicts #18982: Pull request #5548 opened by MobiusWon
January 25, 2024 02:59 2m 13s
January 25, 2024 02:59 2m 13s
Deadchat no longer gets notified about tutorial facehuggers Check for merge conflicts #18981: Pull request #5546 opened by Contrabang
January 24, 2024 23:12 11s
January 24, 2024 23:12 11s
scouts can no longer attach 2x-4x scopes on their gun Check for merge conflicts #18980: Pull request #5545 opened by Red-byte3D
January 24, 2024 22:53 10s
January 24, 2024 22:53 10s