Skip to content

Actions: Citadel-Station-13/Citadel-Station-13-RP

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
748 workflow runs
748 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Removed Tajaran, Unathi, and Promethean centric xenowear lock (#6974) Check for merge conflicts #3325: Commit 6ce5f8e pushed by BlueWildrose
January 23, 2025 00:16 41s master
master
January 23, 2025 00:16 41s
Easy and simple fix to the Scoophead (#6971) Check for merge conflicts #3324: Commit 9e4a02e pushed by TheLordME
January 22, 2025 17:39 37s master
master
January 22, 2025 17:39 37s
Adds a bunch of loadout items into the vendors + some fixes (#6973) Check for merge conflicts #3323: Commit ea96de3 pushed by TheLordME
January 22, 2025 17:38 26s master
master
January 22, 2025 17:38 26s
fixes resist (crappily but it works) (#6965) Check for merge conflicts #3322: Commit da9c21e pushed by TheLordME
January 22, 2025 17:38 48s master
master
January 22, 2025 17:38 48s
add passport.dmi to da repo for future use :) (#6960) Check for merge conflicts #3321: Commit 34eb33f pushed by BlueWildrose
January 22, 2025 04:48 42s master
master
January 22, 2025 04:48 42s
Fixes Intercom Convo (#6955) Check for merge conflicts #3320: Commit 18e2330 pushed by silicons
January 21, 2025 13:25 27s master
master
January 21, 2025 13:25 27s
adds the aquatic trait (#6969) Check for merge conflicts #3319: Commit beac640 pushed by silicons
January 21, 2025 13:25 37s master
master
January 21, 2025 13:25 37s
More Endeavour Bug fixes? (#6966) Check for merge conflicts #3318: Commit fe708d8 pushed by silicons
January 21, 2025 13:25 52s master
master
January 21, 2025 13:25 52s
Outsider Spawn Update. (#6968) Check for merge conflicts #3317: Commit 14b369e pushed by silicons
January 21, 2025 13:23 40s master
master
January 21, 2025 13:23 40s
misplaced backslash fix (#6970) Check for merge conflicts #3316: Commit d26a59d pushed by silicons
January 18, 2025 18:32 41s master
master
January 18, 2025 18:32 41s
refactors / brsuhes up a lot of update_icon calls, fixes mineral wall… Check for merge conflicts #3315: Commit 794d9aa pushed by TheLordME
January 16, 2025 17:59 40s master
master
January 16, 2025 17:59 40s
Further endeavour fixes and tweaks (#6961) Check for merge conflicts #3314: Commit 639c0a3 pushed by silicons
January 11, 2025 15:51 41s master
master
January 11, 2025 15:51 41s
moves some trivial configs around to new config (#6950) Check for merge conflicts #3313: Commit 3e2fea9 pushed by TheLordME
January 10, 2025 16:34 27s master
master
January 10, 2025 16:34 27s
bugfix / tweaks (#6959) Check for merge conflicts #3312: Commit aed3013 pushed by TheLordME
January 10, 2025 16:34 38s master
master
January 10, 2025 16:34 38s
Offstation Spawns for Visitors, on Nebula (#6921) Check for merge conflicts #3311: Commit a0e8bab pushed by silicons
January 10, 2025 16:28 33s master
master
January 10, 2025 16:28 33s
AAAA fixing Atlas Trading shuttle docking (#6957) Check for merge conflicts #3310: Commit 1c67704 pushed by silicons
January 10, 2025 16:28 27s master
master
January 10, 2025 16:28 27s
Fixes operating consoles (#6958) Check for merge conflicts #3309: Commit 26787f1 pushed by silicons
January 10, 2025 16:28 1m 3s master
master
January 10, 2025 16:28 1m 3s
Docking update and bug fixes (i got rid of the funny name) (#6953) Check for merge conflicts #3308: Commit 9793e79 pushed by silicons
January 1, 2025 20:38 40s master
master
January 1, 2025 20:38 40s
add minHealth which controls when carbons die so we can set it in spe… Check for merge conflicts #3307: Commit faa992a pushed by TheLordME
December 31, 2024 13:35 42s master
master
December 31, 2024 13:35 42s
Fixes to areas, and a couple bad airless tiles (#6951) Check for merge conflicts #3306: Commit 15240f4 pushed by silicons
December 30, 2024 02:27 26s master
master
December 30, 2024 02:27 26s
Endeavour Deck 1 maints and wire fixes (#6952) Check for merge conflicts #3305: Commit 9a3e110 pushed by silicons
December 30, 2024 02:27 1m 13s master
master
December 30, 2024 02:27 1m 13s
Endeavour deck 3 maints update (#6943) Check for merge conflicts #3304: Commit 692667f pushed by silicons
December 30, 2024 02:26 31s master
master
December 30, 2024 02:26 31s
Endeavour deck 4 maints update (#6945) Check for merge conflicts #3303: Commit 6aa45e3 pushed by silicons
December 30, 2024 02:26 43s master
master
December 30, 2024 02:26 43s
Update nanomapgen.dm (#6941) Check for merge conflicts #3302: Commit b8ff885 pushed by TheLordME
December 29, 2024 18:25 39s master
master
December 29, 2024 18:25 39s
maybe fixes the hub (#6949) Check for merge conflicts #3301: Commit e3a3742 pushed by TheLordME
December 29, 2024 18:20 39s master
master
December 29, 2024 18:20 39s