Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
5,255 workflow run results
5,255 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Survivor Job Additions + Some Minor Fixes Check for merge conflicts #16537: Pull request #4956 opened by BadAtThisGame302
November 18, 2023 18:38 12s
November 18, 2023 18:38 12s
Starts refactoring Xenomorph.dm and other xenocode. Check for merge conflicts #16536: Pull request #4941 ready_for_review by Birdtalon
November 18, 2023 13:38 13s
November 18, 2023 13:38 13s
Starts refactoring Xenomorph.dm and other xenocode. Check for merge conflicts #16535: Pull request #4941 synchronize by Birdtalon
November 18, 2023 13:17 12s
November 18, 2023 13:17 12s
Starts refactoring Xenomorph.dm and other xenocode. Check for merge conflicts #16534: Pull request #4941 synchronize by Birdtalon
November 18, 2023 13:01 14s
November 18, 2023 13:01 14s
Starts refactoring Xenomorph.dm and other xenocode. Check for merge conflicts #16533: Pull request #4941 synchronize by Birdtalon
November 18, 2023 12:54 10s
November 18, 2023 12:54 10s
Removes a couple of istype(src) & unused proc Check for merge conflicts #16532: Pull request #4955 opened by Birdtalon
November 18, 2023 12:23 11s
November 18, 2023 12:23 11s
Starts refactoring Xenomorph.dm and other xenocode. Check for merge conflicts #16531: Pull request #4941 synchronize by Birdtalon
November 18, 2023 09:36 2m 16s
November 18, 2023 09:36 2m 16s
Automatic TGS DMAPI Update Check for merge conflicts #16530: Pull request #4954 opened by cm13-github
November 17, 2023 23:33 11s
November 17, 2023 23:33 11s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16529: Pull request #4940 synchronize by harryob
November 17, 2023 23:12 1m 59s
November 17, 2023 23:12 1m 59s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16528: Pull request #4940 synchronize by harryob
November 17, 2023 23:08 28s
November 17, 2023 23:08 28s
Adds drawing to tacmaps (#4475) Check for merge conflicts #16527: Commit 86f2489 pushed by github-merge-queue bot
November 17, 2023 23:06 4m 14s master
master
November 17, 2023 23:06 4m 14s
Hivecores perform multiple spawns at once Check for merge conflicts #16526: Pull request #4953 opened by Drulikar
November 17, 2023 22:58 14s
November 17, 2023 22:58 14s
Lesser Drones & Facehuggers can no longer speak Check for merge conflicts #16525: Pull request #4952 opened by 567Turtle
November 17, 2023 22:38 10s
November 17, 2023 22:38 10s
Fix med_hud_set_health runtime for xenomorphs Check for merge conflicts #16524: Pull request #4951 opened by Zonespace27
November 17, 2023 21:55 27s
November 17, 2023 21:55 27s
Experimental sniper runtime fix Check for merge conflicts #16523: Pull request #4950 opened by Zonespace27
November 17, 2023 21:51 10s
November 17, 2023 21:51 10s
Fix null parent crash in radial slice clicked() Check for merge conflicts #16522: Pull request #4949 opened by Zonespace27
November 17, 2023 21:44 10s
November 17, 2023 21:44 10s
Fix issue with null hud_used in stop_tracking_resin_mark Check for merge conflicts #16521: Pull request #4948 opened by Zonespace27
November 17, 2023 21:41 13s
November 17, 2023 21:41 13s
Fix c4 deletion runtime Check for merge conflicts #16520: Pull request #4947 opened by Zonespace27
November 17, 2023 21:34 9s
November 17, 2023 21:34 9s
Fix jump-to-area runtime Check for merge conflicts #16519: Pull request #4946 opened by Zonespace27
November 17, 2023 21:29 12s
November 17, 2023 21:29 12s
Warrior: replace single letter vars & remove redundant code Check for merge conflicts #16518: Pull request #4921 synchronize by Birdtalon
November 17, 2023 18:19 11s
November 17, 2023 18:19 11s
Break Up Secure Storage LV-624: V2 Check for merge conflicts #16517: Pull request #4944 opened by Steelpoint
November 17, 2023 16:34 13s
November 17, 2023 16:34 13s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16516: Pull request #4940 synchronize by harryob
November 17, 2023 08:38 14s
November 17, 2023 08:38 14s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16515: Pull request #4940 synchronize by harryob
November 17, 2023 08:36 11s
November 17, 2023 08:36 11s
Admin Vehicles Fixes (#4912) Check for merge conflicts #16514: Commit 97b9dd2 pushed by github-merge-queue bot
November 17, 2023 08:23 4m 16s master
master
November 17, 2023 08:23 4m 16s
Add inactivity protection for mods (#4938) Check for merge conflicts #16513: Commit 1b3f85b pushed by github-merge-queue bot
November 17, 2023 07:51 4m 14s master
master
November 17, 2023 07:51 4m 14s