Skip to content

Actions: MrMelbert/MapleStationCode

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
158 workflow run results
158 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[IDB Ignore] Ports like 10 or 12 of my PRs from TG, also makes Silver… Check for merge conflicts #437: Commit 54659eb pushed by MrMelbert
May 15, 2024 20:26 38s master
master
May 15, 2024 20:26 38s
Does maintenance on mechs, adds in the hypergauss. (#451) Check for merge conflicts #436: Commit c4a2241 pushed by MrMelbert
May 15, 2024 19:52 44s master
master
May 15, 2024 19:52 44s
adds yuri (#483) Check for merge conflicts #435: Commit 6807d34 pushed by MrMelbert
May 15, 2024 19:38 4m 8s master
master
May 15, 2024 19:38 4m 8s
ambassadont (#488) Check for merge conflicts #434: Commit 44e9d50 pushed by MrMelbert
May 15, 2024 18:37 39s master
master
May 15, 2024 18:37 39s
Adds hair and outfit for Grey (#487) Check for merge conflicts #433: Commit 0e08578 pushed by MrMelbert
May 12, 2024 23:16 39s master
master
May 12, 2024 23:16 39s
Here we go again: Dress Addition (#480) Check for merge conflicts #432: Commit 1120598 pushed by MrMelbert
May 11, 2024 22:32 36s master
master
May 11, 2024 22:32 36s
Adds one of the Noble Ambassadors Pets (#481) Check for merge conflicts #431: Commit 7049c1e pushed by MrMelbert
May 11, 2024 22:16 47s master
master
May 11, 2024 22:16 47s
Pete is now a beautiful transmasc goat again (#479) Check for merge conflicts #430: Commit 0e1586f pushed by MrMelbert
May 11, 2024 22:14 25s master
master
May 11, 2024 22:14 25s
Adds sneak mode to replicate the old "no footstep" behavior of walkin… Check for merge conflicts #429: Commit 610f762 pushed by MrMelbert
May 11, 2024 22:14 35s master
master
May 11, 2024 22:14 35s
Mu Radio, Mu Messages and Mu Faxes. (#443) Check for merge conflicts #428: Commit 81c3faa pushed by MrMelbert
April 28, 2024 22:48 4m 3s master
master
April 28, 2024 22:48 4m 3s
Numbness stops pain effects (#477) Check for merge conflicts #427: Commit dbbd665 pushed by MrMelbert
April 28, 2024 22:47 36s master
master
April 28, 2024 22:47 36s
Height overlay fixes (#473) Check for merge conflicts #426: Commit 9100330 pushed by MrMelbert
April 21, 2024 23:52 41s master
master
April 21, 2024 23:52 41s
Adds some more personal content (#466) Check for merge conflicts #425: Commit f8c43e0 pushed by MrMelbert
April 21, 2024 23:32 52s master
master
April 21, 2024 23:32 52s
Converts designs to defines, removes unused scatter laser change. (#457) Check for merge conflicts #424: Commit b27b3ff pushed by MrMelbert
April 21, 2024 05:23 38s master
master
April 21, 2024 05:23 38s
Volkan's box filled with communication chips is now spawnable. (#471) Check for merge conflicts #423: Commit c96114d pushed by MrMelbert
April 16, 2024 01:09 37s master
master
April 16, 2024 01:09 37s
Adjusts spell Flares Lifetime and Lesser Cooldown (#464) Check for merge conflicts #422: Commit d964603 pushed by MrMelbert
April 13, 2024 04:59 1m 22s master
master
April 13, 2024 04:59 1m 22s
crucial tgui fix taken from tg (#462) Check for merge conflicts #421: Commit f716052 pushed by MrMelbert
April 13, 2024 04:58 1m 50s master
master
April 13, 2024 04:58 1m 50s
Add Sansufentanyl prescription to Cargo, fix Psicodine prescription (… Check for merge conflicts #420: Commit 896f9bf pushed by MrMelbert
April 13, 2024 04:57 28s master
master
April 13, 2024 04:57 28s
Adds a cooldown to Airhike (#465) Check for merge conflicts #419: Commit 846b6f8 pushed by MrMelbert
April 13, 2024 04:57 35s master
master
April 13, 2024 04:57 35s
Makes the helmet desync module printable. (#468) Check for merge conflicts #418: Commit 6134d53 pushed by MrMelbert
April 1, 2024 23:37 36s master
master
April 1, 2024 23:37 36s
Fix canes (#469) Check for merge conflicts #417: Commit 190111d pushed by MrMelbert
April 1, 2024 19:17 36s master
master
April 1, 2024 19:17 36s
You walk faster with canes on missing limbs (#459) Check for merge conflicts #416: Commit b45c2cf pushed by MrMelbert
March 24, 2024 23:24 38s master
master
March 24, 2024 23:24 38s
Reverts station trait costs, adds general budget (#460) Check for merge conflicts #415: Commit 756f535 pushed by MrMelbert
March 24, 2024 23:04 45s master
master
March 24, 2024 23:04 45s
Adds Stasis Bodybags, Tweaks Stasis, Tweaks Bodybags (#456) Check for merge conflicts #414: Commit a4c25ea pushed by MrMelbert
March 22, 2024 04:05 40s master
master
March 22, 2024 04:05 40s
Protect master (#458) Check for merge conflicts #413: Commit fe9af48 pushed by MrMelbert
March 13, 2024 23:43 38s master
master
March 13, 2024 23:43 38s