Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
929 workflow run results
929 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix gooey catslime ears disappearing across Z-levels (#2449) Check for merge conflicts #1147: Commit ad69e1c pushed by dwasint
June 29, 2024 06:29 41s master
master
June 29, 2024 06:29 41s
fixes botany early game (#2460) Check for merge conflicts #1146: Commit 84d82fa pushed by dwasint
June 29, 2024 06:29 45s master
master
June 29, 2024 06:29 45s
Donator Item [elliethedarksun] (#2446) Check for merge conflicts #1145: Commit fe172c2 pushed by wraith-54321
June 27, 2024 23:16 40s master
master
June 27, 2024 23:16 40s
[PORTS] Garbage Collection Optimizations (#2435) Check for merge conflicts #1144: Commit c00f89b pushed by dwasint
June 27, 2024 19:20 17m 50s master
master
June 27, 2024 19:20 17m 50s
new botany trait (#2430) Check for merge conflicts #1143: Commit 9b2cd5e pushed by dwasint
June 26, 2024 23:52 39s master
master
June 26, 2024 23:52 39s
fixblueshifttest (#2426) Check for merge conflicts #1142: Commit 9a0ca6b pushed by dwasint
June 26, 2024 21:59 11m 22s master
master
June 26, 2024 21:59 11m 22s
tgui: prettierx -> prettier, fix dev server (#2418) Check for merge conflicts #1141: Commit e87eb95 pushed by dwasint
June 26, 2024 20:32 38m 35s master
master
June 26, 2024 20:32 38m 35s
Adds egg bag to cloth crafting (#2417) Check for merge conflicts #1140: Commit 2c5cc7e pushed by dwasint
June 26, 2024 20:30 34m 49s master
master
June 26, 2024 20:30 34m 49s
Ports being able to craft plastitanium shards. (#2100) Check for merge conflicts #1139: Commit 6afeadc pushed by dwasint
June 26, 2024 20:28 36m 33s master
master
June 26, 2024 20:28 36m 33s
Adds graylung (#2055) Check for merge conflicts #1138: Commit 747dad9 pushed by dwasint
June 26, 2024 20:23 41m 18s master
master
June 26, 2024 20:23 41m 18s
Placing someone on an operating table now actually buckles them (#2059) Check for merge conflicts #1137: Commit 206024c pushed by dwasint
June 26, 2024 20:22 41m 40s master
master
June 26, 2024 20:22 41m 40s
fixes prisoner latejoins (#2421) Check for merge conflicts #1136: Commit 476d5fa pushed by dwasint
June 26, 2024 20:19 44m 4s master
master
June 26, 2024 20:19 44m 4s
title request (#2420) Check for merge conflicts #1135: Commit 57dc857 pushed by dwasint
June 26, 2024 20:15 47m 23s master
master
June 26, 2024 20:15 47m 23s
Double the timeout on integration tests to help prevent timeouts wher… Check for merge conflicts #1134: Commit 7f85f10 pushed by dwasint
June 26, 2024 20:15 47m 36s master
master
June 26, 2024 20:15 47m 36s
yield adjusts (#2336) Check for merge conflicts #1133: Commit cf79d5f pushed by dwasint
June 26, 2024 19:12 17m 26s master
master
June 26, 2024 19:12 17m 26s
[PORT] Updates Node bootstrapping to v20 (#2360) Check for merge conflicts #1132: Commit e1e86c4 pushed by dwasint
June 26, 2024 19:12 17m 37s master
master
June 26, 2024 19:12 17m 37s
Pretties up the Chemical Analyzer's output (#83866) (#2361) Check for merge conflicts #1131: Commit 960f561 pushed by dwasint
June 26, 2024 19:12 17m 34s master
master
June 26, 2024 19:12 17m 34s
Ports various /tg/ sprites (#2365) Check for merge conflicts #1130: Commit ffc8269 pushed by dwasint
June 26, 2024 19:11 17m 43s master
master
June 26, 2024 19:11 17m 43s
[PORT] Bring our workflows into (mostly) parity with tgstation's work… Check for merge conflicts #1129: Commit 614dc06 pushed by dwasint
June 26, 2024 19:11 18m 6s master
master
June 26, 2024 19:11 18m 6s
Formally update the BYOND version requirements in the config (and in … Check for merge conflicts #1128: Commit f65128b pushed by dwasint
June 26, 2024 19:11 17m 19s master
master
June 26, 2024 19:11 17m 19s
Adds a unit test to ensure that xenobio pens are properly mapped in (… Check for merge conflicts #1127: Commit 9e6a741 pushed by dwasint
June 26, 2024 19:11 16m 31s master
master
June 26, 2024 19:11 16m 31s
unga bunga forge wants your ships (#2375) Check for merge conflicts #1126: Commit 1360950 pushed by dwasint
June 26, 2024 19:10 17m 9s master
master
June 26, 2024 19:10 17m 9s
Adds the Chemical Sensor to the crafting menu. (#2406) Check for merge conflicts #1125: Commit 9c2e8b7 pushed by dwasint
June 26, 2024 19:09 16m 5s master
master
June 26, 2024 19:09 16m 5s
Soulcatchers now capitalize their messages, like other mobs. (#2409) Check for merge conflicts #1124: Commit bc8db17 pushed by dwasint
June 26, 2024 19:09 13m 59s master
master
June 26, 2024 19:09 13m 59s
[PORT] RCD rework (roundstart engi RCDs, cooling, disrupting, etc) (#… Check for merge conflicts #1123: Commit e4cb655 pushed by dwasint
June 26, 2024 19:09 12m 55s master
master
June 26, 2024 19:09 12m 55s