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,792 workflow runs
1,792 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Ensure the master and failsafe controllers never have a usr (#87365… Check for merge conflicts #1838: Commit 14ae0e6 pushed by Absolucy
October 23, 2024 21:59 41s master
master
October 23, 2024 21:59 41s
Fix overlay lighting messing up alert overlays (#3908) Check for merge conflicts #1837: Commit 0c5fe90 pushed by Absolucy
October 23, 2024 21:59 1m 1s master
master
October 23, 2024 21:59 1m 1s
Local catgirl fixes another batch of minor issues (#3920) Check for merge conflicts #1836: Commit 65ce079 pushed by Absolucy
October 23, 2024 17:40 39s master
master
October 23, 2024 17:40 39s
Adds flower crowns! (#3914) Check for merge conflicts #1835: Commit 057aa23 pushed by ThePooba
October 23, 2024 16:20 56s master
master
October 23, 2024 16:20 56s
Makes it so nanite slurry doesnt kill IPC's via heat (#3917) Check for merge conflicts #1834: Commit 1767ae7 pushed by ThePooba
October 23, 2024 16:19 1m 11s master
master
October 23, 2024 16:19 1m 11s
pen update (#3927) Check for merge conflicts #1833: Commit 09b80c6 pushed by ThePooba
October 23, 2024 16:10 58s master
master
October 23, 2024 16:10 58s
Silicon Update (#3907) Check for merge conflicts #1832: Commit cc77a58 pushed by ThePooba
October 23, 2024 16:08 51s master
master
October 23, 2024 16:08 51s
Small CC Tweak (#3916) Check for merge conflicts #1831: Commit c55c24f pushed by ThePooba
October 23, 2024 16:07 59s master
master
October 23, 2024 16:07 59s
jimmytombstone (#3921) Check for merge conflicts #1830: Commit f88d6f3 pushed by ThePooba
October 23, 2024 16:07 1m 8s master
master
October 23, 2024 16:07 1m 8s
Refactors several changeling abilities to status effects and ports "D… Check for merge conflicts #1829: Commit 3a35f27 pushed by ThePooba
October 23, 2024 16:00 46s master
master
October 23, 2024 16:00 46s
Allow numbers in names, give palsmamen, arachnids, and flies hair (#3… Check for merge conflicts #1828: Commit d81975a pushed by ThePooba
October 23, 2024 16:00 1m 16s master
master
October 23, 2024 16:00 1m 16s
Prevent spamming climbing attempts (#3924) Check for merge conflicts #1827: Commit 21b3902 pushed by ThePooba
October 23, 2024 15:56 45s master
master
October 23, 2024 15:56 45s
Adds the [REDACTED] Security Level (#3784) Check for merge conflicts #1826: Commit c6807cd pushed by ThePooba
October 23, 2024 02:23 39s master
master
October 23, 2024 02:23 39s
Adds a new changeling ability "Storage Cavity", for storing IDs and s… Check for merge conflicts #1825: Commit dc11fa2 pushed by ThePooba
October 22, 2024 17:38 51s master
master
October 22, 2024 17:38 51s
Tribal claw buff (#3886) Check for merge conflicts #1824: Commit c715470 pushed by ThePooba
October 22, 2024 15:19 46s master
master
October 22, 2024 15:19 46s
slaughter/laughter demon roundend report consume count + you cant bod… Check for merge conflicts #1823: Commit bca1a1f pushed by Absolucy
October 22, 2024 11:25 37s master
master
October 22, 2024 11:25 37s
Minor QoL and bug fixes for mining (#3847) Check for merge conflicts #1822: Commit 9796eb8 pushed by Absolucy
October 22, 2024 11:22 39s master
master
October 22, 2024 11:22 39s
Adds rtg's to kilo warehouse (#3880) Check for merge conflicts #1821: Commit ba67089 pushed by Absolucy
October 22, 2024 11:20 39s master
master
October 22, 2024 11:20 39s
Voidraptor BP office and Theseus QM office (#3901) Check for merge conflicts #1820: Commit e323d41 pushed by Absolucy
October 22, 2024 11:19 38s master
master
October 22, 2024 11:19 38s
Fixed 2 hats that looked a bit jank on monkeys (sec cap and prop hat)… Check for merge conflicts #1819: Commit 5c8b947 pushed by Absolucy
October 22, 2024 11:18 52s master
master
October 22, 2024 11:18 52s
Protect obsession objective & silent trauma port from Bee. (#3842) Check for merge conflicts #1818: Commit 5d2271a pushed by Absolucy
October 22, 2024 11:17 41s master
master
October 22, 2024 11:17 41s
Buffs nightmares to make them playable again (#3777) Check for merge conflicts #1817: Commit b69a412 pushed by Absolucy
October 22, 2024 11:16 38s master
master
October 22, 2024 11:16 38s
[BOUNTY] Makes mayhem in a bottle more viable to use in general (#3809) Check for merge conflicts #1816: Commit f14014e pushed by Absolucy
October 22, 2024 11:15 1m 5s master
master
October 22, 2024 11:15 1m 5s
Plexora (#2655) Check for merge conflicts #1815: Commit 1fff894 pushed by Absolucy
October 22, 2024 11:11 51s master
master
October 22, 2024 11:11 51s
Character Armor style fix (#3884) Check for merge conflicts #1814: Commit 528f92f pushed by Absolucy
October 21, 2024 23:53 45s master
master
October 21, 2024 23:53 45s