Skip to content

Actions: ss220-space/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
11,752 workflow run results
11,752 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add/bugfix: earrings Merge Conflict Detection #16532: Pull request #6066 synchronize by lolybomb
October 24, 2024 07:17 17s
October 24, 2024 07:17 17s
tweak: sniper rounds now cost 5 tk instead of 10 Merge Conflict Detection #16531: Pull request #6068 opened by NightDawnFox
October 24, 2024 06:28 12s
October 24, 2024 06:28 12s
tweak: new cinematics for gods Merge Conflict Detection #16530: Pull request #6067 synchronize by FlitchTime
October 24, 2024 06:10 17s
October 24, 2024 06:10 17s
tweak: new cinematics for gods Merge Conflict Detection #16529: Pull request #6067 opened by FlitchTime
October 24, 2024 06:08 2m 16s
October 24, 2024 06:08 2m 16s
add: New Map - Segmentstation Merge Conflict Detection #16528: Pull request #5896 synchronize by Ravgolin
October 23, 2024 22:57 11s
October 23, 2024 22:57 11s
add/bugfix: earrings Merge Conflict Detection #16527: Pull request #6066 synchronize by lolybomb
October 23, 2024 20:03 12s
October 23, 2024 20:03 12s
add/bugfix: earrings Merge Conflict Detection #16526: Pull request #6066 opened by lolybomb
October 23, 2024 19:55 12s
October 23, 2024 19:55 12s
tweak: Vodka is a painkiller now Merge Conflict Detection #16525: Pull request #6065 opened by timchigaming
October 23, 2024 19:32 16s
October 23, 2024 19:32 16s
add: Fire heating/ash storm damage protection due to "fire" armor Merge Conflict Detection #16524: Pull request #6064 opened by Anorak2024
October 23, 2024 17:06 15s
October 23, 2024 17:06 15s
bugfix: bandanas cover hair (#6061) Merge Conflict Detection #16523: Commit 26835ea pushed by Bizzonium
October 23, 2024 13:36 2m 13s master220
master220
October 23, 2024 13:36 2m 13s
bugfix: firemanned people are can no longer be teleported when buckle… Merge Conflict Detection #16522: Commit 054697a pushed by Bizzonium
October 23, 2024 13:36 2m 17s master220
master220
October 23, 2024 13:36 2m 17s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16521: Pull request #5993 synchronize by Anorak2024
October 23, 2024 12:40 14s
October 23, 2024 12:40 14s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16520: Pull request #5993 synchronize by Anorak2024
October 23, 2024 10:30 12s
October 23, 2024 10:30 12s
tweak: 10mm HP slows down the target Merge Conflict Detection #16519: Pull request #6063 opened by Mahimka42
October 23, 2024 08:45 11s
October 23, 2024 08:45 11s
bugfix: firemanned people are can no longer be teleported when buckled Merge Conflict Detection #16518: Pull request #6058 synchronize by NightDawnFox
October 23, 2024 08:32 13s
October 23, 2024 08:32 13s
tweak: M90 instead riot shotguns in ERT armory Merge Conflict Detection #16517: Pull request #6062 opened by Mahimka42
October 23, 2024 08:11 2m 13s
October 23, 2024 08:11 2m 13s
bugfix: bandanas cover hair Merge Conflict Detection #16516: Pull request #6061 opened by PlayerUnknown14
October 22, 2024 13:24 10s
October 22, 2024 13:24 10s
tweak: fart deletion Merge Conflict Detection #16515: Pull request #6060 opened by Baldek0
October 22, 2024 13:16 11s
October 22, 2024 13:16 11s
Abotch remap Merge Conflict Detection #16514: Pull request #5903 synchronize by tsoivecen199015
October 22, 2024 13:04 12s
October 22, 2024 13:04 12s
feat: separated thermo control & drask coma Merge Conflict Detection #16513: Pull request #6059 synchronize by Antoonij
October 22, 2024 11:31 11s
October 22, 2024 11:31 11s
feat: separated thermo control & drask coma Merge Conflict Detection #16512: Pull request #6059 opened by Antoonij
October 22, 2024 10:59 10s
October 22, 2024 10:59 10s
Refactor: Transit Shuttles Merge Conflict Detection #16511: Pull request #5247 synchronize by BeebBeebBoob
October 22, 2024 10:53 15s
October 22, 2024 10:53 15s
Add: ASHIE UPDATE Merge Conflict Detection #16510: Pull request #5875 synchronize by Antoonij
October 22, 2024 06:52 14s
October 22, 2024 06:52 14s
Add: ASHIE UPDATE Merge Conflict Detection #16509: Pull request #5875 synchronize by Antoonij
October 22, 2024 06:44 2m 12s
October 22, 2024 06:44 2m 12s
add: New Map - Segmentstation Merge Conflict Detection #16508: Pull request #5896 synchronize by Ravgolin
October 21, 2024 19:19 16s
October 21, 2024 19:19 16s