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

Bearcat Mapping tweaks (#414) Check for merge conflicts #332: Commit 2b4fe6c pushed by RimiNosha
December 2, 2023 00:45 36s master
master
December 2, 2023 00:45 36s
Bearcat Wall paint + Medical lathe. (#407) Check for merge conflicts #331: Commit 28b3c90 pushed by RimiNosha
November 28, 2023 21:27 48s master
master
November 28, 2023 21:27 48s
Nukes Prisoner crime pref (#408) Check for merge conflicts #330: Commit ae2218d pushed by RimiNosha
November 28, 2023 21:26 36s master
master
November 28, 2023 21:26 36s
[Port] Babylon Derelict station ruin (#388) Check for merge conflicts #329: Commit ea6b15c pushed by RimiNosha
November 28, 2023 21:20 2m 53s master
master
November 28, 2023 21:20 2m 53s
Makes Elevator Emergency Stop Non-Silent, Fix Panel Stop Button Appea… Check for merge conflicts #328: Commit fa38505 pushed by RimiNosha
November 28, 2023 21:16 41s master
master
November 28, 2023 21:16 41s
Replaces Nanotrasen with Artea a bunch (#409) Check for merge conflicts #327: Commit 5e88653 pushed by RimiNosha
November 28, 2023 21:14 43s master
master
November 28, 2023 21:14 43s
Bodies Can No Longer Be Easily Superheated (#376) Check for merge conflicts #326: Commit bc295a3 pushed by RimiNosha
November 26, 2023 00:12 43s master
master
November 26, 2023 00:12 43s
Remove Shift Start Auto Blue Alert + Renames Central Command to Corpo… Check for merge conflicts #325: Commit 4c1a0ee pushed by RimiNosha
November 26, 2023 00:12 50s master
master
November 26, 2023 00:12 50s
Resprite Stools, Office Chairs, Comfy Chairs, Normal Chairs and Wood+… Check for merge conflicts #324: Commit 9dfded3 pushed by RimiNosha
November 23, 2023 21:25 40s master
master
November 23, 2023 21:25 40s
Fix Shuttle Autocall Being Overzealous (#371) Check for merge conflicts #323: Commit c8ee062 pushed by RimiNosha
November 23, 2023 21:25 50s master
master
November 23, 2023 21:25 50s
[PORT] Finally Fixes Grilles and Elevators Having No Step Sound (#378) Check for merge conflicts #322: Commit f460a1b pushed by RimiNosha
November 20, 2023 20:33 47s master
master
November 20, 2023 20:33 47s
Fix Shuttle Viewers Having Their View Set Incrorrectly (#382) Check for merge conflicts #321: Commit 699d2f9 pushed by RimiNosha
November 20, 2023 20:33 1m 10s master
master
November 20, 2023 20:33 1m 10s
Fix Renaming Captain's Spare ID Not Updating Text, Remove Extra Typin… Check for merge conflicts #320: Commit 3dfa1a3 pushed by RimiNosha
November 20, 2023 20:33 48s master
master
November 20, 2023 20:33 48s
Fixes Bearcat's Surgical Computer Not Actually Being One (#383) Check for merge conflicts #319: Commit c2a06b5 pushed by RimiNosha
November 20, 2023 20:32 1m 11s master
master
November 20, 2023 20:32 1m 11s
Make Vendors Show Returns as Free (#373) Check for merge conflicts #318: Commit 4188c09 pushed by RimiNosha
November 19, 2023 21:43 36s master
master
November 19, 2023 21:43 36s
Kitchen, Botany, Chemistry and Partial Atmospherics Machinery Resprit… Check for merge conflicts #317: Commit 6ff9185 pushed by RimiNosha
November 18, 2023 17:36 41s master
master
November 18, 2023 17:36 41s
Fix Airlock Note Overlays, Note Removal Hints, Poster Removal Examine… Check for merge conflicts #316: Commit 16d538a pushed by RimiNosha
November 18, 2023 17:36 51s master
master
November 18, 2023 17:36 51s
Automatic TGS DMAPI Update (#381) Check for merge conflicts #315: Commit a4476da pushed by RimiNosha
November 18, 2023 17:35 31s master
master
November 18, 2023 17:35 31s
Fix Cycling Chem Cartridge Pour Amounts Bricking Them (#379) Check for merge conflicts #314: Commit 45143b9 pushed by RimiNosha
November 18, 2023 17:35 1m 0s master
master
November 18, 2023 17:35 1m 0s
Removes 2/3rds of The Astrum's Thrusters (#380) Check for merge conflicts #313: Commit bb0c386 pushed by RimiNosha
November 18, 2023 17:34 36s master
master
November 18, 2023 17:34 36s
Dish Drives No Longer Broadcast Every Single Fucking Message (#374) Check for merge conflicts #312: Commit e3863a8 pushed by RimiNosha
November 18, 2023 17:33 37s master
master
November 18, 2023 17:33 37s
Fix Another Sporadic Harddel (#377) Check for merge conflicts #311: Commit 42ebb50 pushed by RimiNosha
November 18, 2023 17:33 48s master
master
November 18, 2023 17:33 48s
[PORT] Fancy Announcements! (#343) Check for merge conflicts #310: Commit 3b5f1de pushed by RimiNosha
November 17, 2023 17:55 41s master
master
November 17, 2023 17:55 41s
Holomaps! (#274) Check for merge conflicts #309: Commit 78cd0aa pushed by RimiNosha
November 17, 2023 17:11 44s master
master
November 17, 2023 17:11 44s
Soundening Part Three, Item Edition! (#348) Check for merge conflicts #308: Commit fafdad2 pushed by RimiNosha
November 17, 2023 02:23 52s master
master
November 17, 2023 02:23 52s