Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
936 workflow run results
936 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[PORT] Shuttle events! (#2473) Check for merge conflicts #1172: Commit aa5c846 pushed by dwasint
July 5, 2024 21:27 38s master
master
July 5, 2024 21:27 38s
various minor /tg/ bugfixes (#2505) Check for merge conflicts #1171: Commit caeca3c pushed by dwasint
July 5, 2024 21:09 26s master
master
July 5, 2024 21:09 26s
Fix runtimes related to opt-in checking (#2503) Check for merge conflicts #1170: Commit 950a668 pushed by dwasint
July 5, 2024 21:08 1m 11s master
master
July 5, 2024 21:08 1m 11s
RPLD UI now shows the sprites for new xenobio stuf (#2512) Check for merge conflicts #1169: Commit 6b888ac pushed by dwasint
July 5, 2024 21:08 1m 22s master
master
July 5, 2024 21:08 1m 22s
Makes it easier to place tiles on multi-z holes (#2536) Check for merge conflicts #1168: Commit ed0e9f2 pushed by dwasint
July 5, 2024 21:08 1m 31s master
master
July 5, 2024 21:08 1m 31s
Fix organs being replaced when not needed (#81575) (#2456) Check for merge conflicts #1167: Commit 8a0b289 pushed by wraith-54321
July 5, 2024 05:52 42s master
master
July 5, 2024 05:52 42s
[PORT] Mind link speech displays symbols correctly (#2523) Check for merge conflicts #1166: Commit 87dc2be pushed by wraith-54321
July 5, 2024 05:51 1m 8s master
master
July 5, 2024 05:51 1m 8s
Partial fix of heretic shapechanges (#81434) (#2531) Check for merge conflicts #1165: Commit bcec465 pushed by dwasint
July 4, 2024 20:23 54s master
master
July 4, 2024 20:23 54s
The main CWC PR (#1709) Check for merge conflicts #1164: Commit 3a2c993 pushed by wraith-54321
July 4, 2024 06:26 46s master
master
July 4, 2024 06:26 46s
Firing pins are now more expensive (#2521) Check for merge conflicts #1163: Commit 46fd504 pushed by dwasint
July 3, 2024 20:11 57s master
master
July 3, 2024 20:11 57s
soundfix (#2510) Check for merge conflicts #1162: Commit 499700c pushed by dwasint
July 3, 2024 18:43 29s master
master
July 3, 2024 18:43 29s
You can no longer somehow reach *around* a shield wall (#2513) Check for merge conflicts #1161: Commit ff8c90c pushed by dwasint
July 3, 2024 18:43 52s master
master
July 3, 2024 18:43 52s
Fix incorrect usage of liquids.remove_any (#2524) Check for merge conflicts #1160: Commit de2f841 pushed by dwasint
July 3, 2024 18:43 1m 3s master
master
July 3, 2024 18:43 1m 3s
ashwalker stuff and a new quirk (#2497) Check for merge conflicts #1159: Commit 90a73b7 pushed by dwasint
July 3, 2024 18:41 46s master
master
July 3, 2024 18:41 46s
Fix newly built slime pens allowing ooze to leak (#2507) Check for merge conflicts #1158: Commit 4cf76dc pushed by wraith-54321
July 3, 2024 06:01 44s master
master
July 3, 2024 06:01 44s
Some more misc runtime fixes (#2491) Check for merge conflicts #1157: Commit 087649b pushed by dwasint
July 1, 2024 04:33 28s master
master
July 1, 2024 04:33 28s
Changes (#2492) Check for merge conflicts #1156: Commit bdfe47f pushed by dwasint
July 1, 2024 04:33 52s master
master
July 1, 2024 04:33 52s
Novastore (nova clothes in loadouts and store) Part 1 + Fixes satyr l… Check for merge conflicts #1155: Commit af07866 pushed by dwasint
July 1, 2024 04:32 37s master
master
July 1, 2024 04:32 37s
Fix runtime with cybernetic bodypart overlays (#2468) Check for merge conflicts #1154: Commit 837ac80 pushed by dwasint
July 1, 2024 04:31 38s master
master
July 1, 2024 04:31 38s
[PORT] Adds a unit test for typepaths that are required to be mapped … Check for merge conflicts #1153: Commit 0212e79 pushed by dwasint
July 1, 2024 04:31 39s master
master
July 1, 2024 04:31 39s
Meteor satellites now longer shake the camera (#2471) Check for merge conflicts #1152: Commit 70bde5e pushed by dwasint
July 1, 2024 04:30 38s master
master
July 1, 2024 04:30 38s
av4l0n (#2486) Check for merge conflicts #1151: Commit 89e1a1a pushed by dwasint
July 1, 2024 04:30 46s master
master
July 1, 2024 04:30 46s
[PORT] Bindable action buttons (#2488) Check for merge conflicts #1150: Commit dc842f9 pushed by dwasint
July 1, 2024 04:28 52s master
master
July 1, 2024 04:28 52s
Improves tgui build speed (#79916) (#2452) Check for merge conflicts #1149: Commit 4de06e1 pushed by dwasint
June 29, 2024 06:32 26s master
master
June 29, 2024 06:32 26s
Fix various components holding onto callbacks (#2451) Check for merge conflicts #1148: Commit 1642176 pushed by dwasint
June 29, 2024 06:32 39s master
master
June 29, 2024 06:32 39s