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
652 workflow run results
652 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update living.dm (#86) Check for merge conflicts #77: Commit 1e465d7 pushed by Tatarla
August 20, 2024 13:00 46s master
master
August 20, 2024 13:00 46s
Update vote.dm (#84) Check for merge conflicts #76: Commit d0a981d pushed by Tatarla
August 19, 2024 15:01 40s master
master
August 19, 2024 15:01 40s
Update lighting.dmi (#85) Check for merge conflicts #75: Commit 7879916 pushed by Tatarla
August 19, 2024 15:01 51s master
master
August 19, 2024 15:01 51s
Storage qols (#78) Check for merge conflicts #74: Commit 15391a4 pushed by Tatarla
August 15, 2024 13:53 31s master
master
August 15, 2024 13:53 31s
Talos little tweaks. (#82) Check for merge conflicts #73: Commit 6b65d8d pushed by Tatarla
August 15, 2024 13:53 46s master
master
August 15, 2024 13:53 46s
Update reagent_dispensers.dm (#81) Check for merge conflicts #72: Commit f8408b3 pushed by Tatarla
August 14, 2024 15:13 44s master
master
August 14, 2024 15:13 44s
Makes railings on talos dense. (#80) Check for merge conflicts #71: Commit 97e98b7 pushed by Tatarla
August 13, 2024 06:02 43s master
master
August 13, 2024 06:02 43s
Update update_icons.dm (#79) Check for merge conflicts #70: Commit cd71859 pushed by Tatarla
August 11, 2024 15:01 38s master
master
August 11, 2024 15:01 38s
Locker qol and a little cleanup. (#76) Check for merge conflicts #69: Commit 6c3007d pushed by Tatarla
August 11, 2024 15:01 31s master
master
August 11, 2024 15:01 31s
delete prices and money interactions for vendors (#75) Check for merge conflicts #68: Commit b0f40e8 pushed by Tatarla
August 11, 2024 15:01 49s master
master
August 11, 2024 15:01 49s
Glasses cleanup and previous fuckups fixed. (#74) Check for merge conflicts #67: Commit 8f11db6 pushed by Tatarla
August 11, 2024 15:00 47s master
master
August 11, 2024 15:00 47s
Tweaks talos cargo. (#77) Check for merge conflicts #66: Commit fbce382 pushed by Tatarla
August 10, 2024 13:51 36s master
master
August 10, 2024 13:51 36s
Adds a stomach organ, pills, food and etc go into stomach and only th… Check for merge conflicts #65: Commit a3ab9ee pushed by Tatarla
August 9, 2024 18:24 44s master
master
August 9, 2024 18:24 44s
Fullscreen overlays and chat bullet act message cleanup (#70) Check for merge conflicts #64: Commit 1297b97 pushed by Tatarla
August 7, 2024 15:18 38s master
master
August 7, 2024 15:18 38s
Vali now auto-loads on hit, can't hit with strapped weaponry while pr… Check for merge conflicts #63: Commit 9c59567 pushed by Tatarla
August 7, 2024 06:26 41s master
master
August 7, 2024 06:26 41s
Recharger cell and cell tweaks. (#71) Check for merge conflicts #62: Commit 8e4f0e3 pushed by Tatarla
August 7, 2024 06:25 40s master
master
August 7, 2024 06:25 40s
Factorio (#59) Check for merge conflicts #61: Commit 57f3b1e pushed by Tatarla
August 7, 2024 06:21 42s master
master
August 7, 2024 06:21 42s
Fixes Talos window frames and also window and apc ex_acts. (#68) Check for merge conflicts #60: Commit 7ca7f08 pushed by Tatarla
August 5, 2024 09:48 32s master
master
August 5, 2024 09:48 32s
Medical twix (#67) Check for merge conflicts #59: Commit de91305 pushed by Tatarla
August 5, 2024 09:48 50s master
master
August 5, 2024 09:48 50s
Отгружаю спрайты (#64) Check for merge conflicts #58: Commit 75ace12 pushed by Tatarla
August 5, 2024 09:47 37s master
master
August 5, 2024 09:47 37s
Merge pull request #66 from Helg2/blink Check for merge conflicts #57: Commit 08d0769 pushed by homexp13
August 2, 2024 06:41 41s master
master
August 2, 2024 06:41 41s
Update jobs.dm (#63) Check for merge conflicts #56: Commit fb6fc5e pushed by Tatarla
August 1, 2024 20:53 40s master
master
August 1, 2024 20:53 40s
Span class cleaning (#65) Check for merge conflicts #55: Commit 70b3cc8 pushed by Tatarla
August 1, 2024 20:10 40s master
master
August 1, 2024 20:10 40s
harvester holster (#62) Check for merge conflicts #54: Commit 9d797cb pushed by Tatarla
August 1, 2024 20:08 33s master
master
August 1, 2024 20:08 33s
Few fixes (#61) Check for merge conflicts #53: Commit d32dc3e pushed by Tatarla
August 1, 2024 20:08 44s master
master
August 1, 2024 20:08 44s
ProTip! You can narrow down the results and go further in time using created:<2024-08-01 or the other filters available.