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
470 workflow run results
470 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bugfix: anomaly extract cost, some slime fixes Merge Conflict Detection #5188: Pull request #3827 opened by ROdenFL
November 4, 2023 22:33 16s
November 4, 2023 22:33 16s
bugfix: anomaly extract cost Merge Conflict Detection #5187: Pull request #3826 opened by ROdenFL
November 4, 2023 22:31 14s
November 4, 2023 22:31 14s
Fix: Summon spots no longer in new areas. (Beacons too) Merge Conflict Detection #5186: Pull request #3825 opened by BeebBeebBoob
November 4, 2023 19:51 13s
November 4, 2023 19:51 13s
Automatic changelog generation Merge Conflict Detection #5185: Commit 3046ca5 pushed by changelog-bot bot
November 4, 2023 19:39 2m 18s master220
master220
November 4, 2023 19:39 2m 18s
imageadd: Added suit sprites for Plasmaman species Merge Conflict Detection #5184: Pull request #3822 ready_for_review by Vladisvell
November 4, 2023 19:29 14s
November 4, 2023 19:29 14s
imageadd: Added suit sprites for Plasmaman species Merge Conflict Detection #5183: Pull request #3822 synchronize by Vladisvell
November 4, 2023 19:27 13s
November 4, 2023 19:27 13s
bugfix: meson's vision now realy saving from that two farwas and even… Merge Conflict Detection #5182: Commit dc222f5 pushed by Dimach
November 4, 2023 19:25 2m 20s master220
master220
November 4, 2023 19:25 2m 20s
bugfix: text corrections for spessuit storages and smol combat defib.… Merge Conflict Detection #5181: Commit 7635631 pushed by Dimach
November 4, 2023 19:23 2m 11s master220
master220
November 4, 2023 19:23 2m 11s
bugfix: wooden buckets now do not become blue (#3810) Merge Conflict Detection #5180: Commit ac4c4ac pushed by Dimach
November 4, 2023 19:22 2m 16s master220
master220
November 4, 2023 19:22 2m 16s
tweak: Update Surgery Kit (#3807) Merge Conflict Detection #5179: Commit d717d48 pushed by Dimach
November 4, 2023 19:21 2m 16s master220
master220
November 4, 2023 19:21 2m 16s
bugfix: Ninja Datum Fixes (#3823) Merge Conflict Detection #5178: Commit f959c23 pushed by Dimach
November 4, 2023 19:21 18s master220
master220
November 4, 2023 19:21 18s
bugfix: anomaly extract bugfix (#3820) Merge Conflict Detection #5177: Commit 85ba98b pushed by Dimach
November 4, 2023 19:18 6m 27s master220
master220
November 4, 2023 19:18 6m 27s
imageadd: Added suit sprites for Plasmaman species Merge Conflict Detection #5176: Pull request #3822 synchronize by Vladisvell
November 4, 2023 19:17 14s
November 4, 2023 19:17 14s
Add: a special hypospray to the e-magged medical borg. Merge Conflict Detection #5175: Pull request #3824 opened by SSefuss
November 4, 2023 19:14 12s
November 4, 2023 19:14 12s
bugfix: anomaly extract bugfix Merge Conflict Detection #5174: Pull request #3820 synchronize by ROdenFL
November 4, 2023 19:10 12s
November 4, 2023 19:10 12s
add: Antag Paradise Gamemode Merge Conflict Detection #5173: Pull request #3578 synchronize by Gottfrei
November 4, 2023 19:08 17s
November 4, 2023 19:08 17s
add: Antag Paradise Gamemode Merge Conflict Detection #5172: Pull request #3578 synchronize by Gottfrei
November 4, 2023 19:07 14s
November 4, 2023 19:07 14s
bugfix: Ninja Datum Fixes Merge Conflict Detection #5171: Pull request #3823 opened by Gottfrei
November 4, 2023 19:03 9s
November 4, 2023 19:03 9s
imageadd: Added suit sprites for Plasmaman species Merge Conflict Detection #5170: Pull request #3822 opened by Vladisvell
November 4, 2023 18:20 17s
November 4, 2023 18:20 17s
balance: Rebalanced bomb protection, now it really protects against explosions. Merge Conflict Detection #5169: Pull request #3821 opened by Vladisvell
November 4, 2023 17:37 14s
November 4, 2023 17:37 14s
add: Antag Paradise Gamemode Merge Conflict Detection #5168: Pull request #3578 synchronize by Gottfrei
November 4, 2023 17:22 10s
November 4, 2023 17:22 10s
add: Antag Paradise Gamemode Merge Conflict Detection #5167: Pull request #3578 synchronize by Gottfrei
November 4, 2023 17:21 14s
November 4, 2023 17:21 14s
bugfix: anomaly extract bugfix Merge Conflict Detection #5166: Pull request #3820 opened by ROdenFL
November 4, 2023 16:12 14s
November 4, 2023 16:12 14s
qol: Spent ammo casings can now be utilized using matter decompiler. Merge Conflict Detection #5165: Pull request #3819 synchronize by Vladisvell
November 4, 2023 14:58 14s
November 4, 2023 14:58 14s
qol: Spent ammo casings can now be utilized using matter decompiler. Merge Conflict Detection #5164: Pull request #3819 opened by Vladisvell
November 4, 2023 14:54 12s
November 4, 2023 14:54 12s