Skip to content

Actions: MrMelbert/MapleStationCode

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
176 workflow runs
176 workflow runs

Filter by Event

⌥ + click/return to exclude

Filter by Status

⌥ + click/return to exclude

Filter by Branch

⌥ + click/return to exclude

Filter by Actor

⌥ + click/return to exclude
Fixes to OmegaStation (#922) Check for merge conflicts #772: Commit b94861d pushed by MrMelbert
Queued master
master
Queued
[MDB Ignore] Stumps, tourniquets, you bleed from traumaic amputation … Check for merge conflicts #771: Commit ba9d9dc pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Minor preround changes (done postround) (#921) Check for merge conflicts #770: Commit ae9f9db pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
[MDB Ignore] OmegaStation ( and some minor Kilo stuff) (#919) Check for merge conflicts #769: Commit c6ada70 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Updates DMAPI to 7.4.0 (Latest) (#920) Check for merge conflicts #768: Commit 67fda85 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Partially ports updates to the in-game HUD interface (#915) Check for merge conflicts #767: Commit 170c8c1 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
BYOND 516.1670 and 516.1681 Compatibility (#916) Check for merge conflicts #766: Commit 3969077 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Obfuscates health and damage numbers in some places (#913) Check for merge conflicts #765: Commit 89fd4a6 pushed by MrMelbert
1d 0h 0m 3s master
master
1d 0h 0m 3s
Mutant parts like tails and wings are now "meshed" when certain equip… Check for merge conflicts #764: Commit 085eebb pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
TGUI Spawn Panel, TGUI Spawn, fixed TGUI Nuke Pane, abstract_type mov… Check for merge conflicts #763: Commit d765e80 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Amputate limbs in body menu (#914) Check for merge conflicts #762: Commit 8c92531 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Makes situations that change sprint length max also cap their sprint.… Check for merge conflicts #761: Commit 4b47b97 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
[IDB Ignore] You can be taller without it looking ugly (and some more… Check for merge conflicts #760: Commit 9bb0221 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Adds printable plastic medkits (#899) Check for merge conflicts #759: Commit 2c16a00 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Skill additions (Skill quirks, medical skill self diagnosis) (#894) Check for merge conflicts #758: Commit 46be577 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Many Mood Updates (#881) Check for merge conflicts #757: Commit 9667439 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Android and Synthetic rework (#854) Check for merge conflicts #756: Commit 476114d pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
ports Legion mob nerfs (#908) Check for merge conflicts #755: Commit c573445 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Stops permanent breath issues from heart replacement of a different h… Check for merge conflicts #754: Commit 23d6410 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
updates tools/CI some so I can actually use MapMerge also fixes file … Check for merge conflicts #753: Commit f8bacb3 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Fix inverse pacifism (#903) Check for merge conflicts #752: Commit 6345cd7 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Silverscale blood type fix (#901) Check for merge conflicts #751: Commit fc1c069 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Ody syringe gun fix (#900) Check for merge conflicts #750: Commit 0d0984a pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Hydroponic trays no longer increase power consumption when upgraded. … Check for merge conflicts #749: Commit 2c0da77 pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Quick blood sprite fix (#898) Check for merge conflicts #748: Commit dac2243 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s