Skip to content

Actions: PMC-Unga-Marines/Unga-Marines

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
60 workflow run results
60 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Guns, attachables and ammo cleanup. (#43) Check for merge conflicts #35: Commit 90e87e0 pushed by Tatarla
July 27, 2024 06:40 41s master
master
July 27, 2024 06:40 41s
New and changed corps equipment (#8) Check for merge conflicts #34: Commit f31e250 pushed by Tatarla
July 26, 2024 11:23 39s master
master
July 26, 2024 11:23 39s
Xeno and a bit of defines cleanup. (#41) Check for merge conflicts #33: Commit ce64f6b pushed by Tatarla
July 26, 2024 08:16 35s master
master
July 26, 2024 08:16 35s
Reorgs sound folder a bit. (#38) Check for merge conflicts #32: Commit 1a086d6 pushed by Tatarla
July 26, 2024 08:06 47s master
master
July 26, 2024 08:06 47s
Ports 14878, 15112, 15167 (#42) Check for merge conflicts #31: Commit 540a6ae pushed by Tatarla
July 26, 2024 06:41 37s master
master
July 26, 2024 06:41 37s
Refactors and resprites robotic cradle. (#39) Check for merge conflicts #30: Commit 2ca2285 pushed by Tatarla
July 26, 2024 06:40 38s master
master
July 26, 2024 06:40 38s
Deletes mech duplicate files. (#37) Check for merge conflicts #29: Commit a821932 pushed by Tatarla
July 26, 2024 06:40 38s master
master
July 26, 2024 06:40 38s
Reorgs xeno_structures.dm, tunnels now use minimap to choose exit. … Check for merge conflicts #28: Commit e466759 pushed by Tatarla
July 26, 2024 06:38 37s master
master
July 26, 2024 06:38 37s
Merge pull request #40 from Helg2/очепятка Check for merge conflicts #27: Commit 2413f21 pushed by homexp13
July 25, 2024 16:02 41s master
master
July 25, 2024 16:02 41s
Marine vending (#20) Check for merge conflicts #26: Commit 92dafd6 pushed by Tatarla
July 21, 2024 23:41 44s master
master
July 21, 2024 23:41 44s
Few fixes to the sky diving. (#31) Check for merge conflicts #25: Commit 5ffedd7 pushed by Tatarla
July 20, 2024 19:16 45s master
master
July 20, 2024 19:16 45s
hmm (#32) Check for merge conflicts #24: Commit c8c87aa pushed by Tatarla
July 20, 2024 19:03 37s master
master
July 20, 2024 19:03 37s
Repaths cm_preds files to predator. (#33) Check for merge conflicts #23: Commit cc7178c pushed by Tatarla
July 20, 2024 19:03 36s master
master
July 20, 2024 19:03 36s
maps repath (#34) Check for merge conflicts #22: Commit 17270d9 pushed by Tatarla
July 20, 2024 19:03 38s master
master
July 20, 2024 19:03 38s
Medical items now apply to yourself if you use them in-hand (#25) Check for merge conflicts #21: Commit 6f6850d pushed by Tatarla
July 20, 2024 19:01 37s master
master
July 20, 2024 19:01 37s
Directional attack (#30) Check for merge conflicts #20: Commit 3111183 pushed by Tatarla
July 20, 2024 07:18 40s master
master
July 20, 2024 07:18 40s
Storage closing QOL (#29) Check for merge conflicts #19: Commit 9d6f51c pushed by Tatarla
July 20, 2024 07:17 35s master
master
July 20, 2024 07:17 35s
Makes the radial menu for all medicine fit all limbs. (#15516) (#28) Check for merge conflicts #18: Commit aa6a786 pushed by Tatarla
July 20, 2024 07:16 40s master
master
July 20, 2024 07:16 40s
Storage opening QOL (#15609) (#27) Check for merge conflicts #17: Commit 033b303 pushed by Tatarla
July 20, 2024 07:15 35s master
master
July 20, 2024 07:15 35s
[Code bounty] Clicking a magazine to tac reload instead of drag (#157… Check for merge conflicts #16: Commit a49d2ab pushed by Tatarla
July 20, 2024 07:15 36s master
master
July 20, 2024 07:15 36s
Off-hand shooting (#16165) (#24) Check for merge conflicts #15: Commit 9a6c589 pushed by Tatarla
July 20, 2024 07:14 35s master
master
July 20, 2024 07:14 35s
Damage flag and file cleanup. (#23) Check for merge conflicts #14: Commit 26e9a0a pushed by Tatarla
July 19, 2024 04:56 15s master
master
July 19, 2024 04:56 15s
Xeno penetration (#22) Check for merge conflicts #13: Commit 075d336 pushed by Tatarla
July 19, 2024 04:55 17s master
master
July 19, 2024 04:55 17s
Return of the tur, change in the status of modules and armor, new typ… Check for merge conflicts #12: Commit 22a5010 pushed by Tatarla
July 18, 2024 06:20 36s master
master
July 18, 2024 06:20 36s
Deletes a bunch of unused atmos stuff and code. (#18) Check for merge conflicts #11: Commit cd13fa6 pushed by Tatarla
July 17, 2024 15:08 45s master
master
July 17, 2024 15:08 45s