Skip to content

Actions: Fordoxia/CRUNCHParadise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
88 workflow runs
88 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

unfortunately 75 + 75 = 150 (#26260) Merge Conflict Detection #63: Commit 7a181b8 pushed by Fordoxia
July 19, 2024 22:52 26s master
master
July 19, 2024 22:52 26s
Fix: Invisible chameleon cap (#26227) Merge Conflict Detection #62: Commit 857427a pushed by Fordoxia
July 13, 2024 20:56 28s master
master
July 13, 2024 20:56 28s
Area changed/shit moved (#26150) Merge Conflict Detection #61: Commit e97c723 pushed by Fordoxia
July 13, 2024 20:55 32s master
master
July 13, 2024 20:55 32s
Update robot_upgrades.dm Merge Conflict Detection #60: Commit 71e8d08 pushed by Fordoxia
July 13, 2024 20:50 31s master
master
July 13, 2024 20:50 31s
Area changed/shit moved (#26150) Merge Conflict Detection #59: Commit e97c723 pushed by Fordoxia
July 13, 2024 20:47 34s master
master
July 13, 2024 20:47 34s
[FIX]Plant DNA manipulator now drops seed and disks on destruction (#… Merge Conflict Detection #58: Commit 8c7c9d3 pushed by Fordoxia
July 12, 2024 19:46 32s master
master
July 12, 2024 19:46 32s
Cyborg Damage, Movement, and Power Overhaul (#25252) Merge Conflict Detection #57: Commit ec88636 pushed by Fordoxia
July 10, 2024 02:49 29s master
master
July 10, 2024 02:49 29s
Makes all playsounds use bools for vary (#26183) Merge Conflict Detection #56: Commit 4cf6595 pushed by Fordoxia
July 9, 2024 00:19 27s master
master
July 9, 2024 00:19 27s
Makes TGUI strip menu size toggleable (#25763) Merge Conflict Detection #55: Commit 7764d13 pushed by Fordoxia
July 6, 2024 14:37 29s master
master
July 6, 2024 14:37 29s
Update diona_organs.dm (#26004) Merge Conflict Detection #54: Commit 39000c7 pushed by Fordoxia
June 29, 2024 19:21 27s master
master
June 29, 2024 19:21 27s
Feature Freeze announcement Merge Conflict Detection #53: Commit ec7a0bf pushed by Fordoxia
June 29, 2024 17:11 27s master
master
June 29, 2024 17:11 27s
NanoMap Auto-Update (Thu Jun 27 01:17:10 UTC 2024) (#26027) Merge Conflict Detection #52: Commit 7decdec pushed by Fordoxia
June 27, 2024 19:43 32s master
master
June 27, 2024 19:43 32s
why did i make it like this to begin with (#25876) Merge Conflict Detection #51: Commit 1d0cb9a pushed by Fordoxia
June 25, 2024 03:26 31s master
master
June 25, 2024 03:26 31s
Judo Storage Slots + Changes to Combos (#25659) Merge Conflict Detection #50: Commit 9d1e1ba pushed by Fordoxia
June 24, 2024 05:05 36s master
master
June 24, 2024 05:05 36s
Actually fixes account_name runtime in rename_character (#25880) Merge Conflict Detection #49: Commit d12eaad pushed by Fordoxia
June 16, 2024 22:50 29s master
master
June 16, 2024 22:50 29s
Changes a single number (#25926) Merge Conflict Detection #48: Commit 26a9468 pushed by Fordoxia
June 15, 2024 21:24 33s master
master
June 15, 2024 21:24 33s
Update boxstation.dmm (#25719) Merge Conflict Detection #47: Commit 69a29f2 pushed by Fordoxia
June 12, 2024 20:11 39s master
master
June 12, 2024 20:11 39s
lwap no longer points out invisible admins, revenants, or fully steal… Merge Conflict Detection #46: Commit 076e463 pushed by Fordoxia
June 12, 2024 04:03 31s master
master
June 12, 2024 04:03 31s
Adds a General Hydroponics and a Botanist wiki manual to the hydropon… Merge Conflict Detection #45: Commit 342eade pushed by Fordoxia
June 9, 2024 01:11 35s master
master
June 9, 2024 01:11 35s
add null check (#25834) Merge Conflict Detection #44: Commit 8ce12e7 pushed by Fordoxia
June 6, 2024 22:07 29s master
master
June 6, 2024 22:07 29s
Update robot_upgrades.dm Merge Conflict Detection #43: Commit fecac75 pushed by Fordoxia
June 4, 2024 15:48 33s master
master
June 4, 2024 15:48 33s
Cryo storage can no longer be exploded by malf AI (#25782) Merge Conflict Detection #42: Commit 95d682f pushed by Fordoxia
June 3, 2024 03:18 33s master
master
June 3, 2024 03:18 33s
Update robot_upgrades.dm Merge Conflict Detection #41: Commit 6a943d3 pushed by Fordoxia
June 3, 2024 03:15 32s master
master
June 3, 2024 03:15 32s
no fungus (#25732) Merge Conflict Detection #40: Commit ee6068b pushed by Fordoxia
June 3, 2024 03:14 33s master
master
June 3, 2024 03:14 33s
Update robot_upgrades.dm Merge Conflict Detection #39: Commit 729bf9e pushed by Fordoxia
June 3, 2024 03:06 30s master
master
June 3, 2024 03:06 30s