Skip to content

Actions: ParadiseSS13/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
3,734 workflow runs
3,734 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

refactor: syndie depot spawners and icons. (#26861) Merge Conflict Detection #9035: Commit 5a1588d pushed by github-merge-queue bot
September 24, 2024 03:01 39s master
master
September 24, 2024 03:01 39s
fix: only blackbox maintloot spawners (#26859) Merge Conflict Detection #9034: Commit 02f5a24 pushed by github-merge-queue bot
September 24, 2024 02:25 44s master
master
September 24, 2024 02:25 44s
[TWEAK/BALANCE] Destroyed monkey cube box now destroys monkey cubes i… Merge Conflict Detection #9033: Commit d856d5c pushed by github-merge-queue bot
September 23, 2024 22:50 36s master
master
September 23, 2024 22:50 36s
added the firefighting module to the Advanced MODSuit (#26776) Merge Conflict Detection #9032: Commit 492d846 pushed by github-merge-queue bot
September 23, 2024 22:22 37s master
master
September 23, 2024 22:22 37s
mapping: separate cargo warehouses, sorting rooms, and break rooms. (… Merge Conflict Detection #9031: Commit 474dbb2 pushed by github-merge-queue bot
September 23, 2024 22:09 38s master
master
September 23, 2024 22:09 38s
Paradise's soul removal part 7.25: firesuits, radsuits, workboots and… Merge Conflict Detection #9030: Commit 55a8675 pushed by github-merge-queue bot
September 23, 2024 21:57 41s master
master
September 23, 2024 21:57 41s
Port DmIcon & Image components from TG (#26623) Merge Conflict Detection #9029: Commit 9d968e6 pushed by github-merge-queue bot
September 23, 2024 21:08 43s master
master
September 23, 2024 21:08 43s
Kidan Resprite (CLOTHES NOT INCLUDED) (#26660) Merge Conflict Detection #9028: Commit f830f8c pushed by github-merge-queue bot
September 23, 2024 13:51 40s master
master
September 23, 2024 13:51 40s
Disable HTML encoding for tcomms filter input (#26783) Merge Conflict Detection #9027: Commit 17931d5 pushed by github-merge-queue bot
September 22, 2024 23:15 35s master
master
September 22, 2024 23:15 35s
Critter crates now actually show what they contain in their cargo man… Merge Conflict Detection #9026: Commit b3cc376 pushed by github-merge-queue bot
September 22, 2024 23:11 1m 40s master
master
September 22, 2024 23:11 1m 40s
You can no longer put the cyborg gripper in a display case (#26848) Merge Conflict Detection #9025: Commit 51c64ed pushed by github-merge-queue bot
September 22, 2024 23:07 2m 42s master
master
September 22, 2024 23:07 2m 42s
It works! (#26862) Merge Conflict Detection #9024: Commit 80d2d78 pushed by github-merge-queue bot
September 22, 2024 23:06 1m 56s master
master
September 22, 2024 23:06 1m 56s
Severe lack of reading ability caused GC issue of multi-tile airlocks… Merge Conflict Detection #9023: Commit 2fb0a18 pushed by github-merge-queue bot
September 22, 2024 23:03 3m 52s master
master
September 22, 2024 23:03 3m 52s
Makes nest ghosting clearer (#26735) Merge Conflict Detection #9022: Commit 1cc99e0 pushed by github-merge-queue bot
September 22, 2024 23:03 1m 55s master
master
September 22, 2024 23:03 1m 55s
Update telecomns.dm (#26799) Merge Conflict Detection #9021: Commit ed535ad pushed by github-merge-queue bot
September 22, 2024 23:00 1m 37s master
master
September 22, 2024 23:00 1m 37s
Updates chat selectors (#26863) Merge Conflict Detection #9020: Commit aae804e pushed by github-merge-queue bot
September 21, 2024 01:50 36s master
master
September 21, 2024 01:50 36s
modsuit magboots save you from singulo hammer (#26858) Merge Conflict Detection #9019: Commit 6c2210a pushed by github-merge-queue bot
September 20, 2024 21:20 39s master
master
September 20, 2024 21:20 39s
[FIX] Now properly remove/add machines to the RNC console when (un)li… Merge Conflict Detection #9018: Commit 1d32faf pushed by github-merge-queue bot
September 20, 2024 21:12 40s master
master
September 20, 2024 21:12 40s
NanoMap Auto-Update (Fri Sep 20 01:34:36 UTC 2024) (#26537) Merge Conflict Detection #9017: Commit 7262bfb pushed by github-merge-queue bot
September 20, 2024 21:06 40s master
master
September 20, 2024 21:06 40s
Makes Indestructible Titanium Walls Into an Indestructible Wall Subty… Merge Conflict Detection #9016: Commit 7a399ac pushed by github-merge-queue bot
September 20, 2024 20:01 42s master
master
September 20, 2024 20:01 42s
Offering ghost no longer runtime (#26853) Merge Conflict Detection #9015: Commit 7639848 pushed by github-merge-queue bot
September 20, 2024 08:47 39s master
master
September 20, 2024 08:47 39s
[FIX] Unbricks cloning (#26846) Merge Conflict Detection #9014: Commit 3d7339a pushed by github-merge-queue bot
September 19, 2024 22:38 36s master
master
September 19, 2024 22:38 36s
Fixed NT Rep's camera name (#26839) Merge Conflict Detection #9013: Commit 37f1a20 pushed by github-merge-queue bot
September 19, 2024 17:27 40s master
master
September 19, 2024 17:27 40s
[FIX] Dead cats no longer chase mice (#26826) Merge Conflict Detection #9012: Commit a8668cc pushed by github-merge-queue bot
September 19, 2024 13:21 42s master
master
September 19, 2024 13:21 42s
[s] Fixes a thing. (#26836) Merge Conflict Detection #9011: Commit cca2b52 pushed by github-merge-queue bot
September 19, 2024 13:17 46s master
master
September 19, 2024 13:17 46s