Skip to content

Actions: MrMelbert/MapleStationCode

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
25 workflow run results
25 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds blood volume and ""BPM"" to OP consoles (#378) Check for merge conflicts #354: Commit e60f82d pushed by MrMelbert
November 25, 2023 19:10 46s master
master
November 25, 2023 19:10 46s
Adds sprinting (inspired from Citadel's system), makes walking defaul… Check for merge conflicts #353: Commit 3cf7c62 pushed by MrMelbert
November 20, 2023 09:32 40s master
master
November 20, 2023 09:32 40s
Adds loadout slots / presets (on a per-character basis) (#377) Check for merge conflicts #352: Commit 18c4e41 pushed by MrMelbert
November 20, 2023 00:02 40s master
master
November 20, 2023 00:02 40s
CPR tweaks (#375) Check for merge conflicts #351: Commit 3db14b8 pushed by MrMelbert
November 19, 2023 09:01 26s master
master
November 19, 2023 09:01 26s
Some brain trauma tweaks (#376) Check for merge conflicts #350: Commit fb2d6a6 pushed by MrMelbert
November 19, 2023 09:01 38s master
master
November 19, 2023 09:01 38s
Adds Kimonos and Yukatas (#374) Check for merge conflicts #349: Commit e144030 pushed by MrMelbert
November 13, 2023 00:14 55s master
master
November 13, 2023 00:14 55s
Double Decker Lima AI satellite (#373) Check for merge conflicts #348: Commit fdbb981 pushed by MrMelbert
November 12, 2023 06:24 36s master
master
November 12, 2023 06:24 36s
Adds Auto-CPR device (#371) Check for merge conflicts #347: Commit 069d284 pushed by MrMelbert
November 12, 2023 06:24 39s master
master
November 12, 2023 06:24 39s
Makes Lima Cargo Vertical (#372) Check for merge conflicts #346: Commit 27f8c48 pushed by MrMelbert
November 9, 2023 23:05 1m 1s master
master
November 9, 2023 23:05 1m 1s
Reworks CPR (#367) Check for merge conflicts #345: Commit 602823b pushed by MrMelbert
November 8, 2023 18:52 37s master
master
November 8, 2023 18:52 37s
Re-adds vampire bat form, disallows vampires from entering other depa… Check for merge conflicts #344: Commit 6d3fe96 pushed by MrMelbert
November 8, 2023 18:47 41s master
master
November 8, 2023 18:47 41s
Compact defibs fit on labcoats and similar medical gear (#368) Check for merge conflicts #343: Commit 91d05ae pushed by MrMelbert
November 8, 2023 18:38 58s master
master
November 8, 2023 18:38 58s
Minor Illusion Major Buff (#365) Check for merge conflicts #342: Commit 11382be pushed by MrMelbert
November 2, 2023 19:31 5m 41s master
master
November 2, 2023 19:31 5m 41s
Adds liver and lung autosurgeons to cargo (#362) Check for merge conflicts #341: Commit 63ee03a pushed by MrMelbert
November 2, 2023 19:30 52s master
master
November 2, 2023 19:30 52s
Fixes a pain oversight (#363) Check for merge conflicts #340: Commit 28da2e6 pushed by MrMelbert
November 1, 2023 06:01 47s master
master
November 1, 2023 06:01 47s
Fixes some bad typepaths (#364) Check for merge conflicts #339: Commit a893073 pushed by MrMelbert
November 1, 2023 06:01 51s master
master
November 1, 2023 06:01 51s
Allows you to attach air tanks to operating tables for eaiser applica… Check for merge conflicts #338: Commit 2ce51a0 pushed by MrMelbert
October 28, 2023 22:09 48s master
master
October 28, 2023 22:09 48s
Fixes anesthesia locker access, adds shock blankets to generic medica… Check for merge conflicts #337: Commit f5cdb3d pushed by MrMelbert
October 28, 2023 22:02 54s master
master
October 28, 2023 22:02 54s
Merges the fax machines (#355) Check for merge conflicts #336: Commit 886df1d pushed by MrMelbert
October 22, 2023 23:06 44s master
master
October 22, 2023 23:06 44s
Updates the Green Tea Line, Pilk and Pegnog's sprites. (#358) Check for merge conflicts #335: Commit 29a7545 pushed by MrMelbert
October 22, 2023 23:06 55s master
master
October 22, 2023 23:06 55s
Properly unreg's turf changed when space openspace is deleted (76501) Check for merge conflicts #334: Commit e08c63e pushed by MrMelbert
October 18, 2023 23:04 1m 1s master
master
October 18, 2023 23:04 1m 1s
Being defibbed abates shock and heals some pain (#356) Check for merge conflicts #333: Commit 910a6dd pushed by MrMelbert
October 15, 2023 23:17 47s master
master
October 15, 2023 23:17 47s
Laurence scarf fixes (#357) Check for merge conflicts #332: Commit 72005b1 pushed by MrMelbert
October 15, 2023 23:16 51s master
master
October 15, 2023 23:16 51s
Kidnaps bottle sprites from upstream (#354) Check for merge conflicts #331: Commit 8e030be pushed by MrMelbert
October 9, 2023 19:46 53s master
master
October 9, 2023 19:46 53s
Ports The Hand of Midas into our tempfolder (#352) Check for merge conflicts #330: Commit 47ef9b8 pushed by MrMelbert
October 8, 2023 07:03 54s master
master
October 8, 2023 07:03 54s