Skip to content

Actions: SchrodingersWolf/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
This workflow was disabled manually.
17 workflow runs
17 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Cryo storage can no longer be exploded by malf AI (#25782) Merge Conflict Detection #23: Commit 95d682f pushed by SchrodingersWolf
June 5, 2024 04:45 27s master
master
June 5, 2024 04:45 27s
you can no longer kinesis the chair you are buckled to (#25561) Merge Conflict Detection #22: Commit 956bf6c pushed by SchrodingersWolf
May 21, 2024 22:48 30s master
master
May 21, 2024 22:48 30s
Allows atmosians into the emitter room (#25423) Merge Conflict Detection #21: Commit d88304a pushed by SchrodingersWolf
May 14, 2024 16:10 33s master
master
May 14, 2024 16:10 33s
[SERIOUS] Improves admin tooling for radiation (#24968) Merge Conflict Detection #20: Commit 853f108 pushed by SchrodingersWolf
April 23, 2024 00:59 33s master
master
April 23, 2024 00:59 33s
fixes bugs with observer crew monitor (#24828) Merge Conflict Detection #19: Commit 83f2e85 pushed by SchrodingersWolf
March 27, 2024 04:24 28s master
master
March 27, 2024 04:24 28s
it was under my DAMN NOSE THE WHOLE TIME (#24832) Merge Conflict Detection #18: Commit bb3800c pushed by SchrodingersWolf
March 27, 2024 03:18 28s master
master
March 27, 2024 03:18 28s
cere: bridge has correct supply computer (#24825) Merge Conflict Detection #17: Commit 048dfec pushed by SchrodingersWolf
March 26, 2024 21:22 33s master
master
March 26, 2024 21:22 33s
Adds a suicide act to the wormhome projector. (#24532) Merge Conflict Detection #16: Commit 8270f92 pushed by SchrodingersWolf
March 23, 2024 16:17 28s master
master
March 23, 2024 16:17 28s
Removes insulated pipes and some related variables (#24156) Merge Conflict Detection #15: Commit d0c4dbf pushed by SchrodingersWolf
February 26, 2024 08:40 30s master
master
February 26, 2024 08:40 30s
Makes circles have a correct 360 degrees again (#24127) Merge Conflict Detection #14: Commit 159a2cf pushed by SchrodingersWolf
February 10, 2024 00:54 32s master
master
February 10, 2024 00:54 32s
TGchat: Case Sensitive fix, Mute button (#24024) Merge Conflict Detection #13: Commit 3793434 pushed by SchrodingersWolf
February 6, 2024 22:38 33s master
master
February 6, 2024 22:38 33s
1, 2, 3, ah ah ah (#24001) Merge Conflict Detection #12: Commit 257692d pushed by SchrodingersWolf
January 31, 2024 18:53 29s master
master
January 31, 2024 18:53 29s
[S] Fix hivelord core exploits & dupe with ore redemption (#23949) Merge Conflict Detection #11: Commit 19433e8 pushed by SchrodingersWolf
January 27, 2024 07:44 30s master
master
January 27, 2024 07:44 30s
Yikes this one is annoying (#23752) Merge Conflict Detection #10: Commit 6e52fdd pushed by SchrodingersWolf
January 9, 2024 01:06 32s master
master
January 9, 2024 01:06 32s
makes make everyone random not the worst button of all time (#23703) Merge Conflict Detection #9: Commit 27af5ec pushed by SchrodingersWolf
January 3, 2024 19:47 34s master
master
January 3, 2024 19:47 34s
Service borgs get a multi pen instead of a regular (#23128) Merge Conflict Detection #8: Commit 7cd360c pushed by SchrodingersWolf
November 5, 2023 00:42 56s master
master
November 5, 2023 00:42 56s
Fixes some fugly cabling and pipe spots on delta, and a single tile o… Merge Conflict Detection #7: Commit 0ec620d pushed by SchrodingersWolf
November 2, 2023 01:08 43s master
master
November 2, 2023 01:08 43s