Skip to content

Actions: ParadiseSS13/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
2,499 workflow run results
2,499 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Makes playing cards playable -- significantly reworks card interactio… Merge Conflict Detection #9462: Commit 8da12bc pushed by github-merge-queue bot
November 29, 2024 19:16 34s master
master
November 29, 2024 19:16 34s
Adds the Service and Medical versions of the "Rover" cyborg skin (#27… Merge Conflict Detection #9461: Commit cf31fa0 pushed by github-merge-queue bot
November 29, 2024 17:10 37s master
master
November 29, 2024 17:10 37s
NanoMap Auto-Update (Fri Nov 29 01:44:25 UTC 2024) (#27448) Merge Conflict Detection #9460: Commit 898f67d pushed by github-merge-queue bot
November 29, 2024 16:53 33s master
master
November 29, 2024 16:53 33s
Bump the npm_and_yarn group in /tgui with 2 updates (#27401) Merge Conflict Detection #9459: Commit 88dbdd8 pushed by github-merge-queue bot
November 29, 2024 15:02 37s master
master
November 29, 2024 15:02 37s
Fixes skin tones for syndibase spawner (#27299) Merge Conflict Detection #9458: Commit 0b3f777 pushed by github-merge-queue bot
November 29, 2024 14:48 39s master
master
November 29, 2024 14:48 39s
Improved AI interface (#27430) Merge Conflict Detection #9457: Commit d8e349d pushed by github-merge-queue bot
November 29, 2024 14:41 1m 9s master
master
November 29, 2024 14:41 1m 9s
Resprites Stools, Office Chairs, and Barber Chairs - I fucking hate y… Merge Conflict Detection #9456: Commit 6274d7a pushed by github-merge-queue bot
November 29, 2024 14:37 1m 11s master
master
November 29, 2024 14:37 1m 11s
Adds job overalls to the loadout menu (#27427) Merge Conflict Detection #9455: Commit 9f26a62 pushed by github-merge-queue bot
November 29, 2024 14:36 36s master
master
November 29, 2024 14:36 36s
[FEATURE] Decal painter (#27036) Merge Conflict Detection #9454: Commit f0ac13b pushed by github-merge-queue bot
November 29, 2024 14:34 34s master
master
November 29, 2024 14:34 34s
[FIX] Json serialization/deserialization for characters (#27454) Merge Conflict Detection #9453: Commit 3cc903c pushed by github-merge-queue bot
November 29, 2024 11:06 34s master
master
November 29, 2024 11:06 34s
Fixes some dyed items retaining their original appearance and adds pl… Merge Conflict Detection #9452: Commit 3be13c3 pushed by github-merge-queue bot
November 29, 2024 10:56 34s master
master
November 29, 2024 10:56 34s
GODHEAD has appeared in the basement! (#27470) Merge Conflict Detection #9451: Commit 8ad28af pushed by github-merge-queue bot
November 29, 2024 10:56 33s master
master
November 29, 2024 10:56 33s
fixes some bad html (#27481) Merge Conflict Detection #9450: Commit 32b97af pushed by github-merge-queue bot
November 29, 2024 10:50 33s master
master
November 29, 2024 10:50 33s
Adds a triple beep sound to a variety of assembly receivers (#27315) Merge Conflict Detection #9449: Commit 8cc1625 pushed by github-merge-queue bot
November 29, 2024 01:53 40s master
master
November 29, 2024 01:53 40s
[s] fix plasmapistol exploit (#27477) Merge Conflict Detection #9448: Commit 27fcd61 pushed by github-merge-queue bot
November 28, 2024 19:49 32s master
master
November 28, 2024 19:49 32s
Port TG Resonator so this is not a trash anymore (#27216) Merge Conflict Detection #9447: Commit 422a48f pushed by github-merge-queue bot
November 28, 2024 15:31 40s master
master
November 28, 2024 15:31 40s
Reviving the revival of revivers reviving. Revival edition. (#27436) Merge Conflict Detection #9446: Commit 5df5890 pushed by github-merge-queue bot
November 28, 2024 14:18 43s master
master
November 28, 2024 14:18 43s
Nerfs the push broom (#27469) Merge Conflict Detection #9445: Commit 392c8fb pushed by github-merge-queue bot
November 27, 2024 22:10 33s master
master
November 27, 2024 22:10 33s
Fix nanomaps render failures (#27453) Merge Conflict Detection #9444: Commit 45a3303 pushed by github-merge-queue bot
November 27, 2024 21:22 43s master
master
November 27, 2024 21:22 43s
Adds some new github actions errrors for clarity (#27426) Merge Conflict Detection #9443: Commit 483f937 pushed by github-merge-queue bot
November 27, 2024 21:15 34s master
master
November 27, 2024 21:15 34s
[SPRITES] Syndicate suit storage units (#27405) Merge Conflict Detection #9442: Commit 878477d pushed by github-merge-queue bot
November 27, 2024 17:22 38s master
master
November 27, 2024 17:22 38s
fix: remove access-less helpers and add a maplint (#27462) Merge Conflict Detection #9441: Commit 324f145 pushed by github-merge-queue bot
November 27, 2024 17:18 1m 8s master
master
November 27, 2024 17:18 1m 8s
Fix table climbing runtime (#27459) Merge Conflict Detection #9440: Commit b33be74 pushed by github-merge-queue bot
November 27, 2024 17:17 34s master
master
November 27, 2024 17:17 34s
Updates the syndicate combat borg to a cool spider borg (#27332) Merge Conflict Detection #9439: Commit bc41214 pushed by github-merge-queue bot
November 27, 2024 17:15 35s master
master
November 27, 2024 17:15 35s
Return of the neck slot! (#27188) Merge Conflict Detection #9438: Commit 6eb1269 pushed by github-merge-queue bot
November 27, 2024 17:09 38s master
master
November 27, 2024 17:09 38s