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
2,084 workflow runs
2,084 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Sentry exploit fix (#16695) Check for merge conflicts #9896: Commit ace25b1 pushed by TiviPlus
October 26, 2024 09:22 50s master
master
October 26, 2024 09:22 50s
Gorger Rebalances & Visual Effects (#16588) Check for merge conflicts #9895: Commit cc168f3 pushed by Kuro020
October 26, 2024 01:40 42s master
master
October 26, 2024 01:40 42s
Bluesummers Wreck Site [NEW MAP] (#16515) Check for merge conflicts #9894: Commit 7b1596c pushed by RipGrayson
October 25, 2024 17:14 40s master
master
October 25, 2024 17:14 40s
Xeno Fruit Effects on Death & New Power Fruit Death Effect (#16681) Check for merge conflicts #9893: Commit 9ec3d93 pushed by QualityVan
October 22, 2024 03:32 36s master
master
October 22, 2024 03:32 36s
boot knives for special factions (#16689) Check for merge conflicts #9892: Commit 63b8a30 pushed by Lumipharon
October 21, 2024 23:27 11m 31s master
master
October 21, 2024 23:27 11m 31s
Naming a tunnel no longer leaks your ckey (#16693) Check for merge conflicts #9891: Commit f7b90a7 pushed by Lumipharon
October 21, 2024 23:19 2m 23s master
master
October 21, 2024 23:19 2m 23s
Swaps unique action and jump default keybinds. (#16682) Check for merge conflicts #9890: Commit 0a057c9 pushed by Lumipharon
October 20, 2024 21:54 21m 46s master
master
October 20, 2024 21:54 21m 46s
Remove tunnel naming (#16683) Check for merge conflicts #9889: Commit 8530e5c pushed by Lumipharon
October 20, 2024 21:53 21m 46s master
master
October 20, 2024 21:53 21m 46s
Chainsaw fix (#16684) Check for merge conflicts #9888: Commit 8077dff pushed by Lumipharon
October 20, 2024 21:53 6m 31s master
master
October 20, 2024 21:53 6m 31s
Adds the ICC LVRT 'Fallow' vehicle. (#16597) Check for merge conflicts #9887: Commit be75feb pushed by TiviPlus
October 19, 2024 15:08 30m 49s master
master
October 19, 2024 15:08 30m 49s
Equip fix (#16661) Check for merge conflicts #9886: Commit 5de7bf3 pushed by TiviPlus
October 19, 2024 14:57 23m 37s master
master
October 19, 2024 14:57 23m 37s
Gives king sledge inmunity (#16652) Check for merge conflicts #9885: Commit df48e91 pushed by TiviPlus
October 19, 2024 14:57 23m 57s master
master
October 19, 2024 14:57 23m 57s
Sentry fix (#16667) Check for merge conflicts #9884: Commit 95e2adc pushed by TiviPlus
October 19, 2024 14:56 9m 14s master
master
October 19, 2024 14:56 9m 14s
Playsound improvements (#16611) Check for merge conflicts #9883: Commit 197b04d pushed by TiviPlus
October 19, 2024 14:55 8m 56s master
master
October 19, 2024 14:55 8m 56s
Plant Weeds Dynamically Shows Ability Cost (#16665) Check for merge conflicts #9882: Commit 6afd8a8 pushed by TiviPlus
October 19, 2024 14:55 1m 53s master
master
October 19, 2024 14:55 1m 53s
Chainsaw & Chainsword update and Add chainsaw to req (#16596) Check for merge conflicts #9881: Commit c26cc10 pushed by TiviPlus
October 19, 2024 14:50 3m 43s master
master
October 19, 2024 14:50 3m 43s
Sentry deploy fix (#16679) Check for merge conflicts #9880: Commit 0bd2bbe pushed by TiviPlus
October 17, 2024 22:00 34s master
master
October 17, 2024 22:00 34s
Synthetic crit now deals damage by limb (#16626) Check for merge conflicts #9879: Commit 4f4e607 pushed by Lumipharon
October 17, 2024 21:42 38s master
master
October 17, 2024 21:42 38s
Tank icon update (#16673) Check for merge conflicts #9878: Commit 4c2524d pushed by Kuro020
October 17, 2024 11:02 9m 24s master
master
October 17, 2024 11:02 9m 24s
minigun powerpack fixes (#16676) Check for merge conflicts #9877: Commit 33ded0f pushed by Kuro020
October 17, 2024 11:01 31s master
master
October 17, 2024 11:01 31s
Mech EMP buffs (#16677) Check for merge conflicts #9876: Commit 225a986 pushed by Kuro020
October 17, 2024 11:01 50s master
master
October 17, 2024 11:01 50s
Lower xeno ratio (#16572) Check for merge conflicts #9875: Commit 4c88c64 pushed by ivanmixo
October 17, 2024 08:27 33s master
master
October 17, 2024 08:27 33s
Deletes a duplicate hairstyle (#16671) Check for merge conflicts #9874: Commit b718b3d pushed by Lumipharon
October 15, 2024 21:54 47s master
master
October 15, 2024 21:54 47s
Makes grenades peak (#16666) Check for merge conflicts #9873: Commit fd0d71f pushed by TiviPlus
October 15, 2024 21:40 6m 25s master
master
October 15, 2024 21:40 6m 25s
Campaign: Secondary selection for loadouts (#16631) Check for merge conflicts #9872: Commit c62f229 pushed by TiviPlus
October 15, 2024 21:39 1m 22s master
master
October 15, 2024 21:39 1m 22s