Skip to content

Actions: MrMelbert/MapleStationCode

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
211 workflow runs
211 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Sorts story items + Adds a compile flag to them (#643) Check for merge conflicts #570: Commit 62953be pushed by MrMelbert
February 22, 2025 20:21 39s master
master
February 22, 2025 20:21 39s
Buckle sounds and buckle sprites (#671) Check for merge conflicts #569: Commit 34ec34b pushed by MrMelbert
February 21, 2025 04:49 7m 51s master
master
February 21, 2025 04:49 7m 51s
Ports over the tgstation changes to thermal pistols and cranked weapo… Check for merge conflicts #568: Commit b8833e1 pushed by MrMelbert
February 21, 2025 04:47 41s master
master
February 21, 2025 04:47 41s
Captain's Beret is brought up to the modern captain's palette colors,… Check for merge conflicts #567: Commit 4e197ae pushed by MrMelbert
February 21, 2025 04:47 38s master
master
February 21, 2025 04:47 38s
Cherry-picks a ton of sprites from upstream [IDB Ignore] (#670) Check for merge conflicts #566: Commit 900ccc2 pushed by MrMelbert
February 20, 2025 03:39 37s master
master
February 20, 2025 03:39 37s
The alt job title thing + Honorifics (#662) Check for merge conflicts #565: Commit 25fd518 pushed by MrMelbert
February 19, 2025 00:05 9m 17s master
master
February 19, 2025 00:05 9m 17s
Fixes pixel offsets once and for all (#658) Check for merge conflicts #564: Commit b3152bb pushed by MrMelbert
February 19, 2025 00:05 2m 9s master
master
February 19, 2025 00:05 2m 9s
Adds mana-based Telepathy. (#650) Check for merge conflicts #563: Commit acaf0a6 pushed by MrMelbert
February 19, 2025 00:05 41s master
master
February 19, 2025 00:05 41s
Adds in Specialty .38 OPS Ammo (#640) Check for merge conflicts #562: Commit 0653ac3 pushed by MrMelbert
February 19, 2025 00:04 1m 1s master
master
February 19, 2025 00:04 1m 1s
This PR doesn't merge until we stop getting C&D failures (#665) Check for merge conflicts #561: Commit af40845 pushed by MrMelbert
February 18, 2025 02:17 36s master
master
February 18, 2025 02:17 36s
Adds the ringmasters set for Jester (#627) Check for merge conflicts #560: Commit d074565 pushed by MrMelbert
February 18, 2025 02:17 40s master
master
February 18, 2025 02:17 40s
Umbrellas now shade shadowpeople from light. (#645) Check for merge conflicts #559: Commit ffb71ab pushed by MrMelbert
February 17, 2025 07:36 42s master
master
February 17, 2025 07:36 42s
Valentines Day (#663) Check for merge conflicts #558: Commit 0cf3ed9 pushed by MrMelbert
February 14, 2025 19:53 37s master
master
February 14, 2025 19:53 37s
Silverscale Aura now dims in darkness (#661) Check for merge conflicts #557: Commit 650e58d pushed by MrMelbert
February 14, 2025 07:16 37s master
master
February 14, 2025 07:16 37s
Headset circuit shells output their wearer (#659) Check for merge conflicts #556: Commit 722b103 pushed by MrMelbert
February 14, 2025 07:03 41s master
master
February 14, 2025 07:03 41s
Speech sounds for carbon mobs work on tongue rather than species. (#652) Check for merge conflicts #555: Commit 841ab1f pushed by MrMelbert
February 2, 2025 23:13 7m 2s master
master
February 2, 2025 23:13 7m 2s
Adds a bespoke pre-game lobby chat (#657) Check for merge conflicts #554: Commit 9bfc575 pushed by MrMelbert
February 2, 2025 23:11 8m 12s master
master
February 2, 2025 23:11 8m 12s
Moves init time display out of chat (and make it hideable since most … Check for merge conflicts #553: Commit c3e9e05 pushed by MrMelbert
February 2, 2025 23:11 41s master
master
February 2, 2025 23:11 41s
Emotes are affeceted by voice pitch / frequency (#654) Check for merge conflicts #552: Commit 3bd7e43 pushed by MrMelbert
February 2, 2025 23:09 46s master
master
February 2, 2025 23:09 46s
Heath System Rework (#579) Check for merge conflicts #551: Commit 0067ac0 pushed by MrMelbert
January 27, 2025 05:25 41s master
master
January 27, 2025 05:25 41s
Adds 2 new posters to the game (#653) Check for merge conflicts #550: Commit c238fe5 pushed by MrMelbert
January 26, 2025 23:31 42s master
master
January 26, 2025 23:31 42s
Adds more of my own character content, plus two bits of generic conte… Check for merge conflicts #549: Commit 21fcfee pushed by MrMelbert
January 26, 2025 22:08 40s master
master
January 26, 2025 22:08 40s
Fix Master (#651) Check for merge conflicts #548: Commit 4e8bc38 pushed by MrMelbert
January 25, 2025 22:02 42s master
master
January 25, 2025 22:02 42s
Adds in the colorblind quirk. (#632) Check for merge conflicts #547: Commit 34090ec pushed by MrMelbert
January 25, 2025 19:36 1m 11s master
master
January 25, 2025 19:36 1m 11s
Support for holiday loadout items (and also custom lipstick colors I … Check for merge conflicts #546: Commit d816694 pushed by MrMelbert
January 25, 2025 19:35 44s master
master
January 25, 2025 19:35 44s