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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Warding Pheromones rework (#877) Check for merge conflicts #715: Commit feba3d0 pushed by Helg2
December 28, 2024 13:23 36s master
master
December 28, 2024 13:23 36s
New tad "Barge" (#858) Check for merge conflicts #714: Commit 6db4fe4 pushed by Helg2
December 26, 2024 21:39 2m 21s master
master
December 26, 2024 21:39 2m 21s
Deletes station mechs and mech stuff. (#865) Check for merge conflicts #713: Commit d77189e pushed by Helg2
December 26, 2024 20:45 59s master
master
December 26, 2024 20:45 59s
Синты и ИИ теперь могут писать ключ бинарного канала на русском (#876) Check for merge conflicts #712: Commit b2a9724 pushed by Helg2
December 26, 2024 20:39 1m 23s master
master
December 26, 2024 20:39 1m 23s
Footstep updates (#16081) (#872) Check for merge conflicts #711: Commit c1376c6 pushed by Helg2
December 26, 2024 20:30 7m 55s master
master
December 26, 2024 20:30 7m 55s
Old gun firemode verb deletion and some keybind unshittening (#16543)… Check for merge conflicts #710: Commit 870307c pushed by Helg2
December 26, 2024 20:30 7m 53s master
master
December 26, 2024 20:30 7m 53s
Fixes hunter being constantly told that he's unable to stealth while … Check for merge conflicts #709: Commit 5ddd291 pushed by Helg2
December 26, 2024 20:30 7m 31s master
master
December 26, 2024 20:30 7m 31s
Russian Red no more in marin vendor (#852) Check for merge conflicts #708: Commit ec2f184 pushed by Helg2
December 26, 2024 20:29 55s master
master
December 26, 2024 20:29 55s
Техника клонирования (#861) Check for merge conflicts #707: Commit 460fbfa pushed by Helg2
December 23, 2024 20:21 3m 18s master
master
December 23, 2024 20:21 3m 18s
Adds more medical equipment to medical APC interior. (#859) Check for merge conflicts #706: Commit c671bdc pushed by Helg2
December 23, 2024 14:28 5m 51s master
master
December 23, 2024 14:28 5m 51s
Slightly improves cinematics code. (#862) Check for merge conflicts #705: Commit 889de9b pushed by Helg2
December 23, 2024 14:20 6m 2s master
master
December 23, 2024 14:20 6m 2s
status_procs.dm cleaning. (#864) Check for merge conflicts #704: Commit 3fd2c38 pushed by Helg2
December 23, 2024 14:19 6m 15s master
master
December 23, 2024 14:19 6m 15s
Укреплённый пол больше не удаляет пол до базового тюрфа (#863) Check for merge conflicts #703: Commit f10d079 pushed by Helg2
December 23, 2024 14:17 40s master
master
December 23, 2024 14:17 40s
Researcher implant minor upgrade (#857) Check for merge conflicts #702: Commit 958f61a pushed by Helg2
December 23, 2024 06:48 40s master
master
December 23, 2024 06:48 40s
Психический щит: Направленное отражение (Колдун Примо) (#840) Check for merge conflicts #701: Commit 73e8bb3 pushed by Helg2
December 21, 2024 16:52 6m 32s master
master
December 21, 2024 16:52 6m 32s
Port strapable fixes (#856) Check for merge conflicts #700: Commit fbb95b6 pushed by Helg2
December 21, 2024 16:50 36s master
master
December 21, 2024 16:50 36s
Gorger changes (вторая попытка) (#846) Check for merge conflicts #699: Commit ef89035 pushed by Helg2
December 21, 2024 14:03 1m 25s master
master
December 21, 2024 14:03 1m 25s
Adds amount restriction for vending. Increases plushies cargo price. … Check for merge conflicts #698: Commit 6e09cc2 pushed by Helg2
December 21, 2024 13:30 56s master
master
December 21, 2024 13:30 56s
Альбедо и Нигредо 2: Медицинский револьвер (дубль 2) (#774) Check for merge conflicts #697: Commit 4ca4882 pushed by Helg2
December 21, 2024 12:21 37s master
master
December 21, 2024 12:21 37s
Roadmap - Vali rapir delete skill lock (#848) Check for merge conflicts #696: Commit 96f31f5 pushed by Helg2
December 21, 2024 12:11 41s master
master
December 21, 2024 12:11 41s
Foot print fix (#763) Check for merge conflicts #695: Commit b133fe8 pushed by Helg2
December 20, 2024 12:51 6m 17s master
master
December 20, 2024 12:51 6m 17s
Musket return (#799) Check for merge conflicts #694: Commit fb6f0ce pushed by Helg2
December 19, 2024 12:16 1m 46s master
master
December 19, 2024 12:16 1m 46s
Больше модулей на Нигредо (#842) Check for merge conflicts #693: Commit 977cc47 pushed by Helg2
December 19, 2024 11:55 4m 19s master
master
December 19, 2024 11:55 4m 19s
Fixes nutriment on_merge runtime. (#845) Check for merge conflicts #692: Commit ed64831 pushed by Helg2
December 19, 2024 11:53 6m 44s master
master
December 19, 2024 11:53 6m 44s
Quick build work until TAD lands off the LZ. (#824) Check for merge conflicts #691: Commit 7697d94 pushed by Helg2
December 19, 2024 11:52 6m 32s master
master
December 19, 2024 11:52 6m 32s