Skip to content

Actions: DaedalusDock/daedalusdock

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
354 workflow runs
354 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

VV ports + fixes neon carpet (#810) Check for merge conflicts #597: Commit c0d2b55 pushed by Kapu1178
February 12, 2024 01:20 48s master
master
February 12, 2024 01:20 48s
Fracture changes (#800) Check for merge conflicts #596: Commit d2a0734 pushed by Kapu1178
February 12, 2024 00:33 48s master
master
February 12, 2024 00:33 48s
Throwing tweaks (#806) Check for merge conflicts #595: Commit b514af7 pushed by Kapu1178
February 12, 2024 00:31 1m 0s master
master
February 12, 2024 00:31 1m 0s
Refactors hud code, MASSIVELY improves Observe verb. (#657) Check for merge conflicts #594: Commit 4dee479 pushed by Kapu1178
February 12, 2024 00:22 47s master
master
February 12, 2024 00:22 47s
Unified instance tracking (#744) Check for merge conflicts #593: Commit 643bbcf pushed by Kapu1178
February 11, 2024 07:05 42s master
master
February 11, 2024 07:05 42s
Vox Scute Appearance Mods (#796) Check for merge conflicts #592: Commit 63f4d71 pushed by Kapu1178
February 11, 2024 06:58 49s master
master
February 11, 2024 06:58 49s
Mappers Love Him!: Makes a ton of /atom, /atom/movable, and /obj/item… Check for merge conflicts #591: Commit 7298c31 pushed by Kapu1178
February 11, 2024 05:07 37s master
master
February 11, 2024 05:07 37s
Removes a useless stack throw in roundstart logic (#803) Check for merge conflicts #590: Commit f4aac13 pushed by francinum
February 10, 2024 04:38 40s master
master
February 10, 2024 04:38 40s
swing timer (#732) Check for merge conflicts #589: Commit f047824 pushed by Kapu1178
February 9, 2024 20:29 40s master
master
February 9, 2024 20:29 40s
fix runechat being jank with emphasis (#799) Check for merge conflicts #588: Commit 7ade8ec pushed by Kapu1178
February 6, 2024 20:26 41s master
master
February 6, 2024 20:26 41s
add link scryer mob icon (#798) Check for merge conflicts #587: Commit 6d2439f pushed by Kapu1178
February 6, 2024 04:43 37s master
master
February 6, 2024 04:43 37s
2/5/24 fixes (#797) Check for merge conflicts #586: Commit 83dd613 pushed by Kapu1178
February 5, 2024 23:50 50s master
master
February 5, 2024 23:50 50s
fixes mouse cursor hotspots (actually) (#788) Check for merge conflicts #585: Commit 502aed5 pushed by francinum
February 4, 2024 23:30 47s master
master
February 4, 2024 23:30 47s
Fixes moving up (#790) Check for merge conflicts #584: Commit 3a7d062 pushed by Kapu1178
February 4, 2024 21:10 54s master
master
February 4, 2024 21:10 54s
fix 2 exploits (#791) Check for merge conflicts #583: Commit 53dcb0e pushed by Kapu1178
February 4, 2024 19:56 46s master
master
February 4, 2024 19:56 46s
Small Patch (#787) Check for merge conflicts #582: Commit 6f55225 pushed by Kapu1178
January 31, 2024 22:06 51s master
master
January 31, 2024 22:06 51s
minor fixes (#770) Check for merge conflicts #581: Commit 1c54a5c pushed by Kapu1178
January 31, 2024 09:18 1m 22s master
master
January 31, 2024 09:18 1m 22s
Projectilesimprovement (#782) Check for merge conflicts #580: Commit 7d53106 pushed by Kapu1178
January 31, 2024 09:17 36s master
master
January 31, 2024 09:17 36s
Mod suits runtime fix (#760) Check for merge conflicts #579: Commit ba4283d pushed by Kapu1178
January 31, 2024 09:17 27s master
master
January 31, 2024 09:17 27s
Removes name setting from Life(), adds set_real_name() (#766) Check for merge conflicts #578: Commit 9236335 pushed by Kapu1178
January 31, 2024 09:17 1m 8s master
master
January 31, 2024 09:17 1m 8s
Fixes and optimizations (#771) Check for merge conflicts #577: Commit fe7fc37 pushed by Kapu1178
January 31, 2024 09:17 41s master
master
January 31, 2024 09:17 41s
Gun QOL & Immersion, Uplink rebalance (#781) Check for merge conflicts #576: Commit 0f1320d pushed by Kapu1178
January 27, 2024 06:10 57s master
master
January 27, 2024 06:10 57s
Health fixes & Experimental Balance (#773) Check for merge conflicts #575: Commit da88e99 pushed by Kapu1178
January 26, 2024 05:13 51s master
master
January 26, 2024 05:13 51s
Genericize compat error message (#779) Check for merge conflicts #574: Commit 9e79c82 pushed by francinum
January 24, 2024 04:45 38s master
master
January 24, 2024 04:45 38s
Update TGS DMAPI (#769) Check for merge conflicts #573: Commit 3665add pushed by francinum
January 24, 2024 04:28 43s master
master
January 24, 2024 04:28 43s
ProTip! You can narrow down the results and go further in time using created:<2024-01-24 or the other filters available.