Skip to content

Actions: chuga-git/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
59 workflow runs
59 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Slower plasma fire and temperature decay (#28171) Merge Conflict Detection #63: Commit 9be5e7d pushed by chuga-git
February 8, 2025 02:00 27s master
master
February 8, 2025 02:00 27s
Nerfs the pulse demon (#27536) Merge Conflict Detection #62: Commit 190d508 pushed by chuga-git
December 28, 2024 00:33 34s master
master
December 28, 2024 00:33 34s
[Fix] for anti drop being able to equip some items (#27713) Merge Conflict Detection #61: Commit c299d98 pushed by chuga-git
December 23, 2024 23:28 28s master
master
December 23, 2024 23:28 28s
[READY FOR TM] R&D Rework Part 2 - Death to the experimentor (#27472) Merge Conflict Detection #60: Commit d663dfc pushed by chuga-git
December 5, 2024 00:09 31s master
master
December 5, 2024 00:09 31s
Makes playing cards playable -- significantly reworks card interactio… Merge Conflict Detection #59: Commit 8da12bc pushed by chuga-git
November 30, 2024 00:22 32s master
master
November 30, 2024 00:22 32s
Adds a triple beep sound to a variety of assembly receivers (#27315) Merge Conflict Detection #58: Commit 8cc1625 pushed by chuga-git
November 29, 2024 04:51 31s master
master
November 29, 2024 04:51 31s
[TGUI] Refactor & Improve ImageButton component (#26490) Merge Conflict Detection #57: Commit a2c4ed9 pushed by chuga-git
August 28, 2024 20:00 1m 3s master
master
August 28, 2024 20:00 1m 3s
adds adjacency check to kitchen_machine AltClick (#26591) Merge Conflict Detection #56: Commit 7f3918b pushed by chuga-git
August 24, 2024 23:39 31s master
master
August 24, 2024 23:39 31s
default to blank paper if letterhead_type is not defined (#26584) Merge Conflict Detection #55: Commit 53e3434 pushed by chuga-git
August 24, 2024 02:05 32s master
master
August 24, 2024 02:05 32s
blackbox: Add station traits. (#26502) Merge Conflict Detection #54: Commit 7aba1cf pushed by chuga-git
August 19, 2024 19:12 31s master
master
August 19, 2024 19:12 31s
Cloth Golems can no longer be infested by Legions (#26287) Merge Conflict Detection #53: Commit dfca6b8 pushed by chuga-git
July 29, 2024 17:23 30s master
master
July 29, 2024 17:23 30s
modified: tgui/eslint.config.mjs (#26274) Merge Conflict Detection #52: Commit d998af7 pushed by chuga-git
July 24, 2024 18:34 34s master
master
July 24, 2024 18:34 34s
no patrick you have to put effort in (#25973) Merge Conflict Detection #51: Commit 489f4ae pushed by chuga-git
June 19, 2024 19:02 32s master
master
June 19, 2024 19:02 32s
fixes catwalk recursion (#25941) Merge Conflict Detection #50: Commit d47bf69 pushed by chuga-git
June 17, 2024 05:09 45s master
master
June 17, 2024 05:09 45s
Changes a single number (#25926) Merge Conflict Detection #49: Commit 26a9468 pushed by chuga-git
June 15, 2024 19:16 29s master
master
June 15, 2024 19:16 29s
Minor fixes to typos in Hydroponics (#25739) Merge Conflict Detection #48: Commit 4ae0913 pushed by chuga-git
June 11, 2024 17:11 32s master
master
June 11, 2024 17:11 32s
I've consulted all the sages I could find in yellow pages (#25777) Merge Conflict Detection #47: Commit 3f542d7 pushed by chuga-git
June 7, 2024 12:45 30s master
master
June 7, 2024 12:45 30s
Cryo storage can no longer be exploded by malf AI (#25782) Merge Conflict Detection #46: Commit 95d682f pushed by chuga-git
June 3, 2024 20:19 30s master
master
June 3, 2024 20:19 30s
Highlight tweaks (#25551) Merge Conflict Detection #45: Commit dbc26cc pushed by chuga-git
June 1, 2024 23:31 30s master
master
June 1, 2024 23:31 30s
Fixing the mach speed closet (#25737) Merge Conflict Detection #44: Commit c876b64 pushed by chuga-git
June 1, 2024 03:57 28s master
master
June 1, 2024 03:57 28s
[FIX] Character Creator No Longer Displays "SUIT" Fallback Sprite on … Merge Conflict Detection #43: Commit 751cae5 pushed by chuga-git
May 31, 2024 06:56 29s master
master
May 31, 2024 06:56 29s
Extended Descriptions: Energy Weapons - Reloaded! (#25262) Merge Conflict Detection #42: Commit 38e393a pushed by chuga-git
May 30, 2024 20:09 30s master
master
May 30, 2024 20:09 30s
spider spider spider (#25492) Merge Conflict Detection #41: Commit d438d5d pushed by chuga-git
May 24, 2024 23:54 31s master
master
May 24, 2024 23:54 31s
Prison break virus update (#25491) Merge Conflict Detection #40: Commit 37189cd pushed by chuga-git
May 23, 2024 03:43 32s master
master
May 23, 2024 03:43 32s
Crashing into stuff while leaping will actually work now. (#25545) Merge Conflict Detection #39: Commit da36e9f pushed by chuga-git
May 21, 2024 21:37 29s master
master
May 21, 2024 21:37 29s