Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,391 workflow run results
1,391 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

What if we took centcom aaand...moved it somewhere else! Adds an eorg… Check for merge conflicts #1507: Commit 638eeaf pushed by ThePooba
September 11, 2024 04:21 51s master
master
September 11, 2024 04:21 51s
[Donator] Ophaq's donator items (#3311) Check for merge conflicts #1506: Commit b3cff66 pushed by ThePooba
September 10, 2024 22:21 46s master
master
September 10, 2024 22:21 46s
Increase visibility (#3290) Check for merge conflicts #1505: Commit 057d9bd pushed by ThePooba
September 10, 2024 22:21 47s master
master
September 10, 2024 22:21 47s
Prisoner now need hours (#3309) Check for merge conflicts #1504: Commit 3f0d195 pushed by ThePooba
September 10, 2024 19:49 42s master
master
September 10, 2024 19:49 42s
griefers b gon (#3307) Check for merge conflicts #1503: Commit e1e73ee pushed by ThePooba
September 10, 2024 17:17 55s master
master
September 10, 2024 17:17 55s
medical records fix. (#3306) Check for merge conflicts #1502: Commit f3c0ed8 pushed by ThePooba
September 10, 2024 17:13 45s master
master
September 10, 2024 17:13 45s
Brig Physician QC Pass #1 (#3208) Check for merge conflicts #1501: Commit f29d954 pushed by ThePooba
September 10, 2024 16:18 45s master
master
September 10, 2024 16:18 45s
Syndicate Shocktroops event rebalance (#2708) Check for merge conflicts #1500: Commit 35dadfe pushed by ThePooba
September 10, 2024 15:06 58s master
master
September 10, 2024 15:06 58s
Portable chem mixer refactor and QOL changes, window sill properly de… Check for merge conflicts #1499: Commit 8989b6b pushed by ThePooba
September 10, 2024 14:59 26s master
master
September 10, 2024 14:59 26s
surgical globes (#3261) Check for merge conflicts #1498: Commit 8bdc979 pushed by ThePooba
September 10, 2024 14:58 1m 3s master
master
September 10, 2024 14:58 1m 3s
You can no longer accidentally round-remove yourself with a single mi… Check for merge conflicts #1497: Commit be954ca pushed by Absolucy
September 10, 2024 01:34 46s master
master
September 10, 2024 01:34 46s
Heretic sacrifice refactor! (#3279) Check for merge conflicts #1496: Commit 4f060ba pushed by Absolucy
September 10, 2024 01:32 1m 4s master
master
September 10, 2024 01:32 1m 4s
Nametag fixes + improvements (#3289) Check for merge conflicts #1495: Commit 821b338 pushed by Absolucy
September 10, 2024 01:27 29s master
master
September 10, 2024 01:27 29s
[Fully-Modular] Adds a keybind to allow for pixel shifting of one's c… Check for merge conflicts #1494: Commit 3b36787 pushed by Absolucy
September 10, 2024 01:26 1m 3s master
master
September 10, 2024 01:26 1m 3s
Ore Processing Framework (#2766) Check for merge conflicts #1493: Commit 5a14bc9 pushed by dwasint
September 9, 2024 20:12 54s master
master
September 9, 2024 20:12 54s
Cosmic Fields now block projectiles (#3150) Check for merge conflicts #1492: Commit 7887872 pushed by Absolucy
September 8, 2024 23:27 50s master
master
September 8, 2024 23:27 50s
Adds reinforcing clothes with durathread (#3141) Check for merge conflicts #1491: Commit ebcce87 pushed by Absolucy
September 8, 2024 23:25 59s master
master
September 8, 2024 23:25 59s
Ports several book-related PRs from /tg/ (#2454) Check for merge conflicts #1490: Commit 9f9f412 pushed by Absolucy
September 8, 2024 23:23 38s master
master
September 8, 2024 23:23 38s
Adds mggaow and purr emotes, adds an uncommon funny meow (#2857) Check for merge conflicts #1489: Commit 86f7ae2 pushed by Absolucy
September 8, 2024 23:22 1m 13s master
master
September 8, 2024 23:22 1m 13s
speen (#3073) Check for merge conflicts #1488: Commit bd8758e pushed by Absolucy
September 8, 2024 22:30 47s master
master
September 8, 2024 22:30 47s
Ensure blood volume is restored whenever TRAIT_NOBLOOD is lost (#3280) Check for merge conflicts #1487: Commit fef5549 pushed by Absolucy
September 8, 2024 22:30 1m 2s master
master
September 8, 2024 22:30 1m 2s
no more tables (#3286) Check for merge conflicts #1486: Commit d4d05ae pushed by ThePooba
September 8, 2024 22:00 45s master
master
September 8, 2024 22:00 45s
Fix heart attacks (#3276) Check for merge conflicts #1485: Commit 54e8ec3 pushed by dwasint
September 8, 2024 19:46 42s master
master
September 8, 2024 19:46 42s
Properly fix Light Step (#3273) Check for merge conflicts #1484: Commit 79c6862 pushed by Absolucy
September 8, 2024 07:18 1m 47s master
master
September 8, 2024 07:18 1m 47s
Remove bounties that just deprive station resources (#2890) Check for merge conflicts #1483: Commit adc1584 pushed by Absolucy
September 8, 2024 06:44 1m 59s master
master
September 8, 2024 06:44 1m 59s