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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Ghosts can view reagents on examine like corpsmen (#17030) Check for merge conflicts #10152: Commit 65bf058 pushed by TiviPlus
February 9, 2025 10:41 3m 59s master
master
February 9, 2025 10:41 3m 59s
Adds assault crewman to Valhalla jobs (#17035) Check for merge conflicts #10151: Commit 780350e pushed by TiviPlus
February 9, 2025 10:31 13m 6s master
master
February 9, 2025 10:31 13m 6s
fireteam fixes (#17045) Check for merge conflicts #10150: Commit 7b714d7 pushed by TiviPlus
February 9, 2025 10:31 2m 25s master
master
February 9, 2025 10:31 2m 25s
Fixes hivemind health hud/ui (#17052) Check for merge conflicts #10149: Commit b23bdc5 pushed by ivanmixo
February 9, 2025 02:46 12m 7s master
master
February 9, 2025 02:46 12m 7s
Fix several DB issues (#17036) Check for merge conflicts #10148: Commit 0eb69c8 pushed by ivanmixo
February 9, 2025 02:44 1m 8s master
master
February 9, 2025 02:44 1m 8s
Oppressor: A Strain for Praetorian (#16912) Check for merge conflicts #10147: Commit dc69c0c pushed by Kuro020
February 8, 2025 19:26 10m 13s master
master
February 8, 2025 19:26 10m 13s
Add ping topic (#17053) Check for merge conflicts #10146: Commit 3ada23c pushed by TiviPlus
February 8, 2025 13:01 3m 14s master
master
February 8, 2025 13:01 3m 14s
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