Skip to content

Actions: Wollywoger/MapleStationCode

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
13 workflow runs
13 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[IDB Ignore] Felinid is dead, long live Animid (#812) Check for merge conflicts #41: Commit 1973ee0 pushed by Wollywoger
1d 0h 0m 2s master
master
1d 0h 0m 2s
Adds support for GAGS underwear / uses it to make digi lizards look l… Check for merge conflicts #40: Commit 2812f21 pushed by Wollywoger
1d 0h 0m 1s master
master
1d 0h 0m 1s
Check for merge conflicts Check for merge conflicts #39: by Wollywoger
1d 0h 0m 3s master
master
1d 0h 0m 3s
Speech and radio changes (#785) Check for merge conflicts #38: Commit c913eac pushed by Wollywoger
1d 0h 0m 2s master
master
1d 0h 0m 2s
adds the very recently added TGstation drinks (#789) Check for merge conflicts #37: Commit e0a1686 pushed by Wollywoger
1d 0h 0m 1s master
master
1d 0h 0m 1s
Gives Stabilizer chromosomes a pity chance (#693) Check for merge conflicts #36: Commit 4ddfa4b pushed by Wollywoger
1d 0h 0m 2s master
master
1d 0h 0m 2s
Fixes the one tube on Kilo (#756) Check for merge conflicts #35: Commit e4b0c1e pushed by Wollywoger
1d 0h 0m 2s master
master
1d 0h 0m 2s
Isaackverstraussen spell (#727) Check for merge conflicts #34: Commit 4c9b8bc pushed by Wollywoger
1s master
master
1s
Detective Honorific: Sheriff (#713) Check for merge conflicts #33: Commit 4733e10 pushed by Wollywoger
1s master
master
1s
Valentines Day (#663) Check for merge conflicts #32: Commit 0cf3ed9 pushed by Wollywoger
32s master
master
32s
Adds in the colorblind quirk. (#632) Check for merge conflicts #31: Commit 34090ec pushed by Wollywoger
29s master
master
29s
Fix Silverscale statue on Multi z maps (#646) Check for merge conflicts #30: Commit d21a5b8 pushed by Wollywoger
30s master
master
30s
Language Menu (like the one in the preferences) Rework (#631) Check for merge conflicts #29: Commit 92af125 pushed by Wollywoger
26s master
master
26s