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

Add queen egg laying back (#14553) Check for merge conflicts #8352: Commit dc1ed87 pushed by ivanmixo
December 6, 2023 14:04 37s master
master
December 6, 2023 14:04 37s
Squad transfer tablet (#14310) Check for merge conflicts #8351: Commit 2133adb pushed by Lumipharon
December 4, 2023 20:04 38s master
master
December 4, 2023 20:04 38s
mech entry fix (#14586) Check for merge conflicts #8350: Commit cce8c60 pushed by TiviPlus
December 4, 2023 17:36 42s master
master
December 4, 2023 17:36 42s
Syndie hardsuit hotfix (#14587) Check for merge conflicts #8349: Commit 1595e0a pushed by ivanmixo
December 4, 2023 13:19 39s master
master
December 4, 2023 13:19 39s
Fix defender being able to move dead bodies (#14590) Check for merge conflicts #8348: Commit f4cbe4b pushed by Lumipharon
December 3, 2023 23:48 51s master
master
December 3, 2023 23:48 51s
Skill adjustments and additions (#14512) Check for merge conflicts #8347: Commit ad558c1 pushed by ivanmixo
December 3, 2023 03:07 38s master
master
December 3, 2023 03:07 38s
Mod by armor cleanup (#14518) Check for merge conflicts #8346: Commit 889c2cd pushed by ivanmixo
December 3, 2023 02:40 37s master
master
December 3, 2023 02:40 37s
the Syndicate expansion part one (allegedly) (#14207) Check for merge conflicts #8345: Commit 8f206eb pushed by Kuro020
December 2, 2023 23:02 36s master
master
December 2, 2023 23:02 36s
Makes most standard marine vendors unwrenchable (#14552) Check for merge conflicts #8344: Commit 5fe1b55 pushed by TiviPlus
December 2, 2023 23:01 50s master
master
December 2, 2023 23:01 50s
Clarifies Bioscan Corruption Cause (#14579) Check for merge conflicts #8343: Commit 88ff013 pushed by ivanmixo
December 2, 2023 22:55 28s master
master
December 2, 2023 22:55 28s
workit (#14569) Check for merge conflicts #8342: Commit 5af0990 pushed by ivanmixo
December 2, 2023 22:55 37s master
master
December 2, 2023 22:55 37s
initial commit (#14578) Check for merge conflicts #8341: Commit 007fa13 pushed by ivanmixo
December 2, 2023 22:54 36s master
master
December 2, 2023 22:54 36s
Makes the two tile pod door (namely used on big red) acidable (#14583) Check for merge conflicts #8340: Commit d685dd5 pushed by TiviPlus
December 2, 2023 22:35 35s master
master
December 2, 2023 22:35 35s
Fix a funny widow exploit (#14581) Check for merge conflicts #8339: Commit 46e478e pushed by TiviPlus
December 2, 2023 22:34 39s master
master
December 2, 2023 22:34 39s
Improved king wounded sprites (#14568) Check for merge conflicts #8338: Commit b5a4527 pushed by Kuro020
December 2, 2023 17:50 3m 22s master
master
December 2, 2023 17:50 3m 22s
some shotguns get underbarreled flashlight (#14510) Check for merge conflicts #8337: Commit 467483b pushed by ivanmixo
December 2, 2023 01:10 37s master
master
December 2, 2023 01:10 37s
Fix grammar in human examine text (#14571) Check for merge conflicts #8336: Commit 974c9c4 pushed by ivanmixo
December 2, 2023 01:08 35s master
master
December 2, 2023 01:08 35s
Update modular_armor.dm (#14577) Check for merge conflicts #8335: Commit f38637f pushed by ivanmixo
December 2, 2023 01:08 38s master
master
December 2, 2023 01:08 38s
autoweed fix (#14576) Check for merge conflicts #8334: Commit 52d3c8e pushed by ivanmixo
December 2, 2023 01:06 38s master
master
December 2, 2023 01:06 38s
removes rds compatibility with mg60 (#14547) Check for merge conflicts #8333: Commit c982dd5 pushed by ivanmixo
December 1, 2023 23:11 1m 34s master
master
December 1, 2023 23:11 1m 34s
Fixes some minimap dnr issues (#14536) Check for merge conflicts #8332: Commit 5fb228b pushed by Lumipharon
December 1, 2023 00:57 2m 51s master
master
December 1, 2023 00:57 2m 51s
Do after fix (#14488) Check for merge conflicts #8331: Commit 6f02a20 pushed by TiviPlus
November 30, 2023 21:23 42s master
master
November 30, 2023 21:23 42s
euclide range (#14562) Check for merge conflicts #8330: Commit 9968e14 pushed by ivanmixo
November 30, 2023 20:55 38s master
master
November 30, 2023 20:55 38s
Adds autominer upgrades to engie points vendor (#14540) Check for merge conflicts #8329: Commit a9256f2 pushed by TiviPlus
November 30, 2023 20:53 37s master
master
November 30, 2023 20:53 37s
exploit fix (#14570) Check for merge conflicts #8328: Commit c97e998 pushed by TiviPlus
November 30, 2023 20:49 36s master
master
November 30, 2023 20:49 36s
ProTip! You can narrow down the results and go further in time using created:<2023-11-30 or the other filters available.