Skip to content

Actions: DaedalusDock/daedalusdock

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
487 workflow runs
487 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fixmaster (#1010) Check for merge conflicts #738: Commit 27af0b5 pushed by Kapu1178
June 29, 2024 01:43 40s master
master
June 29, 2024 01:43 40s
JPS code improvement (#1005) Check for merge conflicts #737: Commit 2780215 pushed by Kapu1178
June 27, 2024 22:55 27s master
master
June 27, 2024 22:55 27s
Power UI refactor (#1006) Check for merge conflicts #736: Commit 8db1b16 pushed by Kapu1178
June 27, 2024 22:54 57s master
master
June 27, 2024 22:54 57s
fix bloom (#1004) Check for merge conflicts #735: Commit 8a3fe95 pushed by Kapu1178
June 26, 2024 16:22 24s master
master
June 26, 2024 16:22 24s
Hydroponics change and general QOL (#998) Check for merge conflicts #734: Commit 7a498a3 pushed by Kapu1178
June 26, 2024 16:21 59s master
master
June 26, 2024 16:21 59s
Sound tweaks (#996) Check for merge conflicts #733: Commit cc136bc pushed by Kapu1178
June 25, 2024 20:42 47s master
master
June 25, 2024 20:42 47s
Adds the crime scene kit to the forensics crate (#999) Check for merge conflicts #732: Commit 17a266b pushed by Kapu1178
June 25, 2024 20:37 30s master
master
June 25, 2024 20:37 30s
Bugs 6.16.24 (#994) Check for merge conflicts #731: Commit 556ef06 pushed by Kapu1178
June 25, 2024 20:37 58s master
master
June 25, 2024 20:37 58s
initial commit (#1003) Check for merge conflicts #730: Commit 01a5cb3 pushed by Kapu1178
June 24, 2024 16:43 52s master
master
June 24, 2024 16:43 52s
Makes the ATM put IDs directly into your hand (#997) Check for merge conflicts #729: Commit f137754 pushed by Kapu1178
June 19, 2024 00:03 47s master
master
June 19, 2024 00:03 47s
/turf/open/floor/catwalk -> /obj/structure/overfloor_catwalk (#995) Check for merge conflicts #728: Commit 96c54d1 pushed by Kapu1178
June 17, 2024 22:56 49s master
master
June 17, 2024 22:56 49s
fix people not getting a heart attack in shock (#993) Check for merge conflicts #727: Commit 21701fe pushed by Kapu1178
June 16, 2024 22:21 29s master
master
June 16, 2024 22:21 29s
thieve some sounds from Baystation (#987) Check for merge conflicts #726: Commit 9bd3aaa pushed by Kapu1178
June 16, 2024 22:20 59s master
master
June 16, 2024 22:20 59s
General code cleanup (#988) Check for merge conflicts #725: Commit 607cc27 pushed by Kapu1178
June 16, 2024 22:20 1m 11s master
master
June 16, 2024 22:20 1m 11s
fix dead mobs examining (#991) Check for merge conflicts #724: Commit c5cb13b pushed by Kapu1178
June 16, 2024 21:29 50s master
master
June 16, 2024 21:29 50s
OpenDream Linting (#930) Check for merge conflicts #723: Commit fd471f2 pushed by Kapu1178
June 16, 2024 06:40 51s master
master
June 16, 2024 06:40 51s
SQLite Codex Optimization (#963) Check for merge conflicts #722: Commit 5dc54de pushed by Kapu1178
June 16, 2024 03:15 47s master
master
June 16, 2024 03:15 47s
tgui: another giant pr: eslint changes (#981) Check for merge conflicts #721: Commit 697ae21 pushed by Kapu1178
June 15, 2024 00:45 42s master
master
June 15, 2024 00:45 42s
baystation gear examine (#986) Check for merge conflicts #720: Commit 22c20d3 pushed by Kapu1178
June 11, 2024 07:27 50s master
master
June 11, 2024 07:27 50s
gromit (#985) Check for merge conflicts #719: Commit 08baddb pushed by Kapu1178
June 11, 2024 07:11 51s master
master
June 11, 2024 07:11 51s
observe bugs (#984) Check for merge conflicts #718: Commit c0114e5 pushed by Kapu1178
June 11, 2024 04:58 40s master
master
June 11, 2024 04:58 40s
revert ancient kor change (#983) Check for merge conflicts #717: Commit c2f003a pushed by Kapu1178
June 11, 2024 03:55 40s master
master
June 11, 2024 03:55 40s
fix small click bug (#982) Check for merge conflicts #716: Commit b0be365 pushed by Kapu1178
June 10, 2024 23:06 46s master
master
June 10, 2024 23:06 46s
tgui: fixes chart in power monitor (#980) Check for merge conflicts #715: Commit 7ccc4ba pushed by Kapu1178
June 10, 2024 04:18 41s master
master
June 10, 2024 04:18 41s
Improve modsuit code (#976) Check for merge conflicts #714: Commit 6040eeb pushed by Kapu1178
June 10, 2024 00:21 46s master
master
June 10, 2024 00:21 46s