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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Ravager can endure and rage in fog/dense objects (#16839) Check for merge conflicts #9996: Commit 3b2ec5c pushed by ivanmixo
December 25, 2024 14:20 2m 29s master
master
December 25, 2024 14:20 2m 29s
Redoes Kutjevo digsites (#16840) Check for merge conflicts #9995: Commit 5f6841e pushed by RipGrayson
December 24, 2024 21:36 42s master
master
December 24, 2024 21:36 42s
Re-Grow - limb regeneration for campaign (#16833) Check for merge conflicts #9994: Commit bd222c2 pushed by QualityVan
December 24, 2024 17:26 39s master
master
December 24, 2024 17:26 39s
Tac reload change/nerf (#16809) Check for merge conflicts #9993: Commit b16edc0 pushed by TiviPlus
December 22, 2024 22:45 14m 31s master
master
December 22, 2024 22:45 14m 31s
Campaign engie mat buff (#16835) Check for merge conflicts #9992: Commit a4a5a0b pushed by TiviPlus
December 22, 2024 22:44 15m 1s master
master
December 22, 2024 22:44 15m 1s
Increase scout cost in campaign (#16837) Check for merge conflicts #9991: Commit 57f1e65 pushed by TiviPlus
December 22, 2024 22:43 15m 39s master
master
December 22, 2024 22:43 15m 39s
Stealth fix (#16811) Check for merge conflicts #9990: Commit aa9ea95 pushed by TiviPlus
December 22, 2024 22:43 15m 58s master
master
December 22, 2024 22:43 15m 58s
Weed fix (#16832) Check for merge conflicts #9989: Commit 9ad0b03 pushed by TiviPlus
December 22, 2024 22:41 8m 10s master
master
December 22, 2024 22:41 8m 10s
Automatic TGS DMAPI Update (#16836) Check for merge conflicts #9988: Commit 7d02ca8 pushed by TiviPlus
December 22, 2024 22:40 9m 14s master
master
December 22, 2024 22:40 9m 14s
Replaces all instances of highdanger with userdanger, and updates tgu… Check for merge conflicts #9987: Commit 40b8df6 pushed by TiviPlus
December 22, 2024 22:39 37s master
master
December 22, 2024 22:39 37s
Radio TTS fix (#16829) Check for merge conflicts #9986: Commit 3ec9b01 pushed by TiviPlus
December 21, 2024 22:15 6m 19s master
master
December 21, 2024 22:15 6m 19s
Strappable fix (#16825) Check for merge conflicts #9985: Commit 4841cf0 pushed by ivanmixo
December 19, 2024 02:16 37s master
master
December 19, 2024 02:16 37s
Explosion shake tweak (#16814) Check for merge conflicts #9984: Commit 031b020 pushed by Kuro020
December 19, 2024 00:07 8m 56s master
master
December 19, 2024 00:07 8m 56s
Reduce Scout accuracy slightly (#16810) Check for merge conflicts #9983: Commit d36fdff pushed by Kuro020
December 19, 2024 00:07 39s master
master
December 19, 2024 00:07 39s
squad/Radio TTS fix (#16674) Check for merge conflicts #9982: Commit 1cdaf4b pushed by Kuro020
December 17, 2024 22:07 42s master
master
December 17, 2024 22:07 42s
Equip exploit fix (#16822) Check for merge conflicts #9981: Commit 25ad09f pushed by Lumipharon
December 17, 2024 21:36 12m 32s master
master
December 17, 2024 21:36 12m 32s
reverts kuro shrike speed nerf and also health buff (#16815) Check for merge conflicts #9980: Commit f317284 pushed by ivanmixo
December 17, 2024 16:10 38s master
master
December 17, 2024 16:10 38s
Replaces stalagmites on bluesummers (#16804) Check for merge conflicts #9979: Commit 0ec86e7 pushed by RipGrayson
December 17, 2024 03:50 34s master
master
December 17, 2024 03:50 34s
Xeno structure alert fixes (#16797) Check for merge conflicts #9978: Commit 9ef6652 pushed by TiviPlus
December 14, 2024 20:15 36s master
master
December 14, 2024 20:15 36s
Directional attacks won't hit ghosts (#16791) Check for merge conflicts #9977: Commit 0f73894 pushed by ivanmixo
December 13, 2024 11:11 35s master
master
December 13, 2024 11:11 35s
Outrider tad tweaks (#16805) Check for merge conflicts #9976: Commit dc9b04d pushed by Lumipharon
December 13, 2024 00:57 8m 4s master
master
December 13, 2024 00:57 8m 4s
Plasma ammo to req (#16794) Check for merge conflicts #9975: Commit f3b3fc6 pushed by Kuro020
December 12, 2024 21:07 30m 44s master
master
December 12, 2024 21:07 30m 44s
Psychic Shield: Targetted Reflection (Warlock Primo) (#16772) Check for merge conflicts #9974: Commit 5878845 pushed by Kuro020
December 12, 2024 21:06 6m 22s master
master
December 12, 2024 21:06 6m 22s
Leap layer fix (#16792) Check for merge conflicts #9973: Commit 115fb1b pushed by ivanmixo
December 12, 2024 20:44 4m 49s master
master
December 12, 2024 20:44 4m 49s
Tesla rifle can now load rechargables. (#16803) Check for merge conflicts #9972: Commit 6e91079 pushed by Lumipharon
December 12, 2024 20:42 6m 47s master
master
December 12, 2024 20:42 6m 47s