Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
922 workflow run results
922 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix 'Clear Chat' not working (#2286) Check for merge conflicts #1047: Commit bc76b6b pushed by dwasint
June 15, 2024 18:41 1m 10s master
master
June 15, 2024 18:41 1m 10s
Cult stun nerfs (+ old man henderson) (#1600) Check for merge conflicts #1046: Commit e75e4c5 pushed by dwasint
June 14, 2024 05:12 1m 26s master
master
June 14, 2024 05:12 1m 26s
Properly clear callbacks from xenobiology-related components (#2265) Check for merge conflicts #1045: Commit 732cb70 pushed by dwasint
June 14, 2024 04:56 40s master
master
June 14, 2024 04:56 40s
Return proper init values for SSgamemode and SSholomaps (#2261) Check for merge conflicts #1044: Commit 3c04b6c pushed by dwasint
June 14, 2024 03:09 45s master
master
June 14, 2024 03:09 45s
Fix roundstart antag rulesets breaking with the Late Arrivals trait (… Check for merge conflicts #1043: Commit cee99a1 pushed by wraith-54321
June 13, 2024 23:10 59s master
master
June 13, 2024 23:10 59s
Fix some runtimes related to combat mode (#2246) Check for merge conflicts #1042: Commit b4256c0 pushed by wraith-54321
June 13, 2024 07:29 10m 34s master
master
June 13, 2024 07:29 10m 34s
Fix a to chat runtime with stoves (#77178) (#2244) Check for merge conflicts #1041: Commit fbb9998 pushed by wraith-54321
June 13, 2024 07:28 1m 30s master
master
June 13, 2024 07:28 1m 30s
Sign Language action now properly updates its background when toggled… Check for merge conflicts #1040: Commit b4611a5 pushed by wraith-54321
June 13, 2024 07:28 44s master
master
June 13, 2024 07:28 44s
[PORT] Food and Drink Ports (#1647) Check for merge conflicts #1039: Commit b9bce7b pushed by dwasint
June 13, 2024 03:04 16m 55s master
master
June 13, 2024 03:04 16m 55s
Take advantage of how thing.get_all_contents() already includes `sr… Check for merge conflicts #1038: Commit be26efd pushed by dwasint
June 13, 2024 03:04 16m 33s master
master
June 13, 2024 03:04 16m 33s
Mind "unconvertable" refactor + consistency (#2028) Check for merge conflicts #1037: Commit 5a8b8e5 pushed by dwasint
June 13, 2024 03:04 15m 0s master
master
June 13, 2024 03:04 15m 0s
Ranching: A new Horizon (#2017) Check for merge conflicts #1036: Commit 0a89554 pushed by dwasint
June 13, 2024 03:03 14m 43s master
master
June 13, 2024 03:03 14m 43s
Port several tgui-related fixes from /tg/ (#2245) Check for merge conflicts #1035: Commit 4399d65 pushed by dwasint
June 13, 2024 03:02 14m 51s master
master
June 13, 2024 03:02 14m 51s
Re-addded all edited files to branch (#2250) Check for merge conflicts #1034: Commit 137a65a pushed by dwasint
June 13, 2024 03:02 11m 57s master
master
June 13, 2024 03:02 11m 57s
silicon suicide change (#2252) Check for merge conflicts #1033: Commit 428b629 pushed by dwasint
June 13, 2024 03:02 1m 24s master
master
June 13, 2024 03:02 1m 24s
No qdel callbacks (#2248) Check for merge conflicts #1032: Commit 0e936ee pushed by dwasint
June 13, 2024 03:01 48s master
master
June 13, 2024 03:01 48s
Fix runtimes related to mineral regrowth (#2231) Check for merge conflicts #1031: Commit b9ca7d0 pushed by wraith-54321
June 13, 2024 02:06 45s master
master
June 13, 2024 02:06 45s
whoops (#2233) Check for merge conflicts #1030: Commit 210011f pushed by dwasint
June 12, 2024 07:18 44s master
master
June 12, 2024 07:18 44s
TRAIT_EASILY_WOUNDED and TRAIT_HARDLY_WOUNDED now balance out (#2… Check for merge conflicts #1029: Commit 2888065 pushed by wraith-54321
June 12, 2024 00:50 39s master
master
June 12, 2024 00:50 39s
Fix changing font size and such breaking tgchat (#2226) Check for merge conflicts #1028: Commit c7a7631 pushed by dwasint
June 11, 2024 23:48 39s master
master
June 11, 2024 23:48 39s
Unknown Methamphetamine Isomer is now actually safe (#2214) Check for merge conflicts #1027: Commit 6b23634 pushed by wraith-54321
June 11, 2024 05:45 42s master
master
June 11, 2024 05:45 42s
Attempt to fix composter-induced lag (#2210) Check for merge conflicts #1026: Commit d6feabb pushed by dwasint
June 10, 2024 21:20 48s master
master
June 10, 2024 21:20 48s
Make PACO ammo fit in shoes. (#2005) Check for merge conflicts #1025: Commit cdc8199 pushed by wraith-54321
June 8, 2024 10:11 38s master
master
June 8, 2024 10:11 38s
[PORT] Some pAI ports (#2143) Check for merge conflicts #1024: Commit be9e1eb pushed by wraith-54321
June 8, 2024 06:14 41s master
master
June 8, 2024 06:14 41s
Oozelings now transfer orbiters to/from their core (#2182) Check for merge conflicts #1023: Commit 7c8b6dd pushed by dwasint
June 7, 2024 20:26 1m 0s master
master
June 7, 2024 20:26 1m 0s