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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds "Toggle Health Scan" verb to spectators (#17037) Check for merge conflicts #10145: Commit 714a196 pushed by TiviPlus
February 7, 2025 18:18 36s master
master
February 7, 2025 18:18 36s
disposable nerf (#17040) Check for merge conflicts #10144: Commit 41d4ca9 pushed by Kuro020
February 6, 2025 23:34 35s master
master
February 6, 2025 23:34 35s
Removed 2nd pistol seasonal from the game (#17039) Check for merge conflicts #10143: Commit ef6c7be pushed by Kuro020
February 6, 2025 23:33 45s master
master
February 6, 2025 23:33 45s
Fix outfits missing their holster contents (#17003) Check for merge conflicts #10142: Commit b926546 pushed by TiviPlus
February 6, 2025 12:48 38s master
master
February 6, 2025 12:48 38s
fix jaw stat tracking (#16982) Check for merge conflicts #10141: Commit 486bb91 pushed by TiviPlus
February 6, 2025 12:05 36s master
master
February 6, 2025 12:05 36s
Warlock no longer immobilized during Psyblast (#16966) Check for merge conflicts #10140: Commit ccb8de7 pushed by TiviPlus
February 4, 2025 08:50 18m 14s master
master
February 4, 2025 08:50 18m 14s
Some LOOC/Mentor-related tweaks (#16969) Check for merge conflicts #10139: Commit aabb450 pushed by TiviPlus
February 4, 2025 08:29 2m 37s master
master
February 4, 2025 08:29 2m 37s
Vendors now vend the item into your selected hand (#17008) Check for merge conflicts #10138: Commit 03171a7 pushed by TiviPlus
February 4, 2025 08:24 1m 29s master
master
February 4, 2025 08:24 1m 29s
Fixes some modular armor descriptions inaccurately stating the amount… Check for merge conflicts #10137: Commit df158db pushed by TiviPlus
February 4, 2025 08:23 56s master
master
February 4, 2025 08:23 56s
Armour module style touchups (#17026) Check for merge conflicts #10136: Commit e89d173 pushed by TiviPlus
February 4, 2025 08:18 5m 26s master
master
February 4, 2025 08:18 5m 26s
Hive screen no longer shows strains (#17029) Check for merge conflicts #10135: Commit 7d350cc pushed by TiviPlus
February 4, 2025 08:13 40s master
master
February 4, 2025 08:13 40s
Fix "Toggle Seethrough" toggle being lost when gaining primo (#17023) Check for merge conflicts #10134: Commit 44aff84 pushed by TiviPlus
February 4, 2025 08:12 43s master
master
February 4, 2025 08:12 43s
Fix changelog (#17032) Check for merge conflicts #10133: Commit 2044ac2 pushed by Lumipharon
February 4, 2025 02:36 52s master
master
February 4, 2025 02:36 52s
Replaces plat miner in south of ice colony for a phoron one. (#17019) Check for merge conflicts #10132: Commit bb8e5ba pushed by RipGrayson
February 3, 2025 20:32 7m 0s master
master
February 3, 2025 20:32 7m 0s
Give shipside medical an overwatch console (#17011) Check for merge conflicts #10131: Commit 6fda8fe pushed by RipGrayson
February 3, 2025 20:32 58s master
master
February 3, 2025 20:32 58s
Nerf: Sizzler Caste firerate (#17016) Check for merge conflicts #10130: Commit 57f27bf pushed by Kuro020
February 3, 2025 20:04 1m 56s master
master
February 3, 2025 20:04 1m 56s
Adds death on crit trait (supersoldiers stim and robot fix) (#16984) Check for merge conflicts #10129: Commit 0c0aa97 pushed by Kuro020
February 3, 2025 20:01 36s master
master
February 3, 2025 20:01 36s
Adds Vertical Grip to MG-27 and MG-60. (#17022) Check for merge conflicts #10128: Commit 596bdf2 pushed by Kuro020
February 2, 2025 17:54 37s master
master
February 2, 2025 17:54 37s
Revert "New Miner Sprites" (#17020) Check for merge conflicts #10127: Commit 0239b38 pushed by Kuro020
February 2, 2025 17:22 36s master
master
February 2, 2025 17:22 36s
Hive status GUI is now wider (#17018) Check for merge conflicts #10126: Commit 656461b pushed by ivanmixo
February 2, 2025 04:41 35s master
master
February 2, 2025 04:41 35s
Jumping mobs now make any mobs buckled to them jump (#16970) Check for merge conflicts #10125: Commit 0417dc2 pushed by Lumipharon
February 2, 2025 02:26 38s master
master
February 2, 2025 02:26 38s
Tense cleaning with throws (#17014) Check for merge conflicts #10124: Commit 9ae12a7 pushed by Lumipharon
January 31, 2025 22:55 36s master
master
January 31, 2025 22:55 36s
Updates job descriptions (#17015) Check for merge conflicts #10123: Commit 7448ad0 pushed by Lumipharon
January 31, 2025 22:55 44s master
master
January 31, 2025 22:55 44s
Puts the KLTD smart goggles back in the smartgunner equipment rack (#… Check for merge conflicts #10122: Commit a83a085 pushed by Lumipharon
January 31, 2025 02:17 35s master
master
January 31, 2025 02:17 35s
New Miner Sprites (#17012) Check for merge conflicts #10121: Commit e52ceea pushed by Kuro020
January 30, 2025 18:45 40s master
master
January 30, 2025 18:45 40s