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

Uncraftable stunprods (#14071) Check for merge conflicts #7996: Commit aed2996 pushed by ivanmixo
October 5, 2023 07:22 52s master
master
October 5, 2023 07:22 52s
Egg Lay Description (#14074) Check for merge conflicts #7995: Commit 52834dc pushed by ivanmixo
October 5, 2023 07:22 1m 7s master
master
October 5, 2023 07:22 1m 7s
initial commit (#14078) Check for merge conflicts #7994: Commit 6e88e6a pushed by ivanmixo
October 5, 2023 07:21 1m 28s master
master
October 5, 2023 07:21 1m 28s
typo fix (#14067) Check for merge conflicts #7993: Commit 20ca282 pushed by Lumipharon
October 3, 2023 22:52 5m 46s master
master
October 3, 2023 22:52 5m 46s
Remove stuff that doesn't work on current MIN_COMPILER_VERSION (#14069) Check for merge conflicts #7992: Commit ac497e6 pushed by Lumipharon
October 3, 2023 22:52 4m 8s master
master
October 3, 2023 22:52 4m 8s
initial_commit (#14070) Check for merge conflicts #7991: Commit c4532c1 pushed by RipGrayson
October 3, 2023 17:49 48s master
master
October 3, 2023 17:49 48s
removes tier based weapon spawns from ground maps (#14055) Check for merge conflicts #7990: Commit 1539743 pushed by Lumipharon
October 2, 2023 19:46 58s master
master
October 2, 2023 19:46 58s
Updates Crest Toss' Description (#14066) Check for merge conflicts #7989: Commit 7d47209 pushed by Lumipharon
October 2, 2023 19:45 48s master
master
October 2, 2023 19:45 48s
Cleanup of device.dmi and items.dmi (#13989) Check for merge conflicts #7988: Commit 5889ce2 pushed by Lumipharon
October 2, 2023 18:56 46s master
master
October 2, 2023 18:56 46s
X-Ray Laser Rifle minor rebalance (#14062) Check for merge conflicts #7987: Commit 2b99ecd pushed by ivanmixo
October 2, 2023 13:35 50s master
master
October 2, 2023 13:35 50s
Fix a misplaced admin verb (#14064) Check for merge conflicts #7986: Commit 88b26ea pushed by ivanmixo
October 2, 2023 13:34 49s master
master
October 2, 2023 13:34 49s
Fix a Big Red modular with incorrect height (#14056) Check for merge conflicts #7985: Commit a831945 pushed by TiviPlus
October 1, 2023 12:15 45s master
master
October 1, 2023 12:15 45s
Quick laser swap fix (#14063) Check for merge conflicts #7984: Commit 84c295b pushed by spookydonut
October 1, 2023 10:58 48s master
master
October 1, 2023 10:58 48s
Fixes Slumbridge having non-metal producting variations of objects (#… Check for merge conflicts #7983: Commit a788736 pushed by Lumipharon
September 30, 2023 02:37 58m 7s master
master
September 30, 2023 02:37 58m 7s
Fix mantis ravage keybind not working when not selected (#14050) Check for merge conflicts #7982: Commit db525ff pushed by Lumipharon
September 30, 2023 02:36 56m 18s master
master
September 30, 2023 02:36 56m 18s
initial_commit (#14052) Check for merge conflicts #7981: Commit f9c183f pushed by Lumipharon
September 30, 2023 02:36 56m 28s master
master
September 30, 2023 02:36 56m 28s
Fix missing empty sprite for 5.56mm ammo box (#14051) Check for merge conflicts #7980: Commit f70cbbe pushed by Lumipharon
September 30, 2023 02:36 56m 20s master
master
September 30, 2023 02:36 56m 20s
Fixes admin wall deletions (#14045) Check for merge conflicts #7979: Commit 10570eb pushed by Lumipharon
September 30, 2023 02:35 49m 29s master
master
September 30, 2023 02:35 49m 29s
Restoration of acid wall sprite + layer tweak (#14047) Check for merge conflicts #7978: Commit 8ff10d7 pushed by Lumipharon
September 30, 2023 02:35 45m 15s master
master
September 30, 2023 02:35 45m 15s
Fix drawing on minimap tablets (#14046) Check for merge conflicts #7977: Commit 8076f0e pushed by Lumipharon
September 30, 2023 02:34 15m 4s master
master
September 30, 2023 02:34 15m 4s
Fix backpack prefs overriding job backpacks (#14005) Check for merge conflicts #7976: Commit 6aec7d3 pushed by Lumipharon
September 28, 2023 22:18 49s master
master
September 28, 2023 22:18 49s
fixes run exploit (#14044) Check for merge conflicts #7975: Commit 67e2404 pushed by ivanmixo
September 28, 2023 21:18 2m 6s master
master
September 28, 2023 21:18 2m 6s
Update ammo_datums.dm (#14042) Check for merge conflicts #7974: Commit 9bbad36 pushed by TiviPlus
September 28, 2023 21:05 50s master
master
September 28, 2023 21:05 50s
Xeno Ranks (#14038) Check for merge conflicts #7973: Commit f094b52 pushed by TiviPlus
September 28, 2023 20:59 48s master
master
September 28, 2023 20:59 48s
restoration of after message bubble (#14022) Check for merge conflicts #7972: Commit 92756e0 pushed by Lumipharon
September 28, 2023 20:42 1m 16s master
master
September 28, 2023 20:42 1m 16s
ProTip! You can narrow down the results and go further in time using created:<2023-09-28 or the other filters available.