Skip to content

Actions: Contrabang/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
238 workflow runs
238 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[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
blackbox logging for biohazards (#23309) Merge Conflict Detection #94: Commit 44cde7c pushed by Contrabang
January 7, 2024 18:42 30s master
master
January 7, 2024 18:42 30s
Weeee (#23645) Merge Conflict Detection #93: Commit da37efc pushed by Contrabang
December 24, 2023 21:11 27s master
master
December 24, 2023 21:11 27s
OOPS (#23576) Merge Conflict Detection #92: Commit 40e1a36 pushed by Contrabang
December 16, 2023 18:26 30s master
master
December 16, 2023 18:26 30s
Fixes human bullet act, fixes cooldown of stealth module, ups it (#23… Merge Conflict Detection #91: Commit 3b21140 pushed by Contrabang
December 16, 2023 16:32 32s master
master
December 16, 2023 16:32 32s
I forgor to open this yesterday (#23572) Merge Conflict Detection #90: Commit 6a84d32 pushed by Contrabang
December 16, 2023 01:59 33s master
master
December 16, 2023 01:59 33s
FIX: correct custom rank manifest modify (#23491) Merge Conflict Detection #89: Commit 3aa6154 pushed by Contrabang
December 14, 2023 16:13 35s master
master
December 14, 2023 16:13 35s
actually revert this until its NOT broken (#23557) Merge Conflict Detection #88: Commit e623109 pushed by Contrabang
December 14, 2023 02:34 33s master
master
December 14, 2023 02:34 33s