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

makes sound players not dense (#13997) Check for merge conflicts #7946: Commit fa302ce pushed by TiviPlus
September 22, 2023 15:35 49s master
master
September 22, 2023 15:35 49s
Update escape_shuttle.dmm (#13975) Check for merge conflicts #7945: Commit 459f6f7 pushed by RipGrayson
September 21, 2023 00:16 47s master
master
September 21, 2023 00:16 47s
Removes TGS Minerva (#13988) Check for merge conflicts #7944: Commit 9e8025a pushed by RipGrayson
September 20, 2023 23:39 24m 6s master
master
September 20, 2023 23:39 24m 6s
Derringer buffs (#13966) Check for merge conflicts #7943: Commit 4140214 pushed by Lumipharon
September 20, 2023 21:21 3m 50s master
master
September 20, 2023 21:21 3m 50s
Mostly redoes the CAS UI (#13965) Check for merge conflicts #7942: Commit ff067a4 pushed by Lumipharon
September 20, 2023 21:20 1m 25s master
master
September 20, 2023 21:20 1m 25s
Personal statistics (#13543) Check for merge conflicts #7941: Commit 9455db4 pushed by Lumipharon
September 20, 2023 21:19 49s master
master
September 20, 2023 21:19 49s
Gau hits twice again (#13968) Check for merge conflicts #7940: Commit 736c0ed pushed by Lumipharon
September 20, 2023 21:18 48s master
master
September 20, 2023 21:18 48s
SG153 magazine rename (#13977) Check for merge conflicts #7939: Commit 17af390 pushed by TiviPlus
September 20, 2023 20:11 2m 7s master
master
September 20, 2023 20:11 2m 7s
initial_commit (#13978) Check for merge conflicts #7938: Commit 185e6cd pushed by TiviPlus
September 20, 2023 20:11 3m 37s master
master
September 20, 2023 20:11 3m 37s
Fix xeno spawns not counting towards autobalance (#13973) Check for merge conflicts #7937: Commit 8a92a14 pushed by TiviPlus
September 20, 2023 20:07 1m 1s master
master
September 20, 2023 20:07 1m 1s
Remove deadcode (#13981) Check for merge conflicts #7936: Commit dede533 pushed by TiviPlus
September 20, 2023 20:02 47s master
master
September 20, 2023 20:02 47s
Changes names of armor modules in req buylist (#13986) Check for merge conflicts #7935: Commit 04202ad pushed by TiviPlus
September 20, 2023 19:54 57s master
master
September 20, 2023 19:54 57s
Superheavy pistol changes (#13957) Check for merge conflicts #7934: Commit c8bfe87 pushed by ivanmixo
September 19, 2023 23:51 4m 1s master
master
September 19, 2023 23:51 4m 1s
Fix spawn_xenos unit test evolving to primo three times (#13974) Check for merge conflicts #7933: Commit bb84a4e pushed by ivanmixo
September 19, 2023 23:51 2m 22s master
master
September 19, 2023 23:51 2m 22s
TGS Arachne (#13914) Check for merge conflicts #7932: Commit c65ef8e pushed by RipGrayson
September 19, 2023 20:24 52s master
master
September 19, 2023 20:24 52s
Renames face paint, Updates face paint description. (#13970) Check for merge conflicts #7931: Commit 1513db5 pushed by ivanmixo
September 19, 2023 08:55 50s master
master
September 19, 2023 08:55 50s
King no longer has special autobalance weight (#13971) Check for merge conflicts #7930: Commit 51ae799 pushed by Lumipharon
September 18, 2023 20:36 55s master
master
September 18, 2023 20:36 55s
Removes GL54 razorwire grenades (#13972) Check for merge conflicts #7929: Commit b1cd132 pushed by Lumipharon
September 18, 2023 20:34 58s master
master
September 18, 2023 20:34 58s
Icons Folder Cleaning: Part 1 (#13944) Check for merge conflicts #7928: Commit e544923 pushed by Lumipharon
September 18, 2023 01:52 1m 2s master
master
September 18, 2023 01:52 1m 2s
initial_commit (#13958) Check for merge conflicts #7927: Commit 2cd6243 pushed by Lumipharon
September 18, 2023 01:52 1m 16s master
master
September 18, 2023 01:52 1m 16s
initial_commit (#13959) Check for merge conflicts #7926: Commit 829b187 pushed by Lumipharon
September 18, 2023 01:52 46s master
master
September 18, 2023 01:52 46s
guh (#13964) Check for merge conflicts #7925: Commit 534504f pushed by Lumipharon
September 18, 2023 01:51 56s master
master
September 18, 2023 01:51 56s
Adds a pref to disable radial menu for laser weapons (#13960) Check for merge conflicts #7924: Commit 7b6471c pushed by Lumipharon
September 18, 2023 01:51 56s master
master
September 18, 2023 01:51 56s
Yet more throw fixes (#13962) Check for merge conflicts #7923: Commit 6895a8b pushed by ivanmixo
September 18, 2023 00:09 55s master
master
September 18, 2023 00:09 55s
Adjustments to Theseus Requisitions (#13956) Check for merge conflicts #7922: Commit 407968e pushed by RipGrayson
September 17, 2023 02:06 47s master
master
September 17, 2023 02:06 47s
ProTip! You can narrow down the results and go further in time using created:<2023-09-17 or the other filters available.