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
718 workflow runs
718 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Добавил тенглов марам (#587) Check for merge conflicts #543: Commit 033332f pushed by Tatarla
November 1, 2024 14:08 2m 18s master
master
November 1, 2024 14:08 2m 18s
adminhelp ban (#520) Check for merge conflicts #542: Commit 39b015b pushed by Helg2
November 1, 2024 12:59 1m 43s master
master
November 1, 2024 12:59 1m 43s
Acid unwell (#609) Check for merge conflicts #541: Commit d6a39f0 pushed by Tatarla
November 1, 2024 12:17 56s master
master
November 1, 2024 12:17 56s
Ребаланс АГЛС-37 (#588) Check for merge conflicts #540: Commit 86eb20d pushed by Tatarla
November 1, 2024 12:04 4m 0s master
master
November 1, 2024 12:04 4m 0s
Attempt to fix secrete resin runtime. (#599) Check for merge conflicts #539: Commit 6eb1ac5 pushed by Helg2
November 1, 2024 09:44 38s master
master
November 1, 2024 09:44 38s
Fixes sprites of apc, fob button and some glasses. Also fixes opening… Check for merge conflicts #538: Commit bbafb80 pushed by Helg2
November 1, 2024 09:25 37s master
master
November 1, 2024 09:25 37s
Deletes gun greyscale configs and icons. Optimizes some random stuff … Check for merge conflicts #537: Commit 4c2ebba pushed by Helg2
November 1, 2024 09:09 47s master
master
November 1, 2024 09:09 47s
Hivemind health hud fix. (#607) Check for merge conflicts #536: Commit d55f4dc pushed by Helg2
November 1, 2024 09:01 39s master
master
November 1, 2024 09:01 39s
Update abilities_hunter.dm (#606) Check for merge conflicts #535: Commit b5432a2 pushed by Helg2
October 30, 2024 06:45 1h 14m 23s master
master
October 30, 2024 06:45 1h 14m 23s
Change wall flame pen and add wide spray (#598) Check for merge conflicts #534: Commit d04a3a2 pushed by Tatarla
October 29, 2024 09:09 34s master
master
October 29, 2024 09:09 34s
Ports playsound changes from offs. (#601) Check for merge conflicts #533: Commit 5e264b4 pushed by Tatarla
October 29, 2024 09:09 48s master
master
October 29, 2024 09:09 48s
Update fullscreen.dm (#603) Check for merge conflicts #532: Commit a975b5c pushed by Helg2
October 27, 2024 12:15 7m 10s master
master
October 27, 2024 12:15 7m 10s
Update emoji.dmi (#600) Check for merge conflicts #531: Commit 2c3d98b pushed by Tatarla
October 26, 2024 13:27 36s master
master
October 26, 2024 13:27 36s
Change sprite syringe and some janitor shmot (#575) Check for merge conflicts #530: Commit 17743ef pushed by Tatarla
October 25, 2024 11:49 5m 3s master
master
October 25, 2024 11:49 5m 3s
Change view cleanup. (#551) Check for merge conflicts #529: Commit e697f96 pushed by Tatarla
October 25, 2024 09:12 8m 26s master
master
October 25, 2024 09:12 8m 26s
Update evolution.dm (#579) Check for merge conflicts #528: Commit 8bc3a7b pushed by Tatarla
October 25, 2024 09:11 8m 33s master
master
October 25, 2024 09:11 8m 33s
Proper lights for optable and bioprinter, so their emissives are seen… Check for merge conflicts #527: Commit 5591348 pushed by Tatarla
October 25, 2024 09:09 10m 8s master
master
October 25, 2024 09:09 10m 8s
Proper surgery button in valhalla. (#559) Check for merge conflicts #526: Commit b78ca1a pushed by Tatarla
October 25, 2024 09:09 10m 30s master
master
October 25, 2024 09:09 10m 30s
Change larvapoints from shipside roles (#580) Check for merge conflicts #525: Commit c428e43 pushed by Tatarla
October 25, 2024 08:57 14m 38s master
master
October 25, 2024 08:57 14m 38s
delete tx54 he ammo (#538) Check for merge conflicts #524: Commit 299d8b4 pushed by Tatarla
October 25, 2024 08:54 16m 47s master
master
October 25, 2024 08:54 16m 47s
Converts apicker, jump-to, smite menu and get-server-logs to tgui. Ds… Check for merge conflicts #523: Commit e52c5ec pushed by Tatarla
October 25, 2024 08:53 11m 6s master
master
October 25, 2024 08:53 11m 6s
Bump and directional attacks now check for iff signals instead of fac… Check for merge conflicts #522: Commit 9b105fa pushed by Tatarla
October 25, 2024 08:53 10m 18s master
master
October 25, 2024 08:53 10m 18s
Last stand now has few spawn points for waves. (#523) Check for merge conflicts #521: Commit 4faf170 pushed by Tatarla
October 25, 2024 08:52 10m 38s master
master
October 25, 2024 08:52 10m 38s
optimize gibs (#581) Check for merge conflicts #520: Commit 0b6aada pushed by Tatarla
October 25, 2024 08:51 4m 40s master
master
October 25, 2024 08:51 4m 40s
Cas weaponry doesn't fit on other shuttles now. (#566) Check for merge conflicts #519: Commit 75306bf pushed by Tatarla
October 25, 2024 08:51 3m 51s master
master
October 25, 2024 08:51 3m 51s