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

excludes user from seeing storage insertion message (#27490) Merge Conflict Detection #269: Commit c21be0b pushed by Contrabang
November 30, 2024 04:53 25s master
master
November 30, 2024 04:53 25s
Makes playing cards playable -- significantly reworks card interactio… Merge Conflict Detection #268: Commit 8da12bc pushed by Contrabang
November 30, 2024 01:03 31s master
master
November 30, 2024 01:03 31s
Adds a triple beep sound to a variety of assembly receivers (#27315) Merge Conflict Detection #267: Commit 8cc1625 pushed by Contrabang
November 29, 2024 02:53 27s master
master
November 29, 2024 02:53 27s
Fixes missing name on some PTL orbital strike sprites (#27461) Merge Conflict Detection #266: Commit 95c60f6 pushed by Contrabang
November 26, 2024 21:24 29s master
master
November 26, 2024 21:24 29s
fix: remove stray cig vendor from USSP (#27447) Merge Conflict Detection #265: Commit c8c3a3c pushed by Contrabang
November 24, 2024 21:33 30s master
master
November 24, 2024 21:33 30s
Unfucks Bulldog Bundles (#27376) Merge Conflict Detection #264: Commit aa2651f pushed by Contrabang
November 24, 2024 21:09 30s master
master
November 24, 2024 21:09 30s
Fixes surgery delays (#27440) Merge Conflict Detection #263: Commit f978108 pushed by Contrabang
November 23, 2024 22:19 31s master
master
November 23, 2024 22:19 31s
refactor: move damaged ruin ripley to subtype (#27294) Merge Conflict Detection #262: Commit 0de5514 pushed by Contrabang
November 23, 2024 22:08 26s master
master
November 23, 2024 22:08 26s
refactor: Migrate more random_spawners to random/spawners and mapping… Merge Conflict Detection #261: Commit 586805a pushed by Contrabang
November 23, 2024 15:55 30s master
master
November 23, 2024 15:55 30s
Revert "init (#27394)" (#27429) Merge Conflict Detection #260: Commit 3a5bfaa pushed by Contrabang
November 23, 2024 06:15 1m 27s master
master
November 23, 2024 06:15 1m 27s
Adding and wiring some new guitar sounds. (#27184) Merge Conflict Detection #259: Commit c3cca9d pushed by Contrabang
November 22, 2024 14:46 1m 21s master
master
November 22, 2024 14:46 1m 21s
refactor: /New -> /Initialize: simple animals (#27265) Merge Conflict Detection #258: Commit 9009e3a pushed by Contrabang
November 22, 2024 01:21 28s master
master
November 22, 2024 01:21 28s
[s] no, bad, no good, icky (#27413) Merge Conflict Detection #257: Commit e99d167 pushed by Contrabang
November 20, 2024 23:53 28s master
master
November 20, 2024 23:53 28s
Makes some code tidy (#27391) Merge Conflict Detection #256: Commit 1cda30a pushed by Contrabang
November 19, 2024 16:08 31s master
master
November 19, 2024 16:08 31s
[LORE] Extensive Modsuit Lore Drop (#27119) Merge Conflict Detection #255: Commit b3c1890 pushed by Contrabang
November 18, 2024 21:02 31s master
master
November 18, 2024 21:02 31s
[s] [FIX] Exploit fix (#27387) Merge Conflict Detection #254: Commit 6f5441f pushed by Contrabang
November 18, 2024 19:01 28s master
master
November 18, 2024 19:01 28s
fix magic missile hitting the user if they move while casting it (#27… Merge Conflict Detection #253: Commit b56c32f pushed by Contrabang
November 18, 2024 14:31 29s master
master
November 18, 2024 14:31 29s
[CLEAN] Remove 2 outdated lines from crusher code (#27182) Merge Conflict Detection #252: Commit c721210 pushed by Contrabang
November 16, 2024 21:00 28s master
master
November 16, 2024 21:00 28s
NanoMap Auto-Update (Sat Nov 16 01:40:25 UTC 2024) (#27174) Merge Conflict Detection #251: Commit b2effee pushed by Contrabang
November 16, 2024 05:53 31s master
master
November 16, 2024 05:53 31s
Fixes a bunch of runtimes (#27363) Merge Conflict Detection #250: Commit 975d9ed pushed by Contrabang
November 15, 2024 14:10 32s master
master
November 15, 2024 14:10 32s
config: allow disabling default SSweather events (#27300) Merge Conflict Detection #249: Commit 8e47329 pushed by Contrabang
November 15, 2024 02:20 29s master
master
November 15, 2024 02:20 29s
Fixes spellblade floating pixels while inhand DAMN YOU MERASMUS! (#27… Merge Conflict Detection #248: Commit 0b3c770 pushed by Contrabang
November 14, 2024 13:57 30s master
master
November 14, 2024 13:57 30s
thermite no more makes walls with 5u max reagents (#27330) Merge Conflict Detection #247: Commit e4af6ca pushed by Contrabang
November 11, 2024 19:06 29s master
master
November 11, 2024 19:06 29s
yes (#27329) Merge Conflict Detection #246: Commit aec6b15 pushed by Contrabang
November 10, 2024 01:46 32s master
master
November 10, 2024 01:46 32s
Adds Bitfields to the VV menu (#27266) Merge Conflict Detection #245: Commit 9b2cd0a pushed by Contrabang
November 9, 2024 23:22 27s master
master
November 9, 2024 23:22 27s