Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,166 workflow run results
4,166 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

qol add a new section to role squad vendors called binoculars except specialist. Check for merge conflicts #16704: Pull request #5000 ready_for_review by Huffie56
November 22, 2023 11:28 12s
November 22, 2023 11:28 12s
qol standartize how IO vendor is organized to be more in line with how other marine vendor are organize. Check for merge conflicts #16703: Pull request #4999 ready_for_review by Huffie56
November 22, 2023 11:26 1m 20s
November 22, 2023 11:26 1m 20s
qol add a new section to role squad vendors called binoculars except specialist. Check for merge conflicts #16702: Pull request #5000 opened by Huffie56
November 22, 2023 11:25 12s
November 22, 2023 11:25 12s
qol standartize how IO vendor is organized to be more in line with how other marine vendor are organize. Check for merge conflicts #16701: Pull request #4999 opened by Huffie56
November 22, 2023 10:50 11s
November 22, 2023 10:50 11s
Adds Pizza to Requisitions Check for merge conflicts #16700: Pull request #4998 opened by HeresKozmos
November 22, 2023 10:30 13s
November 22, 2023 10:30 13s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #16699: Pull request #4586 synchronize by Huffie56
November 22, 2023 08:50 14s
November 22, 2023 08:50 14s
LV624 Fog Removal + River Change V2 Check for merge conflicts #16698: Pull request #4997 opened by Steelpoint
November 22, 2023 06:52 12s
November 22, 2023 06:52 12s
Brown Gloves/Boots Surplus Vendors Check for merge conflicts #16697: Pull request #4996 opened by 567Turtle
November 22, 2023 04:36 11s
November 22, 2023 04:36 11s
Break Up Secure Storage LV-624: V2 (#4944) Check for merge conflicts #16696: Commit 8f5e5e1 pushed by github-merge-queue bot
November 22, 2023 03:45 4m 18s master
master
November 22, 2023 03:45 4m 18s
Bureau du commandant - CO office (#4827) Check for merge conflicts #16695: Commit ed3628e pushed by github-merge-queue bot
November 22, 2023 03:33 4m 18s master
master
November 22, 2023 03:33 4m 18s
Adds external webbing vest to the IO's vendor as an alternative to the service jacket Check for merge conflicts #16694: Pull request #4963 synchronize by kirieee
November 22, 2023 02:18 11s
November 22, 2023 02:18 11s
Match Unlock Time in Nuke Timelock Message with Nuke Techtree Description Check for merge conflicts #16693: Pull request #4987 synchronize by Sort1eEnMer
November 22, 2023 02:06 13s
November 22, 2023 02:06 13s
Dropship sidedoors Check for merge conflicts #16692: Pull request #4995 opened by Doubleumc
November 22, 2023 02:04 14s
November 22, 2023 02:04 14s
Hivecores perform multiple spawns at once (#4953) Check for merge conflicts #16691: Commit eeee374 pushed by github-merge-queue bot
November 22, 2023 01:28 4m 15s master
master
November 22, 2023 01:28 4m 15s
Removes a couple of istype(src) & unused proc (#4955) Check for merge conflicts #16690: Commit e7d3ce0 pushed by github-merge-queue bot
November 22, 2023 01:09 4m 17s master
master
November 22, 2023 01:09 4m 17s
Fix macro_set index out of range bug (#4972) Check for merge conflicts #16689: Commit b3d63e0 pushed by github-merge-queue bot
November 22, 2023 01:01 2m 14s master
master
November 22, 2023 01:01 2m 14s
Makes Thunderdome Floor Explosion-Proof Check for merge conflicts #16688: Pull request #4994 opened by fira
November 22, 2023 00:46 13s
November 22, 2023 00:46 13s
Bureau du commandant - CO office Check for merge conflicts #16687: Pull request #4827 synchronize by LC4492
November 22, 2023 00:06 12s
November 22, 2023 00:06 12s
The return of the extra van sprites Check for merge conflicts #16686: Pull request #4993 synchronize by silencer-pl
November 21, 2023 23:07 10s
November 21, 2023 23:07 10s
The return of the extra van sprites Check for merge conflicts #16685: Pull request #4993 synchronize by silencer-pl
November 21, 2023 22:55 6m 20s
November 21, 2023 22:55 6m 20s
Greps for missing arg in to_chat & fixes several cases (#4971) Check for merge conflicts #16684: Commit d644b6f pushed by github-merge-queue bot
November 21, 2023 22:51 12m 0s master
master
November 21, 2023 22:51 12m 0s
The return of the extra van sprites Check for merge conflicts #16683: Pull request #4993 synchronize by silencer-pl
November 21, 2023 22:42 6m 48s
November 21, 2023 22:42 6m 48s
The return of the extra van sprites Check for merge conflicts #16682: Pull request #4993 synchronize by silencer-pl
November 21, 2023 22:41 3m 57s
November 21, 2023 22:41 3m 57s
Adds external webbing vest to the IO's vendor as an alternative to the service jacket Check for merge conflicts #16681: Pull request #4963 synchronize by kirieee
November 21, 2023 22:36 8m 24s
November 21, 2023 22:36 8m 24s
Adds external webbing vest to the IO's vendor as an alternative to the service jacket Check for merge conflicts #16680: Pull request #4963 synchronize by kirieee
November 21, 2023 22:36 10m 0s
November 21, 2023 22:36 10m 0s