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,993 workflow runs
1,993 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Finish unfinished sentries (#16895) Check for merge conflicts #10079: Commit e4dadf2 pushed by Lumipharon
January 20, 2025 23:14 1h 4m 57s master
master
January 20, 2025 23:14 1h 4m 57s
Gibbing Particles and Sound (#16927) Check for merge conflicts #10078: Commit d7e910e pushed by Lumipharon
January 20, 2025 23:10 1h 0m 24s master
master
January 20, 2025 23:10 1h 0m 24s
Fixes dchat runechat only showing for the owner (#16943) Check for merge conflicts #10077: Commit 99888ac pushed by Lumipharon
January 20, 2025 23:07 1h 2m 35s master
master
January 20, 2025 23:07 1h 2m 35s
Adds offsettable tank turrets (#16939) Check for merge conflicts #10076: Commit 5a769f9 pushed by Lumipharon
January 20, 2025 23:06 57m 18s master
master
January 20, 2025 23:06 57m 18s
Regular webbing storage fix and adds comments to storage.dm (#16938) Check for merge conflicts #10075: Commit 8ecd3f9 pushed by Lumipharon
January 20, 2025 23:04 30m 44s master
master
January 20, 2025 23:04 30m 44s
Ports tg Block Movement keybind (#16933) Check for merge conflicts #10074: Commit 9ef37b3 pushed by TiviPlus
January 20, 2025 22:38 7m 45s master
master
January 20, 2025 22:38 7m 45s
Drones can now use (slightly) more abilities while mounted (#16947) Check for merge conflicts #10073: Commit ac0580e pushed by TiviPlus
January 20, 2025 21:59 36m 19s master
master
January 20, 2025 21:59 36m 19s
Vali healing changes (#16929) Check for merge conflicts #10072: Commit 904ece6 pushed by TiviPlus
January 20, 2025 21:56 20m 37s master
master
January 20, 2025 21:56 20m 37s
Add stat tracking to acid maw and jaw (#16945) Check for merge conflicts #10071: Commit ecd5822 pushed by TiviPlus
January 20, 2025 21:46 2m 25s master
master
January 20, 2025 21:46 2m 25s
Custom squad radio fix (#16948) Check for merge conflicts #10070: Commit 9dcb6ba pushed by TiviPlus
January 20, 2025 21:44 3m 24s master
master
January 20, 2025 21:44 3m 24s
Campaign LTAAP buff (#16949) Check for merge conflicts #10069: Commit bd58726 pushed by TiviPlus
January 20, 2025 21:42 3m 48s master
master
January 20, 2025 21:42 3m 48s
Adds loki and thor armor modules (#16878) Check for merge conflicts #10068: Commit 17fd0d0 pushed by Lumipharon
January 20, 2025 02:34 11m 58s master
master
January 20, 2025 02:34 11m 58s
Minion Maw ammo (#16940) Check for merge conflicts #10067: Commit 5898b5c pushed by Lumipharon
January 19, 2025 23:01 1m 25s master
master
January 19, 2025 23:01 1m 25s
Fix mech explosion being on del (#16942) Check for merge conflicts #10066: Commit efd5cf2 pushed by Lumipharon
January 19, 2025 22:59 1m 10s master
master
January 19, 2025 22:59 1m 10s
Fixes being able to tear up empty space (#16944) Check for merge conflicts #10065: Commit bed1359 pushed by Lumipharon
January 19, 2025 22:58 38s master
master
January 19, 2025 22:58 38s
Adds big tails and twin drills hairstyles (#16936) Check for merge conflicts #10064: Commit e0282f7 pushed by Kuro020
January 19, 2025 05:05 7m 26s master
master
January 19, 2025 05:05 7m 26s
Disables Wraith (#16918) Check for merge conflicts #10063: Commit 7514522 pushed by TiviPlus
January 18, 2025 19:50 3m 32s master
master
January 18, 2025 19:50 3m 32s
Jetpack exploit fix (#16935) Check for merge conflicts #10062: Commit 6109336 pushed by TiviPlus
January 18, 2025 09:15 1m 36s master
master
January 18, 2025 09:15 1m 36s
Adds .41 AE and squash head ammo packets back to the valhalla and cra… Check for merge conflicts #10061: Commit 964a9ba pushed by TiviPlus
January 18, 2025 09:14 36s master
master
January 18, 2025 09:14 36s
Fire Immunity = Pyrogen Melting Stacks Immunity (#16928) Check for merge conflicts #10060: Commit fddf3c9 pushed by TiviPlus
January 18, 2025 09:14 37s master
master
January 18, 2025 09:14 37s
APC can now use all tank secondaries (#16920) Check for merge conflicts #10059: Commit dd6136f pushed by Kuro020
January 18, 2025 01:51 35s master
master
January 18, 2025 01:51 35s
Makes all Prison Station metal ceilings into glass ceilings (and anot… Check for merge conflicts #10058: Commit 967d463 pushed by TiviPlus
January 17, 2025 19:19 27m 20s master
master
January 17, 2025 19:19 27m 20s
General psi structure grammar/spelling/wording (#16924) Check for merge conflicts #10057: Commit f20ff7d pushed by TiviPlus
January 17, 2025 19:18 12m 12s master
master
January 17, 2025 19:18 12m 12s
Crew monitor fix (#16921) Check for merge conflicts #10056: Commit a754dbc pushed by TiviPlus
January 17, 2025 19:16 3m 39s master
master
January 17, 2025 19:16 3m 39s
fix admin VV "Set Species" (#16926) Check for merge conflicts #10055: Commit e271e75 pushed by TiviPlus
January 17, 2025 19:15 2m 48s master
master
January 17, 2025 19:15 2m 48s