Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,792 workflow runs
1,792 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix for harvest ball (#4003) Check for merge conflicts #1863: Commit e0aca34 pushed by dwasint
October 28, 2024 07:44 39s master
master
October 28, 2024 07:44 39s
Fix the endless kitchen fire alarms on Box and Delta (#4002) Check for merge conflicts #1862: Commit 5e6cfd7 pushed by Absolucy
October 28, 2024 07:19 43s master
master
October 28, 2024 07:19 43s
IPC damage fix (#4001) Check for merge conflicts #1861: Commit 0b01232 pushed by dwasint
October 28, 2024 04:30 44s master
master
October 28, 2024 04:30 44s
Adds pocket heaters to the game (#3957) Check for merge conflicts #1860: Commit 7cbc3c4 pushed by ThePooba
October 27, 2024 22:46 55s master
master
October 27, 2024 22:46 55s
Metastation Kitchen Refresh (#3984) Check for merge conflicts #1859: Commit 1e3efb8 pushed by ThePooba
October 27, 2024 22:38 44s master
master
October 27, 2024 22:38 44s
Fixes luminiscent major extract activation action not disappearing/up… Check for merge conflicts #1858: Commit a7b7d8d pushed by Absolucy
October 27, 2024 00:35 41s master
master
October 27, 2024 00:35 41s
Fixes washing colors off of players not working (#3977) Check for merge conflicts #1857: Commit b0302f8 pushed by Absolucy
October 26, 2024 23:38 7m 3s master
master
October 26, 2024 23:38 7m 3s
Fixes shuttle events sometimes killing everyone (#85047) (#3973) Check for merge conflicts #1856: Commit 9c5dbd2 pushed by Absolucy
October 26, 2024 23:38 6m 51s master
master
October 26, 2024 23:38 6m 51s
Fixes firelocks not respecting thermal sensors being disabled (#85212… Check for merge conflicts #1855: Commit ccbb436 pushed by Absolucy
October 26, 2024 23:37 6m 59s master
master
October 26, 2024 23:37 6m 59s
Pro-tagonista Syndrome balancing (without making it useless) (#3935) Check for merge conflicts #1854: Commit 8eca847 pushed by Absolucy
October 26, 2024 20:15 43s master
master
October 26, 2024 20:15 43s
Assault operative improvements (#3937) Check for merge conflicts #1853: Commit 80f286e pushed by Absolucy
October 26, 2024 20:14 44s master
master
October 26, 2024 20:14 44s
Kilostation Decal Updates (#3933) Check for merge conflicts #1852: Commit 3e4e462 pushed by Absolucy
October 26, 2024 20:07 50s master
master
October 26, 2024 20:07 50s
More small sprite fixes (#3966) Check for merge conflicts #1851: Commit 275941b pushed by Absolucy
October 26, 2024 20:06 37s master
master
October 26, 2024 20:06 37s
Losslessly compresses all sound files using optivorbis (#3968) Check for merge conflicts #1850: Commit bc4d817 pushed by Absolucy
October 26, 2024 20:05 49s master
master
October 26, 2024 20:05 49s
Canonical Movement (#82085) (#3974) Check for merge conflicts #1849: Commit 11a5ec8 pushed by Absolucy
October 26, 2024 20:05 59s master
master
October 26, 2024 20:05 59s
revs disabled Check for merge conflicts #1848: Commit 63da0fe pushed by wraith-54321
October 26, 2024 07:41 38s master
master
October 26, 2024 07:41 38s
Replace /proc/trim_reduced with the native BYOND trimtext (#87317… Check for merge conflicts #1847: Commit 988134c pushed by Absolucy
October 26, 2024 00:25 41s master
master
October 26, 2024 00:25 41s
Slugcat overhaul license (#3960) Check for merge conflicts #1846: Commit 110a394 pushed by ThePooba
October 25, 2024 21:59 47s master
master
October 25, 2024 21:59 47s
Ive randomly decided to port NTSL from yogstation. Lets see how dis g… Check for merge conflicts #1845: Commit f3ec826 pushed by ThePooba
October 25, 2024 21:02 2m 46s master
master
October 25, 2024 21:02 2m 46s
Slugcat Language and Sounds! (#3930) Check for merge conflicts #1844: Commit 4da5dba pushed by ThePooba
October 25, 2024 20:47 43s master
master
October 25, 2024 20:47 43s
MetaStation - Updated Artifact Experimentation Lab design (#3876) Check for merge conflicts #1843: Commit 596d05d pushed by Absolucy
October 24, 2024 21:19 55s master
master
October 24, 2024 21:19 55s
ports syndicate horses, and fixes space movement bug, adds syndicate … Check for merge conflicts #1842: Commit 1ae1266 pushed by Absolucy
October 24, 2024 19:16 1m 1s master
master
October 24, 2024 19:16 1m 1s
Relocating someone's joint no longer hurts the person HELPING instead… Check for merge conflicts #1841: Commit 25d5d3a pushed by Absolucy
October 24, 2024 19:11 41s master
master
October 24, 2024 19:11 41s
remove pops and lower volume (#3941) Check for merge conflicts #1840: Commit 65a5337 pushed by ThePooba
October 24, 2024 02:26 42s master
master
October 24, 2024 02:26 42s
Insulation now properly protects you from icebox snowstorms (+ partic… Check for merge conflicts #1839: Commit 6e60b0d pushed by Absolucy
October 23, 2024 22:00 41s master
master
October 23, 2024 22:00 41s