Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,071 workflow runs
2,071 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix some issues interrupting game start (#5033) Check for merge conflicts #2326: Commit 51ad769 pushed by Absolucy
January 22, 2025 10:09 43s master
master
January 22, 2025 10:09 43s
Phobia regex should not be a global expression (#5008) Check for merge conflicts #2325: Commit e09128c pushed by ThePooba
January 22, 2025 01:31 58s master
master
January 22, 2025 01:31 58s
Phobias should not prevent forced says (#5009) Check for merge conflicts #2324: Commit f671b8f pushed by ThePooba
January 22, 2025 01:29 41s master
master
January 22, 2025 01:29 41s
Revert "Fixes and balances some problems with satyrs (#4712)" (#4894) Check for merge conflicts #2323: Commit 03f5c84 pushed by Absolucy
January 21, 2025 22:21 40s master
master
January 21, 2025 22:21 40s
Moves up sleep infliction in order (#5022) Check for merge conflicts #2322: Commit bcdd117 pushed by Absolucy
January 21, 2025 21:51 43s master
master
January 21, 2025 21:51 43s
Icon and filter optimization stuff (#4825) Check for merge conflicts #2321: Commit f87f4a3 pushed by Absolucy
January 21, 2025 19:38 3m 22s master
master
January 21, 2025 19:38 3m 22s
Add an extra CI check for BYOND 516 (#5015) Check for merge conflicts #2320: Commit ab240e8 pushed by Absolucy
January 21, 2025 17:26 38s master
master
January 21, 2025 17:26 38s
Update SpacemanDMM and rust-g (#5010) Check for merge conflicts #2319: Commit 04821ae pushed by Absolucy
January 21, 2025 17:25 29s master
master
January 21, 2025 17:25 29s
Update Yarn (3.3.1 -> 4.5.1) and Node (20.13.0 -> 22.11.0) (#5013) Check for merge conflicts #2318: Commit 1b92ca0 pushed by Absolucy
January 21, 2025 17:25 43s master
master
January 21, 2025 17:25 43s
Port various UX improvements from tg (#4835) Check for merge conflicts #2317: Commit 23c0c52 pushed by Absolucy
January 21, 2025 08:32 3m 37s master
master
January 21, 2025 08:32 3m 37s
[PORT] ports tg's void heretic rework (#4768) Check for merge conflicts #2316: Commit 42953b8 pushed by Absolucy
January 21, 2025 02:11 1m 7s master
master
January 21, 2025 02:11 1m 7s
Adds *annoyed and *sweatdrop emotes (#4988) Check for merge conflicts #2315: Commit c711ed4 pushed by tired-wired
January 21, 2025 01:38 1m 43s master
master
January 21, 2025 01:38 1m 43s
[PORT] Heretics dream of objects around unused influences (#4970) Check for merge conflicts #2314: Commit 72736cc pushed by tired-wired
January 21, 2025 01:38 1m 19s master
master
January 21, 2025 01:38 1m 19s
Ghost runechat now shows to anyone who can both see and hear ghosts (… Check for merge conflicts #2313: Commit 12fb7d9 pushed by tired-wired
January 21, 2025 01:37 1m 14s master
master
January 21, 2025 01:37 1m 14s
Prevent rat kings from shitting out oil/vomit from inside of vents (#… Check for merge conflicts #2312: Commit 99b6166 pushed by tired-wired
January 21, 2025 01:37 1m 34s master
master
January 21, 2025 01:37 1m 34s
[PORT] Fixes things being statistically weighted to drop in security … Check for merge conflicts #2311: Commit 4d13619 pushed by Absolucy
January 21, 2025 01:18 36s master
master
January 21, 2025 01:18 36s
Fix borers sometimes losing Galactic Common (#4991) Check for merge conflicts #2310: Commit 2aebf15 pushed by Absolucy
January 21, 2025 01:17 1m 1s master
master
January 21, 2025 01:17 1m 1s
Fix latejoin cyborgs sometimes ending up in walls and such (#4989) Check for merge conflicts #2309: Commit c2d9623 pushed by Absolucy
January 21, 2025 01:16 1m 3s master
master
January 21, 2025 01:16 1m 3s
Fix food buffs potentially resulting in negative stamina (#4908) Check for merge conflicts #2308: Commit 9b785dc pushed by Absolucy
January 21, 2025 01:14 1m 30s master
master
January 21, 2025 01:14 1m 30s
Potential fix for give alert getting stuck, maybe? (#4944) Check for merge conflicts #2307: Commit b5516ce pushed by Absolucy
January 21, 2025 01:14 51s master
master
January 21, 2025 01:14 51s
Makes reagent explosions obey the max cap. (#4882) Check for merge conflicts #2306: Commit e25b594 pushed by tired-wired
January 20, 2025 18:27 38s master
master
January 20, 2025 18:27 38s
You can no longer "cheese" killing bloodsuckers via beheading (#4893) Check for merge conflicts #2305: Commit 67c5d5c pushed by tired-wired
January 20, 2025 18:24 42s master
master
January 20, 2025 18:24 42s
lol (#4957) Check for merge conflicts #2304: Commit 004874e pushed by tired-wired
January 20, 2025 18:07 40s master
master
January 20, 2025 18:07 40s
Britarnya Admin Office (#4800) Check for merge conflicts #2303: Commit 36885a2 pushed by ThePooba
January 20, 2025 17:25 44s master
master
January 20, 2025 17:25 44s
Roundstart equipment adjustments for command (#4956) Check for merge conflicts #2302: Commit 9c4b099 pushed by ThePooba
January 20, 2025 15:25 39s master
master
January 20, 2025 15:25 39s