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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Change some machines sprite (#573) Check for merge conflicts #516: Commit 7aca625 pushed by Tatarla
October 23, 2024 17:33 7m 51s master
master
October 23, 2024 17:33 7m 51s
Adds more laugh sounds. (#592) Check for merge conflicts #515: Commit d0101de pushed by Tatarla
October 23, 2024 17:32 45s master
master
October 23, 2024 17:32 45s
Update briefcase.dm (#572) Check for merge conflicts #514: Commit 5fecde9 pushed by Tatarla
October 23, 2024 05:27 1m 28s master
master
October 23, 2024 05:27 1m 28s
Ребаланс R76 (#553) Check for merge conflicts #513: Commit bb89739 pushed by Tatarla
October 23, 2024 05:26 1m 53s master
master
October 23, 2024 05:26 1m 53s
Баффы арты (#583) Check for merge conflicts #512: Commit d4e09cb pushed by Tatarla
October 23, 2024 05:23 4m 47s master
master
October 23, 2024 05:23 4m 47s
delete a bit of useless vars (#589) Check for merge conflicts #511: Commit 5d21247 pushed by Tatarla
October 21, 2024 15:39 4m 15s master
master
October 21, 2024 15:39 4m 15s
Update energy.dm (#578) Check for merge conflicts #510: Commit 5701f90 pushed by Tatarla
October 20, 2024 18:40 38s master
master
October 20, 2024 18:40 38s
Починил роботам доступы к вендорам (#584) Check for merge conflicts #509: Commit 53b2923 pushed by Tatarla
October 20, 2024 10:15 39s master
master
October 20, 2024 10:15 39s
Revert old medmodule sprite (#576) Check for merge conflicts #508: Commit bacc5b5 pushed by Tatarla
October 19, 2024 06:20 1m 54s master
master
October 19, 2024 06:20 1m 54s
Change sprite drink №2 (#574) Check for merge conflicts #507: Commit 8ec3877 pushed by Tatarla
October 19, 2024 06:20 40s master
master
October 19, 2024 06:20 40s
Update retrograde.dmi (#571) Check for merge conflicts #506: Commit 4d267ef pushed by Helg2
October 18, 2024 16:48 58s master
master
October 18, 2024 16:48 58s
Fix R76 and box AR-21 (#570) Check for merge conflicts #505: Commit 7658069 pushed by Tatarla
October 18, 2024 16:23 2m 12s master
master
October 18, 2024 16:23 2m 12s
Fixes linters whining. (#549) Check for merge conflicts #504: Commit a4cfd2e pushed by Tatarla
October 18, 2024 16:09 3m 56s master
master
October 18, 2024 16:09 3m 56s
Update bigred.dm (#567) Check for merge conflicts #503: Commit e1cdfb9 pushed by Tatarla
October 18, 2024 16:09 3m 36s master
master
October 18, 2024 16:09 3m 36s
Up speed bike with colaska (#569) Check for merge conflicts #502: Commit a3ada28 pushed by Tatarla
October 18, 2024 15:26 37s master
master
October 18, 2024 15:26 37s
Change crusher damage, hod module, remove hilin, add GROZA ammo crate… Check for merge conflicts #501: Commit bb1e52c pushed by Helg2
October 18, 2024 15:17 39s master
master
October 18, 2024 15:17 39s
improve speed weld geotermal generation (#568) Check for merge conflicts #500: Commit ab8c856 pushed by Helg2
October 18, 2024 14:59 1m 6s master
master
October 18, 2024 14:59 1m 6s
Change sprites of photo, flashlight and megaphone (#563) Check for merge conflicts #499: Commit 8de41be pushed by Helg2
October 18, 2024 14:58 1m 29s master
master
October 18, 2024 14:58 1m 29s
Updates button sprite. (#558) Check for merge conflicts #498: Commit 0dbfe99 pushed by Tatarla
October 18, 2024 14:52 6m 21s master
master
October 18, 2024 14:52 6m 21s
Keycard auth sprite update + emissive when blinking. (#554) Check for merge conflicts #497: Commit 5b14463 pushed by Tatarla
October 18, 2024 14:46 1m 24s master
master
October 18, 2024 14:46 1m 24s
Chem dispenser and chemmaster sprite update. (#557) Check for merge conflicts #496: Commit cdfd28c pushed by Tatarla
October 18, 2024 14:46 1m 31s master
master
October 18, 2024 14:46 1m 31s
Sigareti (#562) Check for merge conflicts #495: Commit 4239eae pushed by Helg2
October 18, 2024 11:53 6m 10s master
master
October 18, 2024 11:53 6m 10s
Change sprites food/drink (#561) Check for merge conflicts #494: Commit 7517e8e pushed by Helg2
October 18, 2024 11:51 37s master
master
October 18, 2024 11:51 37s
items and storage sprite update (#555) Check for merge conflicts #493: Commit f6b864e pushed by Tatarla
October 18, 2024 10:35 53s master
master
October 18, 2024 10:35 53s
Updates sprites of mirror, paper folders, bins, clipboards and stamps… Check for merge conflicts #492: Commit a4fc80c pushed by Tatarla
October 18, 2024 10:33 47s master
master
October 18, 2024 10:33 47s