Skip to content

Actions: Contrabang/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
238 workflow runs
238 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

NanoMap Auto-Update (Fri May 31 01:15:40 UTC 2024) (#25709) Merge Conflict Detection #187: Commit c234dc3 pushed by Contrabang
May 31, 2024 19:27 34s master
master
May 31, 2024 19:27 34s
[FIX] Character Creator No Longer Displays "SUIT" Fallback Sprite on … Merge Conflict Detection #186: Commit 751cae5 pushed by Contrabang
May 31, 2024 12:31 30s master
master
May 31, 2024 12:31 30s
Adds Zombies (Admin-spawn) (#25381) Merge Conflict Detection #185: Commit bc0c834 pushed by Contrabang
May 31, 2024 04:42 25s master
master
May 31, 2024 04:42 25s
[s]Fixes an 8 year old bug. As a treat. (#25708) Merge Conflict Detection #184: Commit 13ac986 pushed by Contrabang
May 31, 2024 01:00 29s master
master
May 31, 2024 01:00 29s
Added science lobby area's to help the station not put stress on air … Merge Conflict Detection #183: Commit eca1df9 pushed by Contrabang
May 29, 2024 21:54 31s master
master
May 29, 2024 21:54 31s
Adjusted arguments for use_tool (#25662) Merge Conflict Detection #182: Commit b7aa472 pushed by Contrabang
May 29, 2024 01:14 33s master
master
May 29, 2024 01:14 33s
NanoMap Auto-Update (Mon May 27 01:15:23 UTC 2024) (#25645) Merge Conflict Detection #181: Commit d38a8f1 pushed by Contrabang
May 27, 2024 03:40 29s master
master
May 27, 2024 03:40 29s
spider spider spider (#25492) Merge Conflict Detection #180: Commit d438d5d pushed by Contrabang
May 24, 2024 21:53 33s master
master
May 24, 2024 21:53 33s
Fixes various radio issues (#25586) Merge Conflict Detection #179: Commit 9296564 pushed by Contrabang
May 23, 2024 04:16 29s master
master
May 23, 2024 04:16 29s
Click cooldown modifiers affect full auto component the same as every… Merge Conflict Detection #178: Commit 00a0eb7 pushed by Contrabang
May 15, 2024 21:40 28s master
master
May 15, 2024 21:40 28s
Tidy workflows (#25406) Merge Conflict Detection #177: Commit fa206c7 pushed by Contrabang
May 6, 2024 22:26 30s master
master
May 6, 2024 22:26 30s
Don't html-ize high rank admins in Discord. (#25117) Merge Conflict Detection #176: Commit a5d780e pushed by Contrabang
May 6, 2024 05:46 31s master
master
May 6, 2024 05:46 31s
Adds CI for SQL versions (#25226) Merge Conflict Detection #175: Commit 0b04611 pushed by Contrabang
May 5, 2024 20:23 29s master
master
May 5, 2024 20:23 29s
Fix the workflows failing every comment (#25391) Merge Conflict Detection #174: Commit bf356ea pushed by Contrabang
May 5, 2024 16:40 31s master
master
May 5, 2024 16:40 31s
Fixes a bug that prevented RCDs from rapidly constructing or deconstr… Merge Conflict Detection #173: Commit 1823eff pushed by Contrabang
May 5, 2024 05:10 27s master
master
May 5, 2024 05:10 27s
Update ghost_bar.dm (#25234) Merge Conflict Detection #172: Commit 20a0836 pushed by Contrabang
April 24, 2024 12:27 32s master
master
April 24, 2024 12:27 32s
removes the remaining datum redeclares (#25220) Merge Conflict Detection #171: Commit 9e6dcf9 pushed by Contrabang
April 21, 2024 18:30 27s master
master
April 21, 2024 18:30 27s
Expands "genderless" to all species, adds body-type option, removes s… Merge Conflict Detection #170: Commit f83ef61 pushed by Contrabang
April 21, 2024 17:20 28s master
master
April 21, 2024 17:20 28s
Adds CI to restrict types in a file (#24694) Merge Conflict Detection #169: Commit a95373f pushed by Contrabang
April 19, 2024 18:44 29s master
master
April 19, 2024 18:44 29s
Fixes the morph issue (#25202) Merge Conflict Detection #168: Commit df8ac7a pushed by Contrabang
April 19, 2024 18:04 31s master
master
April 19, 2024 18:04 31s
fix for the worlds shittiest exploit (#25130) Merge Conflict Detection #167: Commit 95efc8f pushed by Contrabang
April 14, 2024 23:01 34s master
master
April 14, 2024 23:01 34s
Add unit-tests for card decks (#24791) Merge Conflict Detection #166: Commit cb03f17 pushed by Contrabang
April 14, 2024 17:46 33s master
master
April 14, 2024 17:46 33s
Evil Cyborgs - Non-Engineer Emag/Malf Modules (#24638) Merge Conflict Detection #165: Commit 41469cf pushed by Contrabang
April 12, 2024 20:31 34s master
master
April 12, 2024 20:31 34s
Runtimes bad. (#25081) Merge Conflict Detection #164: Commit e18747c pushed by Contrabang
April 11, 2024 14:56 34s master
master
April 11, 2024 14:56 34s
Made storage nesting better, improved consistency between storage typ… Merge Conflict Detection #163: Commit fe74786 pushed by Contrabang
April 11, 2024 01:07 49s master
master
April 11, 2024 01:07 49s