Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
510 workflow run results
510 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Makes clown dagger slippery and funny, clown bible too. (#1691) Check for merge conflicts #828: Commit eda5e18 pushed by dwasint
April 20, 2024 22:39 3m 38s master
master
April 20, 2024 22:39 3m 38s
Dropper QoL: droppers can now only transfer 1u 2u, or 5u (#1655) Check for merge conflicts #827: Commit 84a8965 pushed by dwasint
April 20, 2024 22:38 3m 58s master
master
April 20, 2024 22:38 3m 58s
You can now escape the nuke by going to the deepest part of Icebox. (… Check for merge conflicts #826: Commit 1c18193 pushed by dwasint
April 20, 2024 22:38 3m 5s master
master
April 20, 2024 22:38 3m 5s
Henchmen Outfit (#1592) Check for merge conflicts #825: Commit 4352b5a pushed by dwasint
April 20, 2024 22:37 1m 1s master
master
April 20, 2024 22:37 1m 1s
fixes tram tests (#1702) Check for merge conflicts #824: Commit 7dd1c05 pushed by dwasint
April 20, 2024 15:15 45s master
master
April 20, 2024 15:15 45s
Ports conversion blood brothers from /tg/ (#1320) Check for merge conflicts #823: Commit 7002339 pushed by dwasint
April 20, 2024 03:25 40s master
master
April 20, 2024 03:25 40s
Funny (#1559) Check for merge conflicts #822: Commit 4403eff pushed by dwasint
April 20, 2024 03:12 50s master
master
April 20, 2024 03:12 50s
refix (#1685) Check for merge conflicts #821: Commit 80f535e pushed by dwasint
April 19, 2024 03:09 39s master
master
April 19, 2024 03:09 39s
Xenobiology QoL/fixup pass (#1638) Check for merge conflicts #820: Commit 19d3df1 pushed by dwasint
April 18, 2024 18:14 49s master
master
April 18, 2024 18:14 49s
Fix holoparasite resetting not working (#1658) Check for merge conflicts #819: Commit 391c7c7 pushed by dwasint
April 18, 2024 01:11 42s master
master
April 18, 2024 01:11 42s
Fixes tramstation disposals (#1665) Check for merge conflicts #818: Commit b1f8bd4 pushed by dwasint
April 16, 2024 16:47 15m 59s master
master
April 16, 2024 16:47 15m 59s
Heavily increases and randomizes the speech cooldown of parrots (#1666) Check for merge conflicts #817: Commit be02e08 pushed by dwasint
April 16, 2024 16:41 5m 39s master
master
April 16, 2024 16:41 5m 39s
2 tail (#1671) Check for merge conflicts #816: Commit 2f7a6b7 pushed by dwasint
April 16, 2024 16:41 2m 22s master
master
April 16, 2024 16:41 2m 22s
my obligatory quarterly CWC PR (#1626) Check for merge conflicts #815: Commit 88214dc pushed by dwasint
April 16, 2024 16:39 3m 24s master
master
April 16, 2024 16:39 3m 24s
Makes some nerfs to hardlight spears (#1580) Check for merge conflicts #814: Commit ed2cfed pushed by dwasint
April 16, 2024 16:38 3m 34s master
master
April 16, 2024 16:38 3m 34s
{FIX} Fusion no longer glasses the station. (#1675) Check for merge conflicts #813: Commit 134d677 pushed by dwasint
April 16, 2024 16:38 40s master
master
April 16, 2024 16:38 40s
aaaaaaaaaaaaaaaaaa (#1667) Check for merge conflicts #812: Commit c5b112e pushed by dwasint
April 16, 2024 02:16 54s master
master
April 16, 2024 02:16 54s
yes (#1654) Check for merge conflicts #811: Commit 3d8c330 pushed by dwasint
April 15, 2024 03:47 38s master
master
April 15, 2024 03:47 38s
If you can't taste, then you also can't smell. (#1594) Check for merge conflicts #810: Commit 66d0aa4 pushed by dwasint
April 15, 2024 03:22 41s master
master
April 15, 2024 03:22 41s
Allow sign language users to invoke spells (#1598) Check for merge conflicts #809: Commit 89a7904 pushed by dwasint
April 15, 2024 03:21 37s master
master
April 15, 2024 03:21 37s
puts composters into every perma that didn't have it (#1610) Check for merge conflicts #808: Commit f5a1113 pushed by dwasint
April 13, 2024 22:32 8m 2s master
master
April 13, 2024 22:32 8m 2s
[PORT] Martian Food: A Taste of the Red Planet (#1511) Check for merge conflicts #807: Commit 5e882f8 pushed by dwasint
April 13, 2024 00:21 44s master
master
April 13, 2024 00:21 44s
Adds better trait for no stamina stun, adds it to various things that… Check for merge conflicts #806: Commit e4e4df9 pushed by dwasint
April 12, 2024 23:54 51s master
master
April 12, 2024 23:54 51s
Fix Persuasion Rack Bugs (#1591) Check for merge conflicts #805: Commit a3597d1 pushed by dwasint
April 12, 2024 22:21 3m 8s master
master
April 12, 2024 22:21 3m 8s
Fix blank events being considered (#1643) Check for merge conflicts #804: Commit 7c7e6ae pushed by dwasint
April 12, 2024 22:19 39s master
master
April 12, 2024 22:19 39s