Skip to content

Actions: Artea-Station/Artea-Station-Server

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
192 workflow runs
192 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Makes -DCOMPILE_MAPS Actually Compile All Maps (#532) Check for merge conflicts #407: Commit 40592db pushed by RimiNosha
January 15, 2024 22:02 28s master
master
January 15, 2024 22:02 28s
[PORT] TGUI Colour Picker From Bee (#525) Check for merge conflicts #406: Commit 60c79c0 pushed by RimiNosha
January 12, 2024 23:45 31s master
master
January 12, 2024 23:45 31s
The Darkening Limited 2024 Special (#526) Check for merge conflicts #405: Commit 5f73d41 pushed by RimiNosha
January 12, 2024 23:44 41s master
master
January 12, 2024 23:44 41s
[PORT] Autoconnect Canister Ports, Make Bearcat Fuel Lines Actually W… Check for merge conflicts #404: Commit a19227c pushed by RimiNosha
January 10, 2024 16:41 42s master
master
January 10, 2024 16:41 42s
Automatic TGS DMAPI Update (#509) Check for merge conflicts #403: Commit bca5e85 pushed by RimiNosha
January 10, 2024 16:36 31s master
master
January 10, 2024 16:36 31s
[PORT] Makes ByondUI Mounting Much Less Laggy (#522) Check for merge conflicts #402: Commit 9e2fe09 pushed by RimiNosha
January 10, 2024 13:12 43s master
master
January 10, 2024 13:12 43s
[PORT] Literally Free Performance (#513) Check for merge conflicts #401: Commit 29631da pushed by RimiNosha
January 8, 2024 13:18 38s master
master
January 8, 2024 13:18 38s
Fixes Mounted Holomaps, Actually Places Them In Bearcat (#515) Check for merge conflicts #400: Commit a1ec9ab pushed by RimiNosha
January 3, 2024 19:51 31s master
master
January 3, 2024 19:51 31s
Fix Deliveries Not Being Completable (#516) Check for merge conflicts #399: Commit 12a700d pushed by RimiNosha
January 3, 2024 19:50 32s master
master
January 3, 2024 19:50 32s
Fix Stray Supply Pods (#517) Check for merge conflicts #398: Commit 890b440 pushed by RimiNosha
January 3, 2024 19:50 40s master
master
January 3, 2024 19:50 40s
Fixes Synth Bodyparts Staying Inside Prefs Previews (#497) Check for merge conflicts #397: Commit 52a0af5 pushed by RimiNosha
January 2, 2024 15:40 54s master
master
January 2, 2024 15:40 54s
Fix A Windoor and Booze-O-Mat Sprite (#507) Check for merge conflicts #396: Commit c76cde7 pushed by RimiNosha
December 30, 2023 18:37 39s master
master
December 30, 2023 18:37 39s
oh shit something broke and byond is angry (#506) Check for merge conflicts #395: Commit bfe76f2 pushed by RimiNosha
December 30, 2023 00:52 35s master
master
December 30, 2023 00:52 35s
Prefs Deshittening Part 4 (#490) Check for merge conflicts #394: Commit 80209b9 pushed by RimiNosha
December 26, 2023 21:19 42s master
master
December 26, 2023 21:19 42s
Automatic TGS DMAPI Update (#505) Check for merge conflicts #393: Commit 83bbd37 pushed by RimiNosha
December 26, 2023 21:17 32s master
master
December 26, 2023 21:17 32s
Fix Matchmaking Panel Not Showing Anyone (#503) Check for merge conflicts #392: Commit 0e89a31 pushed by RimiNosha
December 24, 2023 20:20 40s master
master
December 24, 2023 20:20 40s
Fixes The Research Program Being Locked To Pathies (#504) Check for merge conflicts #391: Commit e9ab050 pushed by RimiNosha
December 24, 2023 20:20 29s master
master
December 24, 2023 20:20 29s
Closets Mk3 (#494) Check for merge conflicts #390: Commit 1e12202 pushed by RimiNosha
December 23, 2023 01:53 32s master
master
December 23, 2023 01:53 32s
Fix Jumpy Lobby Cam (#495) Check for merge conflicts #389: Commit 8887c22 pushed by RimiNosha
December 23, 2023 01:53 43s master
master
December 23, 2023 01:53 43s
Fix *Me Emotes Not Getting Formatted (#491) Check for merge conflicts #388: Commit c1d469f pushed by RimiNosha
December 22, 2023 14:41 1m 49s master
master
December 22, 2023 14:41 1m 49s
Fix Box Open Sound Being Too Loud (#492) Check for merge conflicts #387: Commit f76df78 pushed by RimiNosha
December 22, 2023 14:41 32s master
master
December 22, 2023 14:41 32s
Fix Border Firelocks Not Stopping Movement Out Of Their Turf (#493) Check for merge conflicts #386: Commit a9e6f79 pushed by RimiNosha
December 22, 2023 14:41 39s master
master
December 22, 2023 14:41 39s
Space law rename + Lawyer removal (#489) Check for merge conflicts #385: Commit 37d8467 pushed by RimiNosha
December 21, 2023 21:43 39s master
master
December 21, 2023 21:43 39s
Adds a Unit Test for Turf Sound Sanity (#488) Check for merge conflicts #384: Commit 5045fba pushed by RimiNosha
December 20, 2023 00:28 39s master
master
December 20, 2023 00:28 39s
Fixes Lizard Customization At Long Last, Cleans Up Some Of My Prefs S… Check for merge conflicts #383: Commit 98834a8 pushed by RimiNosha
December 19, 2023 23:35 50s master
master
December 19, 2023 23:35 50s