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

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
Deletes a bunch of unused clothing. (#57) Check for merge conflicts #52: Commit ae695c0 pushed by Tatarla
August 1, 2024 14:41 37s master
master
August 1, 2024 14:41 37s
sensor (#60) Check for merge conflicts #51: Commit 5acc683 pushed by Tatarla
July 31, 2024 09:06 37s master
master
July 31, 2024 09:06 37s
Update simple_animal.dm (#56) Check for merge conflicts #50: Commit 0a6a955 pushed by Tatarla
July 30, 2024 15:24 41s master
master
July 30, 2024 15:24 41s
movements (#55) Check for merge conflicts #49: Commit fc30860 pushed by Tatarla
July 30, 2024 15:24 32s master
master
July 30, 2024 15:24 32s
Adds categories for panels. (#58) Check for merge conflicts #48: Commit 9a7ee9d pushed by Tatarla
July 30, 2024 15:23 1m 1s master
master
July 30, 2024 15:23 1m 1s
Update TGS_Talos (#54) Check for merge conflicts #47: Commit 096340d pushed by Tatarla
July 30, 2024 10:28 36s master
master
July 30, 2024 10:28 36s
Tad and layer fixes and changes. (#52) Check for merge conflicts #46: Commit 958d904 pushed by Tatarla
July 29, 2024 18:53 38s master
master
July 29, 2024 18:53 38s
Req qols. (#53) Check for merge conflicts #45: Commit 4d8d93d pushed by Tatarla
July 29, 2024 18:51 33s master
master
July 29, 2024 18:51 33s
Resting rework. (#48) Check for merge conflicts #44: Commit ea45e8b pushed by Tatarla
July 29, 2024 18:50 1m 2s master
master
July 29, 2024 18:50 1m 2s
TGS Talos (#36) Check for merge conflicts #43: Commit 67dc89b pushed by Tatarla
July 29, 2024 12:27 46s master
master
July 29, 2024 12:27 46s
Organ defines, get_organ_slot, remove_organ_slot, makes rocks and cra… Check for merge conflicts #42: Commit 90b19cb pushed by Tatarla
July 29, 2024 12:16 39s master
master
July 29, 2024 12:16 39s
Aim mode 2 (#51) Check for merge conflicts #41: Commit 38c8c94 pushed by Helg2
July 29, 2024 11:05 38s master
master
July 29, 2024 11:05 38s
Cargo fast delivery (#21) Check for merge conflicts #40: Commit a0b5044 pushed by Tatarla
July 29, 2024 07:08 41s master
master
July 29, 2024 07:08 41s
Movement fixes and adjustments. (#47) Check for merge conflicts #39: Commit c2b2bbf pushed by Tatarla
July 29, 2024 05:34 45s master
master
July 29, 2024 05:34 45s
Combat robot (#45) Check for merge conflicts #38: Commit f2babae pushed by Tatarla
July 28, 2024 11:02 41s master
master
July 28, 2024 11:02 41s
Deletes unused hostile simple mobs, deletes old cyborg gear. (#46) Check for merge conflicts #37: Commit c91b1d7 pushed by Tatarla
July 27, 2024 16:56 43s master
master
July 27, 2024 16:56 43s
aim (#44) Check for merge conflicts #36: Commit 9e665d5 pushed by Tatarla
July 27, 2024 16:21 35s master
master
July 27, 2024 16:21 35s