Skip to content

Actions: Fordoxia/CRUNCHParadise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
88 workflow runs
88 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Revert "[S] Yikes exploit fixes (#27244)" (#27246) Merge Conflict Detection #88: Commit 02311c4 pushed by Fordoxia
October 31, 2024 16:14 31s master
master
October 31, 2024 16:14 31s
[FIX] Changes the engineering locker sprite to be correct (#27109) Merge Conflict Detection #87: Commit 388c02b pushed by Fordoxia
October 15, 2024 17:16 29s master
master
October 15, 2024 17:16 29s
[s] Makes powerfists a bit more sane (#26939) Merge Conflict Detection #86: Commit a4d7950 pushed by Fordoxia
September 29, 2024 20:46 33s master
master
September 29, 2024 20:46 33s
Improved cloning UI (#26753) Merge Conflict Detection #85: Commit 9adbe39 pushed by Fordoxia
September 17, 2024 23:09 29s master
master
September 17, 2024 23:09 29s
Paradise's soul removal part 7: engineering jumpsuits and accessories… Merge Conflict Detection #84: Commit e2a7c80 pushed by Fordoxia
September 14, 2024 13:38 53s master
master
September 14, 2024 13:38 53s
R&D Rework PT1 - The network refactor (#26420) Merge Conflict Detection #83: Commit 03bc64a pushed by Fordoxia
September 8, 2024 17:44 31s master
master
September 8, 2024 17:44 31s
Dev team chat (#26669) Merge Conflict Detection #82: Commit 73e861b pushed by Fordoxia
September 4, 2024 02:54 33s master
master
September 4, 2024 02:54 33s
More varied and balanced maintenance loot. (#26500) Merge Conflict Detection #81: Commit 12cf1ed pushed by Fordoxia
August 26, 2024 23:31 33s master
master
August 26, 2024 23:31 33s
Drunk station trait can no longer spawn you in the AI core. (#26561) Merge Conflict Detection #80: Commit 0ea2abc pushed by Fordoxia
August 21, 2024 13:14 32s master
master
August 21, 2024 13:14 32s
wrong target (#26552) Merge Conflict Detection #79: Commit d714315 pushed by Fordoxia
August 19, 2024 21:23 30s master
master
August 19, 2024 21:23 30s
Fixing blood spreading too much during surgery (#26266) Merge Conflict Detection #78: Commit fbe49da pushed by Fordoxia
August 16, 2024 01:43 30s master
master
August 16, 2024 01:43 30s
Tweaked the area for the court room separating it out on delta and me… Merge Conflict Detection #77: Commit dd2a129 pushed by Fordoxia
August 14, 2024 03:45 29s master
master
August 14, 2024 03:45 29s
Fixes traitor-san (#26468) Merge Conflict Detection #76: Commit 9083c1a pushed by Fordoxia
August 11, 2024 20:19 33s master
master
August 11, 2024 20:19 33s
Tidies up grenades. (#26083) Merge Conflict Detection #75: Commit 3fd9106 pushed by Fordoxia
August 10, 2024 13:42 32s master
master
August 10, 2024 13:42 32s
its always important to remain silent if you have nothing nice to say… Merge Conflict Detection #74: Commit 8ee325e pushed by Fordoxia
August 9, 2024 01:03 28s master
master
August 9, 2024 01:03 28s
Fixes medical grippers not being usable in surgery (#26311) Merge Conflict Detection #73: Commit a0308e0 pushed by Fordoxia
August 7, 2024 01:31 28s master
master
August 7, 2024 01:31 28s
give reqconsole directional updatepaths script its proper ID (#26386) Merge Conflict Detection #72: Commit 2026d7c pushed by Fordoxia
August 5, 2024 03:41 27s master
master
August 5, 2024 03:41 27s
refactor: Requests console directional helpers. (#26226) Merge Conflict Detection #71: Commit 3f75f3b pushed by Fordoxia
August 3, 2024 20:14 33s master
master
August 3, 2024 20:14 33s
Uses the human damage procs instead of the carbon ones for vampire he… Merge Conflict Detection #70: Commit 8e05d86 pushed by Fordoxia
August 3, 2024 16:12 27s master
master
August 3, 2024 16:12 27s
Minor changes to table frames (#26313) Merge Conflict Detection #69: Commit 42c50a5 pushed by Fordoxia
August 1, 2024 23:26 30s master
master
August 1, 2024 23:26 30s
Adds a missing | to the player panel after "make super hero" (#26353) Merge Conflict Detection #68: Commit ca79f65 pushed by Fordoxia
August 1, 2024 02:41 30s master
master
August 1, 2024 02:41 30s
Switch default TGchat theme from dark to light (#26241) Merge Conflict Detection #67: Commit fc578ac pushed by Fordoxia
July 27, 2024 16:18 31s master
master
July 27, 2024 16:18 31s
Update README.md Merge Conflict Detection #66: Commit 9968aae pushed by Fordoxia
July 26, 2024 02:15 27s master
master
July 26, 2024 02:15 27s
Makes our codebase 1641 ready (#26151) Merge Conflict Detection #65: Commit a04ac32 pushed by Fordoxia
July 22, 2024 18:08 29s master
master
July 22, 2024 18:08 29s
Remaps Cere (Farragus) Janitorial Closet (#26025) Merge Conflict Detection #64: Commit 9635b91 pushed by Fordoxia
July 20, 2024 18:50 30s master
master
July 20, 2024 18:50 30s