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

makes blackness black (#1030) Check for merge conflicts #747: Commit c99b7e9 pushed by Kapu1178
July 19, 2024 17:22 21s master
master
July 19, 2024 17:22 21s
catwalks dont get moved by airflow (#1025) Check for merge conflicts #746: Commit c2da945 pushed by Kapu1178
July 11, 2024 17:43 55s master
master
July 11, 2024 17:43 55s
halochange (#1023) Check for merge conflicts #745: Commit 2498bcd pushed by Kapu1178
July 11, 2024 06:06 49s master
master
July 11, 2024 06:06 49s
fixes stacks (#1021) Check for merge conflicts #744: Commit 5999265 pushed by Kapu1178
July 7, 2024 16:48 45s master
master
July 7, 2024 16:48 45s
placing down a catwalk actually places down a catwalk (#1020) Check for merge conflicts #743: Commit c61002c pushed by Kapu1178
July 7, 2024 16:26 48s master
master
July 7, 2024 16:26 48s
Advanced cable placement (#1009) Check for merge conflicts #742: Commit 333fe47 pushed by Kapu1178
June 30, 2024 16:52 51s master
master
June 30, 2024 16:52 51s
fix bloom the right way (#1011) Check for merge conflicts #741: Commit b251857 pushed by Kapu1178
June 30, 2024 00:44 30s master
master
June 30, 2024 00:44 30s
Surgery changes and fixes (#1007) Check for merge conflicts #740: Commit 70dc242 pushed by Kapu1178
June 30, 2024 00:43 37s master
master
June 30, 2024 00:43 37s
initial commit (#1013) Check for merge conflicts #739: Commit d470e2a pushed by Kapu1178
June 30, 2024 00:43 58s master
master
June 30, 2024 00:43 58s
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