Skip to content

Actions: MrMelbert/MapleStationCode

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
177 workflow runs
177 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
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
Replace get blood type with set blood type (#875) Check for merge conflicts #747: Commit 4c3b17b pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Check for merge conflicts Check for merge conflicts #746: by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Re-enables bloody clothing smelling of blood, also adds perfume (#890) Check for merge conflicts #745: Commit 967f952 pushed by MrMelbert
1d 0h 0m 1s master
master
1d 0h 0m 1s
Models blood pressure more thoroughly (#879) Check for merge conflicts #744: Commit a059ced pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
Fix Batong dealing 6x less damage by accident (#897) Check for merge conflicts #743: Commit 697da9c pushed by MrMelbert
1d 0h 0m 2s master
master
1d 0h 0m 2s
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