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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Updates roboticist survivor loadout (#16713) Check for merge conflicts #9911: Commit f848eea pushed by TiviPlus
October 31, 2024 10:37 1m 40s master
master
October 31, 2024 10:37 1m 40s
Dancer Praetorian Strain (#16542) Check for merge conflicts #9910: Commit 023b7b4 pushed by TiviPlus
October 31, 2024 10:34 3m 47s master
master
October 31, 2024 10:34 3m 47s
Chestbursting can now happen in EORD/Deathmatch (#16692) Check for merge conflicts #9909: Commit 959a310 pushed by TiviPlus
October 31, 2024 10:28 38s master
master
October 31, 2024 10:28 38s
Fix light break helper complaining about already broken lights (#16718) Check for merge conflicts #9908: Commit 81e37da pushed by Lumipharon
October 31, 2024 01:38 35s master
master
October 31, 2024 01:38 35s
Standard webbing can't hold powerpacks/powerbackpacks anymore (#16705) Check for merge conflicts #9907: Commit abb35f3 pushed by Lumipharon
October 29, 2024 21:44 2m 11s master
master
October 29, 2024 21:44 2m 11s
Signal improvements (#16709) Check for merge conflicts #9906: Commit 44fac8d pushed by TiviPlus
October 29, 2024 16:37 17m 32s master
master
October 29, 2024 16:37 17m 32s
Fixes skinks equipping C4 as a weapon (#16700) Check for merge conflicts #9905: Commit 0303962 pushed by TiviPlus
October 29, 2024 16:32 7m 52s master
master
October 29, 2024 16:32 7m 52s
Adds Plasma SMG description (#16704) Check for merge conflicts #9904: Commit 382b0e4 pushed by TiviPlus
October 29, 2024 16:32 8m 6s master
master
October 29, 2024 16:32 8m 6s
Fixes crusher "anihilate" typo (#16707) Check for merge conflicts #9903: Commit a5aee33 pushed by TiviPlus
October 29, 2024 16:29 10m 13s master
master
October 29, 2024 16:29 10m 13s
Gib code improvements (#16708) Check for merge conflicts #9902: Commit 02a1bd7 pushed by TiviPlus
October 29, 2024 16:29 9m 48s master
master
October 29, 2024 16:29 9m 48s
keyloop microopt (#16710) Check for merge conflicts #9901: Commit 5f428d9 pushed by TiviPlus
October 29, 2024 16:28 38s master
master
October 29, 2024 16:28 38s
Changes Xeno to Marine ratio back to 2.46 (#16697) Check for merge conflicts #9900: Commit d1847ea pushed by Lumipharon
October 28, 2024 20:39 36s master
master
October 28, 2024 20:39 36s
Xenomorphs can walk to ignore portals (#16655) Check for merge conflicts #9899: Commit 2851228 pushed by Kuro020
October 27, 2024 15:15 34s master
master
October 27, 2024 15:15 34s
Nade message fix (#16685) Check for merge conflicts #9898: Commit 2c22a89 pushed by TiviPlus
October 26, 2024 09:30 38m 34s master
master
October 26, 2024 09:30 38m 34s
Melee mech fix (#16690) Check for merge conflicts #9897: Commit 68ced64 pushed by TiviPlus
October 26, 2024 09:26 18m 0s master
master
October 26, 2024 09:26 18m 0s
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