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

Added Button for Thermoregulator to hardsuits (#2322) Check for merge conflicts #1097: Commit b677547 pushed by dwasint
June 22, 2024 21:37 24s master
master
June 22, 2024 21:37 24s
Alien and Cortical Borer hide fix part 2 (#2314) Check for merge conflicts #1096: Commit 705159a pushed by dwasint
June 22, 2024 21:37 53s master
master
June 22, 2024 21:37 53s
seriously (#2370) Check for merge conflicts #1095: Commit 1ab4ca6 pushed by dwasint
June 22, 2024 18:16 44s master
master
June 22, 2024 18:16 44s
Add a cloth stack recipe for satchels (#2366) Check for merge conflicts #1094: Commit 3f723f9 pushed by wraith-54321
June 22, 2024 12:25 40s master
master
June 22, 2024 12:25 40s
The memories for Smoker and Alcoholic now actually mention the prefer… Check for merge conflicts #1093: Commit bcbd34e pushed by dwasint
June 21, 2024 20:35 42s master
master
June 21, 2024 20:35 42s
Adds Flavor Text and Records, 2nd attempt (#2093) Check for merge conflicts #1092: Commit ba626d7 pushed by dwasint
June 21, 2024 18:29 9m 9s master
master
June 21, 2024 18:29 9m 9s
Update misc.dm (#1881) Check for merge conflicts #1091: Commit 27dd220 pushed by dwasint
June 21, 2024 18:27 11m 17s master
master
June 21, 2024 18:27 11m 17s
no more tg station announcement (#1865) Check for merge conflicts #1090: Commit ae53b8d pushed by dwasint
June 21, 2024 18:27 10m 36s master
master
June 21, 2024 18:27 10m 36s
Makes chainsaw arm mechanical. (#1794) Check for merge conflicts #1089: Commit f5d8b9a pushed by dwasint
June 21, 2024 18:26 11m 7s master
master
June 21, 2024 18:26 11m 7s
remove anti-rp text (#1719) Check for merge conflicts #1088: Commit 6b1e2f0 pushed by dwasint
June 21, 2024 18:25 10m 4s master
master
June 21, 2024 18:25 10m 4s
Makes Androids more robotic. (#1587) Check for merge conflicts #1087: Commit c53fb86 pushed by dwasint
June 21, 2024 18:24 41s master
master
June 21, 2024 18:24 41s
Hey! Catch me later, I'll buy you a beer! (#851) Check for merge conflicts #1086: Commit ea13567 pushed by dwasint
June 21, 2024 18:23 45s master
master
June 21, 2024 18:23 45s
Removes per z level station relays, allows tcomms to reach across int… Check for merge conflicts #1085: Commit 4a26e47 pushed by dwasint
June 21, 2024 17:35 2m 33s master
master
June 21, 2024 17:35 2m 33s
Brainwashed, abductee, etc no longer prevent midround rolls (#2345) Check for merge conflicts #1084: Commit 9d63001 pushed by wraith-54321
June 21, 2024 08:36 45s master
master
June 21, 2024 08:36 45s
Contextless and .js -> .jsx (#2331) Check for merge conflicts #1083: Commit 992181c pushed by dwasint
June 21, 2024 03:37 14m 28s master
master
June 21, 2024 03:37 14m 28s
Meteor shield refactors + improvements (#2282) Check for merge conflicts #1082: Commit bac3c2e pushed by dwasint
June 21, 2024 03:37 14m 39s master
master
June 21, 2024 03:37 14m 39s
Cane swords! (#2174) Check for merge conflicts #1081: Commit ca0ae94 pushed by dwasint
June 21, 2024 03:36 43s master
master
June 21, 2024 03:36 43s
Saves profiler snapshots every 5 minutes (#83467) (#2168) Check for merge conflicts #1080: Commit 726368e pushed by dwasint
June 21, 2024 03:35 57s master
master
June 21, 2024 03:35 57s
Adds Olivers CC Office (#2335) Check for merge conflicts #1079: Commit 5bdbf96 pushed by dwasint
June 20, 2024 20:55 12m 39s master
master
June 20, 2024 20:55 12m 39s
adds Malphy/Amun's office (#2341) Check for merge conflicts #1078: Commit b0a97cd pushed by dwasint
June 20, 2024 20:55 3m 35s master
master
June 20, 2024 20:55 3m 35s
The warden is an IPad baby -pizza (#2239) Check for merge conflicts #1077: Commit 2104fe1 pushed by dwasint
June 20, 2024 05:09 37m 50s master
master
June 20, 2024 05:09 37m 50s
ITS GONE. (#2178) Check for merge conflicts #1076: Commit 4289339 pushed by dwasint
June 20, 2024 05:09 37m 28s master
master
June 20, 2024 05:09 37m 28s
Update loadout.dm (#2338) Check for merge conflicts #1075: Commit a6e012a pushed by dwasint
June 20, 2024 05:08 38m 13s master
master
June 20, 2024 05:08 38m 13s
Add verbs for downloading debug/runtime logs (#2298) Check for merge conflicts #1074: Commit bf4ff58 pushed by dwasint
June 20, 2024 05:02 3m 13s master
master
June 20, 2024 05:02 3m 13s
Upgrades the PTL lens (#2185) Check for merge conflicts #1073: Commit f8ed514 pushed by dwasint
June 20, 2024 04:58 5m 17s master
master
June 20, 2024 04:58 5m 17s