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

[PORT] Closet Anomaly station trait (#2333) Check for merge conflicts #1072: Commit a23f99f pushed by dwasint
June 20, 2024 04:58 4m 50s master
master
June 20, 2024 04:58 4m 50s
Fix recipes for same-color crossbreeds (#2329) Check for merge conflicts #1071: Commit d64e527 pushed by dwasint
June 20, 2024 04:57 4m 8s master
master
June 20, 2024 04:57 4m 8s
Bioscramblers can no longer give people an Atomic Ass (#2308) Check for merge conflicts #1070: Commit c7f9ff0 pushed by dwasint
June 19, 2024 05:44 57s master
master
June 19, 2024 05:44 57s
Update qp_sigmoid.dm Check for merge conflicts #1069: Commit 3b3ec4d pushed by dwasint
June 19, 2024 03:57 2m 40s master
master
June 19, 2024 03:57 2m 40s
Fix compiler errors (#2326) Check for merge conflicts #1068: Commit ee930cb pushed by dwasint
June 19, 2024 03:56 2m 6s master
master
June 19, 2024 03:56 2m 6s
Update tgstation.dme Check for merge conflicts #1067: Commit bfe07b5 pushed by dwasint
June 19, 2024 03:54 40s master
master
June 19, 2024 03:54 40s
Adjust genes scaling (#2312) Check for merge conflicts #1066: Commit 2a79723 pushed by dwasint
June 19, 2024 03:09 40s master
master
June 19, 2024 03:09 40s
Xenobiology quality of life and balance touchups (#2139) Check for merge conflicts #1065: Commit c97aa51 pushed by wraith-54321
June 19, 2024 01:42 1m 15s master
master
June 19, 2024 01:42 1m 15s
Donation items 061724 (#2318) Check for merge conflicts #1064: Commit 4bb5074 pushed by wraith-54321
June 19, 2024 01:29 43s master
master
June 19, 2024 01:29 43s
Oozeling cores, like oozelings, are now fireproof. (#2316) Check for merge conflicts #1063: Commit 0d5928c pushed by dwasint
June 17, 2024 22:29 6m 4s master
master
June 17, 2024 22:29 6m 4s
[PORT] Makes transferring functional wings to new bodies actually wor… Check for merge conflicts #1062: Commit 20d991c pushed by dwasint
June 16, 2024 21:01 14m 50s master
master
June 16, 2024 21:01 14m 50s
Morphs now properly update their name tags when disgusing (#2215) Check for merge conflicts #1061: Commit b0e5ecf pushed by dwasint
June 16, 2024 21:00 15m 6s master
master
June 16, 2024 21:00 15m 6s
Advanced/toxin medibots no longer kill oozelings (#2228) Check for merge conflicts #1060: Commit 0176289 pushed by dwasint
June 16, 2024 21:00 15m 29s master
master
June 16, 2024 21:00 15m 29s
Fix bloodsucker torpor and oozeling bugs (#2232) Check for merge conflicts #1059: Commit b6dddf3 pushed by dwasint
June 16, 2024 20:59 12m 7s master
master
June 16, 2024 20:59 12m 7s
Cleanup runechat callbacks upon deletion (#2236) Check for merge conflicts #1058: Commit 0bab61a pushed by dwasint
June 16, 2024 20:59 11m 58s master
master
June 16, 2024 20:59 11m 58s
Split events into several 'shared occurance' groups (#2267) Check for merge conflicts #1057: Commit d8a0cc0 pushed by dwasint
June 16, 2024 20:59 1m 26s master
master
June 16, 2024 20:59 1m 26s
Exhaling a big puff of cigarette smoke now actually pollutes (#2302) Check for merge conflicts #1056: Commit 986390a pushed by dwasint
June 16, 2024 20:59 1m 26s master
master
June 16, 2024 20:59 1m 26s
Sandman (#2296) Check for merge conflicts #1055: Commit 2eac46b pushed by dwasint
June 16, 2024 03:41 40s master
master
June 16, 2024 03:41 40s
loadout wallet (#2235) Check for merge conflicts #1054: Commit ce658cd pushed by wraith-54321
June 16, 2024 01:50 40s master
master
June 16, 2024 01:50 40s
Ports several atmos-related fixes from /tg/ (#2242) Check for merge conflicts #1053: Commit 9a40d23 pushed by dwasint
June 15, 2024 23:49 38s master
master
June 15, 2024 23:49 38s
adds missing stuff to kilo (#2269) Check for merge conflicts #1052: Commit e259df9 pushed by dwasint
June 15, 2024 20:14 13m 6s master
master
June 15, 2024 20:14 13m 6s
Fixed the cicatrix ritual not calling back to actually delete items i… Check for merge conflicts #1051: Commit 697035a pushed by dwasint
June 15, 2024 20:14 2m 9s master
master
June 15, 2024 20:14 2m 9s
Bugfix: Nuclear Operatives Assault Pod now usable again (#2258) Check for merge conflicts #1050: Commit 3c8cc5c pushed by dwasint
June 15, 2024 20:14 1m 14s master
master
June 15, 2024 20:14 1m 14s
fix PTL (#2263) Check for merge conflicts #1049: Commit 04df940 pushed by dwasint
June 15, 2024 18:53 3m 43s master
master
June 15, 2024 18:53 3m 43s
Cache the return value of /proc/guess_mixer_channel (#2274) Check for merge conflicts #1048: Commit e3f3351 pushed by dwasint
June 15, 2024 18:41 41s master
master
June 15, 2024 18:41 41s