Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
887 workflow run results
887 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[PORT] Gibbing a Security Officer produces Pig Meat (#2146) Check for merge conflicts #1103: Commit b3847a9 pushed by dwasint
June 24, 2024 03:46 10m 11s master
master
June 24, 2024 03:46 10m 11s
Port superior pick_weight implementation (#2144) Check for merge conflicts #1102: Commit c6c3796 pushed by dwasint
June 24, 2024 03:45 9m 28s master
master
June 24, 2024 03:45 9m 28s
[Port] Chemmaster refactor (#1644) Check for merge conflicts #1101: Commit 3a5bc5c pushed by dwasint
June 24, 2024 03:44 51s master
master
June 24, 2024 03:44 51s
Add base recolor to hair dye spray. (#2087) Check for merge conflicts #1100: Commit 3ca2976 pushed by dwasint
June 24, 2024 03:43 48s master
master
June 24, 2024 03:43 48s
emag the jukebox for more pain! (#2304) Check for merge conflicts #1099: Commit fe140b6 pushed by dwasint
June 23, 2024 07:35 42s master
master
June 23, 2024 07:35 42s
Mechcomp teleporter now work across floors on multi-z maps (#2376) Check for merge conflicts #1098: Commit 60e87cd pushed by dwasint
June 23, 2024 07:34 41s master
master
June 23, 2024 07:34 41s
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