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

Adds an ozelomelyn hugger (#14686) Check for merge conflicts #8404: Commit 7abf626 pushed by Lumipharon
December 25, 2023 21:58 39s master
master
December 25, 2023 21:58 39s
Fix emote spam when losing grasp of NODROP items (#14682) Check for merge conflicts #8403: Commit 6092cee pushed by Lumipharon
December 25, 2023 21:55 40s master
master
December 25, 2023 21:55 40s
Fixes SG-62 reqtorio (#14674) Check for merge conflicts #8402: Commit e598e2a pushed by Lumipharon
December 25, 2023 21:54 39s master
master
December 25, 2023 21:54 39s
kills 4 cape styles and style jaeger (#14683) Check for merge conflicts #8401: Commit 02b62ff pushed by Lumipharon
December 25, 2023 21:52 30s master
master
December 25, 2023 21:52 30s
Fix items being weird with layers if equipped is overriden the wrong … Check for merge conflicts #8400: Commit 07c1072 pushed by Lumipharon
December 25, 2023 21:52 1m 5s master
master
December 25, 2023 21:52 1m 5s
Removes the magnum from the crash weapons vendor (#14675) Check for merge conflicts #8399: Commit fb3a512 pushed by Lumipharon
December 25, 2023 21:51 39s master
master
December 25, 2023 21:51 39s
Adds voicelines to CAS (#14676) Check for merge conflicts #8398: Commit 983919d pushed by ivanmixo
December 24, 2023 16:12 1m 3s master
master
December 24, 2023 16:12 1m 3s
Adds packets to Target Rifle (#14672) Check for merge conflicts #8397: Commit 911ae57 pushed by ivanmixo
December 24, 2023 16:12 36s master
master
December 24, 2023 16:12 36s
updates this stupid shrike comment (#14667) Check for merge conflicts #8396: Commit c382235 pushed by ivanmixo
December 24, 2023 16:11 35s master
master
December 24, 2023 16:11 35s
Change some SS names to be nicer to read (#14681) Check for merge conflicts #8395: Commit 322b3e9 pushed by TiviPlus
December 24, 2023 14:34 2m 2s master
master
December 24, 2023 14:34 2m 2s
Deletes stacking pipes on Ice Caves. (#14643) Check for merge conflicts #8394: Commit c431643 pushed by RipGrayson
December 22, 2023 16:45 38s master
master
December 22, 2023 16:45 38s
Deletes some garbage on big red. (#14644) Check for merge conflicts #8393: Commit e5acc75 pushed by RipGrayson
December 22, 2023 16:45 39s master
master
December 22, 2023 16:45 39s
Makes sticky resin unacidable (#14662) Check for merge conflicts #8392: Commit a2de9e8 pushed by Lumipharon
December 22, 2023 01:34 37s master
master
December 22, 2023 01:34 37s
Emplacements may be hopped over (#14651) Check for merge conflicts #8391: Commit 21d12ad pushed by Lumipharon
December 21, 2023 02:36 38s master
master
December 21, 2023 02:36 38s
Defensive mission walance (#14659) Check for merge conflicts #8390: Commit 4a31ca0 pushed by RipGrayson
December 20, 2023 23:41 1m 17s master
master
December 20, 2023 23:41 1m 17s
Fixes Full Harvester Weapons Accepting More Chems (#14657) Check for merge conflicts #8389: Commit 3063dc2 pushed by ivanmixo
December 20, 2023 16:06 42s master
master
December 20, 2023 16:06 42s
Misc gun skilltype changes (#14660) Check for merge conflicts #8388: Commit 41d629e pushed by ivanmixo
December 20, 2023 15:15 43s master
master
December 20, 2023 15:15 43s
Campaign combat robo tweaks (#14661) Check for merge conflicts #8387: Commit 2ba7290 pushed by ivanmixo
December 20, 2023 15:15 50s master
master
December 20, 2023 15:15 50s
Adds a delay to throwing (#12892) Check for merge conflicts #8386: Commit 5f7c19b pushed by Lumipharon
December 20, 2023 03:03 36s master
master
December 20, 2023 03:03 36s
Campaign BSOD fix (#14658) Check for merge conflicts #8385: Commit a370084 pushed by ivanmixo
December 19, 2023 22:35 37s master
master
December 19, 2023 22:35 37s
Follow up mission end QOL (#14656) Check for merge conflicts #8384: Commit 95c248e pushed by ivanmixo
December 19, 2023 14:49 10m 11s master
master
December 19, 2023 14:49 10m 11s
Fix export denied personal stat (#14655) Check for merge conflicts #8383: Commit 81363f6 pushed by TiviPlus
December 18, 2023 19:38 15m 21s master
master
December 18, 2023 19:38 15m 21s
Fix a supply beacon runtime (#14654) Check for merge conflicts #8382: Commit 72bc69d pushed by TiviPlus
December 18, 2023 19:38 14m 32s master
master
December 18, 2023 19:38 14m 32s
Allows ai to ping alert the baneling pod. (#14642) Check for merge conflicts #8381: Commit ecb8c84 pushed by TiviPlus
December 18, 2023 19:37 14m 41s master
master
December 18, 2023 19:37 14m 41s
Campaign mission end ghostize (#14650) Check for merge conflicts #8380: Commit 8b26926 pushed by ivanmixo
December 18, 2023 02:01 39s master
master
December 18, 2023 02:01 39s
ProTip! You can narrow down the results and go further in time using created:<2023-12-18 or the other filters available.