Skip to content

Actions: Contrabang/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
237 workflow runs
237 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Vending machine lock improvements (#28200) Merge Conflict Detection #319: Commit 5495930 pushed by Contrabang
February 13, 2025 08:48 37s master
master
February 13, 2025 08:48 37s
Refactor Fire Alarm item_interaction() (#28136) Merge Conflict Detection #318: Commit 0e55808 pushed by Contrabang
February 10, 2025 05:39 28s master
master
February 10, 2025 05:39 28s
turn EncodeDNABlock proc into a define (#28186) Merge Conflict Detection #317: Commit 59377ad pushed by Contrabang
February 9, 2025 15:36 26s master
master
February 9, 2025 15:36 26s
Improves runtime info during admin proc calls (#28279) Merge Conflict Detection #316: Commit 5d32c2f pushed by Contrabang
February 8, 2025 19:40 30s master
master
February 8, 2025 19:40 30s
Cult is now part of dynamic (#28236) Merge Conflict Detection #315: Commit 2d998b8 pushed by Contrabang
February 8, 2025 17:46 27s master
master
February 8, 2025 17:46 27s
Slower plasma fire and temperature decay (#28171) Merge Conflict Detection #314: Commit 9be5e7d pushed by Contrabang
February 7, 2025 16:39 29s master
master
February 7, 2025 16:39 29s
Add debug research notes (#28074) Merge Conflict Detection #313: Commit 659c4bb pushed by Contrabang
February 6, 2025 18:01 33s master
master
February 6, 2025 18:01 33s
Adds Tend Wounds/Tend Burns surgeries (#28105) Merge Conflict Detection #312: Commit e8a61cf pushed by Contrabang
February 5, 2025 19:47 29s master
master
February 5, 2025 19:47 29s
Changes a lot of lighting colors, ranges, and powers (#28226) Merge Conflict Detection #311: Commit e3f73e1 pushed by Contrabang
February 5, 2025 06:52 29s master
master
February 5, 2025 06:52 29s
No VV/proccall click runtime (#28243) Merge Conflict Detection #310: Commit fd04e5a pushed by Contrabang
February 4, 2025 17:48 27s master
master
February 4, 2025 17:48 27s
Changes reset code to 1000 instead of 0 (#28231) Merge Conflict Detection #309: Commit 39d58e2 pushed by Contrabang
February 3, 2025 19:58 32s master
master
February 3, 2025 19:58 32s
yolo (#28227) Merge Conflict Detection #308: Commit a9b181e pushed by Contrabang
February 2, 2025 23:06 26s master
master
February 2, 2025 23:06 26s
Clean up firedoors and add proper emag behavior (#28087) Merge Conflict Detection #307: Commit 8a47c1a pushed by Contrabang
February 2, 2025 20:31 30s master
master
February 2, 2025 20:31 30s
minor test fixture improvements (#28207) Merge Conflict Detection #306: Commit 99ad70a pushed by Contrabang
February 1, 2025 16:44 27s master
master
February 1, 2025 16:44 27s
Re-bonk reagents on kitchen appliances (#28185) Merge Conflict Detection #305: Commit 7f9305f pushed by Contrabang
January 30, 2025 18:07 31s master
master
January 30, 2025 18:07 31s
Update VV to work better in 516 (#28078) Merge Conflict Detection #304: Commit e8f7806 pushed by Contrabang
January 25, 2025 15:55 28s master
master
January 25, 2025 15:55 28s
oops (#28045) Merge Conflict Detection #303: Commit 08d4ab7 pushed by Contrabang
January 20, 2025 21:34 33s master
master
January 20, 2025 21:34 33s
"Dynamic" Gamemode using rulesets (#27600) Merge Conflict Detection #302: Commit 8954a8e pushed by Contrabang
January 19, 2025 20:13 32s master
master
January 19, 2025 20:13 32s
fix random bookcase icon (#28034) Merge Conflict Detection #301: Commit 61802a7 pushed by Contrabang
January 19, 2025 15:59 31s master
master
January 19, 2025 15:59 31s
make all sec clothing in the loadout menu available to the detective … Merge Conflict Detection #300: Commit 97e99fe pushed by Contrabang
January 19, 2025 04:19 27s master
master
January 19, 2025 04:19 27s
Adjust depot loot a little and remove some irrelevant items. (#27398) Merge Conflict Detection #299: Commit 5337cc1 pushed by Contrabang
January 13, 2025 17:15 31s master
master
January 13, 2025 17:15 31s
NanoMap Auto-Update (Sat Jan 11 01:37:56 UTC 2025) (#27938) Merge Conflict Detection #298: Commit a64e52e pushed by Contrabang
January 11, 2025 18:43 33s master
master
January 11, 2025 18:43 33s
Fixes old Humanoid cyborg sprites, to actually be able to wear hats. … Merge Conflict Detection #297: Commit c35174c pushed by Contrabang
January 8, 2025 02:32 26s master
master
January 8, 2025 02:32 26s
Dragging storage bags now drops items around the mouse pointer (#27790) Merge Conflict Detection #296: Commit 8e60888 pushed by Contrabang
January 6, 2025 18:46 27s master
master
January 6, 2025 18:46 27s
Adds Contrabang to Headcoders in CONTRIBUTING.md Merge Conflict Detection #295: Commit 995b6dc pushed by Contrabang
January 6, 2025 18:41 34s master
master
January 6, 2025 18:41 34s