Skip to content

Actions: MrMelbert/MapleStationCode

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
204 workflow runs
204 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Portal beams only manifest on same Z (#735) Check for merge conflicts #742: Commit dc0cbf5 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Fix robot limb burn repair (and some other postround stuff) (#889) Check for merge conflicts #741: Commit cb6786b pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
[MDB Ignore] Readds le cryo sleeper for le despawning and le latejoin… Check for merge conflicts #740: Commit 81e8724 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Post "crew L" round tweaks (#887) Check for merge conflicts #739: Commit 8282d00 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Actually I reworked dynamic, so let's not remove it and port the upda… Check for merge conflicts #738: Commit e9f339b pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Smell-o-vision (#866) Check for merge conflicts #737: Commit 14e32d2 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Sound pref tweaks (#885) Check for merge conflicts #736: Commit 7d80e58 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Research Director has genetic backups of all the crewmembers in their… Check for merge conflicts #735: Commit 93cc809 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Signal runtime (#882) Check for merge conflicts #734: Commit b2175ca pushed by MrMelbert
1d 0h 0m 3s master
master
1d 0h 0m 3s
Shuttle random runtime (#880) Check for merge conflicts #733: Commit abc9d69 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Actually-useful-skill-framework ft. no runescape grinding and no anno… Check for merge conflicts #732: Commit b64b962 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Valentines day massacre post round stuff (#877) Check for merge conflicts #731: Commit 1f882fb pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Cherry picks the odysseus medbeam fix. (#878) Check for merge conflicts #730: Commit 80b120b pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Medkit and bleeding treatment tweaks (#871) Check for merge conflicts #729: Commit b238db7 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Forced whisper from soft crit moved to suffocation (#744) Check for merge conflicts #728: Commit ea2ffaa pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Feburary Fixes (revamps opioid addiction and summore) (#872) Check for merge conflicts #727: Commit d60c882 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Whispers project over tables (#874) Check for merge conflicts #726: Commit fbc1225 pushed by MrMelbert
1d 0h 0m 4s master
master
1d 0h 0m 4s
Grab hand gets redder the harder you are grabbing (#873) Check for merge conflicts #725: Commit 9b33eb1 pushed by MrMelbert
1d 0h 0m 4s master
master
1d 0h 0m 4s
[MDB ignore] [IDB ignore] ports fix to bioscrambler anomaly invasion … Check for merge conflicts #724: Commit 369b7ea pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Show "x looks at y" when using computers and such (#861) Check for merge conflicts #723: Commit 708d38f pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Fixes many stamina checks to include pain (#868) Check for merge conflicts #722: Commit 0e486d0 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
The surgery rework (#870) Check for merge conflicts #721: Commit 0e94e7e pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Mechs BLEED (oil) (#849) Check for merge conflicts #720: Commit 8be82a5 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
[MDB Ignore] Lima exterior airlocks (#825) Check for merge conflicts #719: Commit e5b2cd3 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Adds in a new red glasses sprite as the default. (#863) Check for merge conflicts #718: Commit 289c93c pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s