Skip to content

Actions: Citadel-Station-13/Citadel-Station-13-RP

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
747 workflow runs
747 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

when loading into a pAI card you can now choose to use a saved name a… Check for merge conflicts #2675: Commit 52f05ae pushed by silicons
December 23, 2023 02:43 48s master
master
December 23, 2023 02:43 48s
Replaces the RnG of electric shocks with a more sane calculation (#6213) Check for merge conflicts #2674: Commit c9711d4 pushed by silicons
December 23, 2023 02:42 51s master
master
December 23, 2023 02:42 51s
Nightshift v2 (#6207) Check for merge conflicts #2673: Commit 2c75047 pushed by TheLordME
December 19, 2023 19:32 40s master
master
December 19, 2023 19:32 40s
Autosave duration is now configureable (#6201) Check for merge conflicts #2672: Commit 34791f2 pushed by silicons
December 16, 2023 03:47 37s master
master
December 16, 2023 03:47 37s
Bump axios from 0.21.4 to 1.6.0 in /tgui (#6134) Check for merge conflicts #2671: Commit 9072b2d pushed by silicons
December 16, 2023 03:45 40s master
master
December 16, 2023 03:45 40s
Fixes Borg-O Recipe (#6208) Check for merge conflicts #2670: Commit 4f4b8ae pushed by silicons
December 16, 2023 03:45 28s master
master
December 16, 2023 03:45 28s
stop large hypovials going in non-advanced hyposprays (#6176) Check for merge conflicts #2669: Commit e252568 pushed by silicons
December 16, 2023 03:44 1m 0s master
master
December 16, 2023 03:44 1m 0s
[TESTMERGE ONLY] Revert "Makes radiation wave decay inverse square in… Check for merge conflicts #2668: Commit ff5bae2 pushed by silicons
December 16, 2023 03:18 40s master
master
December 16, 2023 03:18 40s
Adds bluespace mining satchels + BS mining satchel upgrade for minerb… Check for merge conflicts #2667: Commit 19884e1 pushed by TheLordME
December 15, 2023 19:13 26s master
master
December 15, 2023 19:13 26s
Job icon fixes, Job blurb spelling correction (#6204) Check for merge conflicts #2666: Commit c1813bd pushed by TheLordME
December 15, 2023 19:13 26s master
master
December 15, 2023 19:13 26s
A few fixes for bots (#6205) Check for merge conflicts #2665: Commit 80b41bf pushed by TheLordME
December 15, 2023 19:12 41s master
master
December 15, 2023 19:12 41s
fixes traits applying to observers (#6199) Check for merge conflicts #2664: Commit 55b4bb2 pushed by BlueWildrose
December 14, 2023 07:05 49s master
master
December 14, 2023 07:05 49s
Adds Mimosas (#6203) Check for merge conflicts #2663: Commit 541eafb pushed by BlueWildrose
December 14, 2023 07:04 38s master
master
December 14, 2023 07:04 38s
Gaia floorlighting starts offline (#6198) Check for merge conflicts #2662: Commit b8ac77c pushed by BlueWildrose
December 14, 2023 07:03 42s master
master
December 14, 2023 07:03 42s
Reduce the amount of mobspawners in trashpiles by 50% (#6200) Check for merge conflicts #2661: Commit 8184444 pushed by Captain277
December 12, 2023 14:08 42s master
master
December 12, 2023 14:08 42s
Atlas map bugfix catchup (#6185) Check for merge conflicts #2660: Commit 1521044 pushed by Captain277
December 12, 2023 14:08 45s master
master
December 12, 2023 14:08 45s
shark ear port from virgo (#6192) Check for merge conflicts #2659: Commit a060534 pushed by TheLordME
December 11, 2023 16:45 40s master
master
December 11, 2023 16:45 40s
Jukebox Additions Part Two (#6190) Check for merge conflicts #2658: Commit aa26bf5 pushed by TheLordME
December 9, 2023 12:52 36s master
master
December 9, 2023 12:52 36s
Fixes Crab Meat Drop (#6195) Check for merge conflicts #2657: Commit 030591a pushed by TheLordME
December 9, 2023 12:46 27s master
master
December 9, 2023 12:46 27s
Adds a coffee dispenser crate to cargo (#6196) Check for merge conflicts #2656: Commit a011509 pushed by TheLordME
December 9, 2023 12:46 48s master
master
December 9, 2023 12:46 48s
Makes pronoun selection display the actual pronouns the options give … Check for merge conflicts #2655: Commit 00f037e pushed by TheLordME
December 9, 2023 12:46 40s master
master
December 9, 2023 12:46 40s
Heat pump rebalance (TESTMERGE) (#6164) Check for merge conflicts #2654: Commit 956d41e pushed by TheLordME
December 8, 2023 10:20 25s master
master
December 8, 2023 10:20 25s
Adds plantpeople physiologies, buffs alraune in snow and water turfs,… Check for merge conflicts #2653: Commit bf88903 pushed by TheLordME
December 8, 2023 10:19 30s master
master
December 8, 2023 10:19 30s
stop drying racks taking more than one sheet of leather at a time (#6… Check for merge conflicts #2652: Commit 988b14a pushed by TheLordME
December 8, 2023 10:19 42s master
master
December 8, 2023 10:19 42s
Fixes black duffelbags not being lightweight (#6186) Check for merge conflicts #2651: Commit c322ad8 pushed by TheLordME
December 8, 2023 10:18 39s master
master
December 8, 2023 10:18 39s
ProTip! You can narrow down the results and go further in time using created:<2023-12-08 or the other filters available.