Skip to content

Actions: tgstation/TerraGov-Marine-Corps

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,988 workflow runs
1,988 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Larva Queue: Now while playing Minions (#14262) Check for merge conflicts #8181: Commit cb7c4b4 pushed by TiviPlus
November 3, 2023 09:28 56s master
master
November 3, 2023 09:28 56s
1u instead of 3 (#14323) Check for merge conflicts #8180: Commit fce5be2 pushed by TiviPlus
November 3, 2023 09:23 1m 5s master
master
November 3, 2023 09:23 1m 5s
Medical emissives (#14335) Check for merge conflicts #8179: Commit 10a6e74 pushed by TiviPlus
November 3, 2023 09:21 1m 18s master
master
November 3, 2023 09:21 1m 18s
Fixes slouch hat not having on mob sprite. (#14327) Check for merge conflicts #8178: Commit 206c26c pushed by TiviPlus
November 3, 2023 09:21 48s master
master
November 3, 2023 09:21 48s
Forgot to add syringe case to valhalla (#14355) Check for merge conflicts #8177: Commit 020469e pushed by TiviPlus
November 3, 2023 09:19 1m 8s master
master
November 3, 2023 09:19 1m 8s
power monitor sprite (#14331) Check for merge conflicts #8176: Commit 101848f pushed by TiviPlus
November 3, 2023 09:18 47s master
master
November 3, 2023 09:18 47s
squad management computer fix (#14348) Check for merge conflicts #8175: Commit 9309a5f pushed by TiviPlus
November 3, 2023 09:18 57s master
master
November 3, 2023 09:18 57s
drop pod computer fix (#14356) Check for merge conflicts #8174: Commit eb767c6 pushed by TiviPlus
November 3, 2023 09:17 48s master
master
November 3, 2023 09:17 48s
ASAT capture mission (#14359) Check for merge conflicts #8173: Commit 93744d0 pushed by TiviPlus
November 3, 2023 09:16 1m 1s master
master
November 3, 2023 09:16 1m 1s
Warlock push resistance (#14334) Check for merge conflicts #8172: Commit d12252f pushed by Lumipharon
November 2, 2023 21:45 48s master
master
November 2, 2023 21:45 48s
No more BIG RED Crash (#14341) Check for merge conflicts #8171: Commit 203a1f5 pushed by Lumipharon
November 2, 2023 20:29 38s master
master
November 2, 2023 20:29 38s
map is gone, define begone (#14342) Check for merge conflicts #8170: Commit 872d9c8 pushed by Lumipharon
November 2, 2023 20:29 40s master
master
November 2, 2023 20:29 40s
initial commit (#14349) Check for merge conflicts #8169: Commit 2d134c5 pushed by Lumipharon
November 2, 2023 20:17 40s master
master
November 2, 2023 20:17 40s
moves the carps (#14347) Check for merge conflicts #8168: Commit de12c17 pushed by RipGrayson
November 2, 2023 01:11 57s master
master
November 2, 2023 01:11 57s
changes sprites (#14353) Check for merge conflicts #8167: Commit 1171063 pushed by Kuro020
November 2, 2023 01:08 49s master
master
November 2, 2023 01:08 49s
NT base rescue mission (#14320) Check for merge conflicts #8166: Commit 77e1e1a pushed by RipGrayson
October 31, 2023 22:48 46s master
master
October 31, 2023 22:48 46s
multitool in tool vendor (#14329) Check for merge conflicts #8165: Commit 4771eaf pushed by ivanmixo
October 31, 2023 22:44 54s master
master
October 31, 2023 22:44 54s
Nerfs Behemoth's health, nerfs Primal Wrath gain (#14333) Check for merge conflicts #8164: Commit 96351f1 pushed by Lumipharon
October 31, 2023 21:47 41s master
master
October 31, 2023 21:47 41s
Various minor Behemoth tweaks (and a fix) (#14332) Check for merge conflicts #8163: Commit 3ba35d6 pushed by Lumipharon
October 31, 2023 21:47 55s master
master
October 31, 2023 21:47 55s
more throwbug fixes (#14306) Check for merge conflicts #8162: Commit 7a90650 pushed by TiviPlus
October 31, 2023 09:47 8m 55s master
master
October 31, 2023 09:47 8m 55s
Adds syringe case to NTMED (#14318) Check for merge conflicts #8161: Commit 588aaa3 pushed by TiviPlus
October 31, 2023 09:44 11m 2s master
master
October 31, 2023 09:44 11m 2s
https://tenor.com/view/cat-post-this-post-this-cat-my-cat-post-cat-gi… Check for merge conflicts #8160: Commit 944d1b5 pushed by TiviPlus
October 31, 2023 09:42 1m 41s master
master
October 31, 2023 09:42 1m 41s
micro v34 adjustment (#14330) Check for merge conflicts #8159: Commit 591f7b3 pushed by TiviPlus
October 31, 2023 09:41 1m 20s master
master
October 31, 2023 09:41 1m 20s
invis sprite (#14313) Check for merge conflicts #8158: Commit ba9f778 pushed by TiviPlus
October 31, 2023 09:40 2m 11s master
master
October 31, 2023 09:40 2m 11s
Updates Earth Riser Desc (#14328) Check for merge conflicts #8157: Commit d6eae98 pushed by TiviPlus
October 31, 2023 09:40 53s master
master
October 31, 2023 09:40 53s
ProTip! You can narrow down the results and go further in time using created:<2023-10-31 or the other filters available.