Skip to content

Actions: Contrabang/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
237 workflow runs
237 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

FINALLY (#24353) Merge Conflict Detection #119: Commit 3792a0f pushed by Contrabang
March 1, 2024 20:19 37s master
master
March 1, 2024 20:19 37s
Add DMI/JSON export to local client admins. (#23947) Merge Conflict Detection #118: Commit e1614b9 pushed by Contrabang
March 1, 2024 19:24 33s master
master
March 1, 2024 19:24 33s
Welding tools can be used to light other people's cigarettes (#23987) Merge Conflict Detection #117: Commit 0a2669f pushed by Contrabang
March 1, 2024 13:46 36s master
master
March 1, 2024 13:46 36s
forbid in-DMI icon state name dupes with CI (#22734) Merge Conflict Detection #116: Commit 43b3bb0 pushed by Contrabang
March 1, 2024 13:13 42s master
master
March 1, 2024 13:13 42s
Easy (#24351) Merge Conflict Detection #115: Commit f5da54b pushed by Contrabang
February 29, 2024 01:53 34s master
master
February 29, 2024 01:53 34s
Merge Conflict Detection Merge Conflict Detection #114: by Contrabang
February 28, 2024 20:00 48s master
master
February 28, 2024 20:00 48s
Removes insulated pipes and some related variables (#24156) Merge Conflict Detection #113: Commit d0c4dbf pushed by Contrabang
February 26, 2024 03:45 30s master
master
February 26, 2024 03:45 30s
[S] fixes a headslug exploit (#24300) Merge Conflict Detection #112: Commit 5c2f317 pushed by Contrabang
February 25, 2024 00:13 32s master
master
February 25, 2024 00:13 32s
maps: more varedit whitespace cleanup (#24139) Merge Conflict Detection #111: Commit f105931 pushed by Contrabang
February 22, 2024 17:09 32s master
master
February 22, 2024 17:09 32s
adds the ability to keybind click() triggers (#23395) Merge Conflict Detection #110: Commit 599f645 pushed by Contrabang
February 21, 2024 22:50 26s master
master
February 21, 2024 22:50 26s
Makes floorlights only toggleable in help intent (#24135) Merge Conflict Detection #109: Commit 8335d99 pushed by Contrabang
February 21, 2024 18:02 36s master
master
February 21, 2024 18:02 36s
[READY] TGUI Input Collection (#23891) Merge Conflict Detection #108: Commit ac5add4 pushed by Contrabang
February 19, 2024 12:59 38s master
master
February 19, 2024 12:59 38s
[s] blocks all teleport sources from infinite looping, reverts 24191 … Merge Conflict Detection #107: Commit bc5f3de pushed by Contrabang
February 19, 2024 01:53 35s master
master
February 19, 2024 01:53 35s
Makes the default shuttle security area more secure (it just replaces… Merge Conflict Detection #106: Commit 2f8b49a pushed by Contrabang
February 16, 2024 18:11 43s master
master
February 16, 2024 18:11 43s
Fixes labor camp airlocks bolting open during a greytide tide event o… Merge Conflict Detection #105: Commit 9b56b96 pushed by Contrabang
February 13, 2024 04:59 29s master
master
February 13, 2024 04:59 29s
NanoMap Auto-Update (Wed Feb 7 01:06:21 UTC 2024) (#24088) Merge Conflict Detection #104: Commit 8cb9acb pushed by Contrabang
February 7, 2024 16:35 34s master
master
February 7, 2024 16:35 34s
TGchat: Case Sensitive fix, Mute button (#24024) Merge Conflict Detection #103: Commit 3793434 pushed by Contrabang
February 7, 2024 15:41 38s master
master
February 7, 2024 15:41 38s
Fixes cereberon's RnD buttons being misslabled and in one in a bad sp… Merge Conflict Detection #102: Commit 5ddd534 pushed by Contrabang
February 6, 2024 16:06 36s master
master
February 6, 2024 16:06 36s
Adding Improvements to Knuckledusters (#23902) Merge Conflict Detection #101: Commit 84dff25 pushed by Contrabang
February 5, 2024 12:38 37s master
master
February 5, 2024 12:38 37s
Makes the reagent grinder shake (#23823) Merge Conflict Detection #100: Commit b254aa1 pushed by Contrabang
January 30, 2024 02:58 31s master
master
January 30, 2024 02:58 31s
Thrown mobs cant move until the throw ends (#23775) Merge Conflict Detection #99: Commit f9f82fd pushed by Contrabang
January 29, 2024 13:00 30s master
master
January 29, 2024 13:00 30s
[S] Fix hivelord core exploits & dupe with ore redemption (#23949) Merge Conflict Detection #98: Commit 19433e8 pushed by Contrabang
January 28, 2024 02:31 28s master
master
January 28, 2024 02:31 28s
Revives Organ Datumization (#23397) Merge Conflict Detection #97: Commit 79a7558 pushed by Contrabang
January 22, 2024 13:19 30s master
master
January 22, 2024 13:19 30s
Randomless Kirby plants (#23376) Merge Conflict Detection #96: Commit 4e76e77 pushed by Contrabang
January 14, 2024 17:45 38s master
master
January 14, 2024 17:45 38s
Fixes transformation viruses yeeting you out of the game (#23770) Merge Conflict Detection #95: Commit f3fa7a6 pushed by Contrabang
January 11, 2024 18:00 37s master
master
January 11, 2024 18:00 37s