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

Makes cups of water not cups of.. what? (#6154) Check for merge conflicts #2625: Commit 11562e0 pushed by silicons
November 26, 2023 06:13 25s master
master
November 26, 2023 06:13 25s
Skrell Update (#6153) Check for merge conflicts #2624: Commit bbcf2d0 pushed by silicons
November 26, 2023 06:13 41s master
master
November 26, 2023 06:13 41s
Fixes Auril Castes not being able to wear hardsuits (#6157) Check for merge conflicts #2623: Commit 4428984 pushed by silicons
November 26, 2023 06:12 38s master
master
November 26, 2023 06:12 38s
kevlar upgrades no longer make you immortal (#6149) Check for merge conflicts #2622: Commit f9c8e05 pushed by Captain277
November 18, 2023 07:10 46s master
master
November 18, 2023 07:10 46s
Automatic TGS DMAPI Update (#6151) Check for merge conflicts #2621: Commit 2ef2b1e pushed by silicons
November 18, 2023 07:09 34s master
master
November 18, 2023 07:09 34s
Fixes Broken Empty Gun Sprites (#6150) Check for merge conflicts #2620: Commit 830a830 pushed by silicons
November 18, 2023 07:07 26s master
master
November 18, 2023 07:07 26s
Removes Carpotoxin from Fish-Based Dishes (#6148) Check for merge conflicts #2619: Commit cd0fddb pushed by silicons
November 18, 2023 07:07 37s master
master
November 18, 2023 07:07 37s
Ore Stacking (#6136) Check for merge conflicts #2618: Commit 7adbcdc pushed by silicons
November 18, 2023 07:07 2m 20s master
master
November 18, 2023 07:07 2m 20s
Updates the Description for CentCom Memorials (#6113) Check for merge conflicts #2617: Commit a7c1cff pushed by TheLordME
November 17, 2023 07:49 38s master
master
November 17, 2023 07:49 38s
Objectifies Fish (#6144) Check for merge conflicts #2616: Commit ba8a4e6 pushed by TheLordME
November 17, 2023 07:31 36s master
master
November 17, 2023 07:31 36s
fixes storage not dropping contents on destruction (#6146) Check for merge conflicts #2615: Commit 09ae322 pushed by BlueWildrose
November 16, 2023 04:19 40s master
master
November 16, 2023 04:19 40s
minor inv fixes (#6142) Check for merge conflicts #2614: Commit 9d26ed2 pushed by Captain277
November 15, 2023 04:38 27s master
master
November 15, 2023 04:38 27s
buffs borg lights (#6140) Check for merge conflicts #2613: Commit 03f14fd pushed by Captain277
November 15, 2023 04:37 27s master
master
November 15, 2023 04:37 27s
various fixes + tweaks (#6138) Check for merge conflicts #2612: Commit 8252233 pushed by Captain277
November 15, 2023 04:37 39s master
master
November 15, 2023 04:37 39s
Hypokit placeable on Belt Slot (#6141) Check for merge conflicts #2611: Commit 1542193 pushed by silicons
November 14, 2023 00:34 53s master
master
November 14, 2023 00:34 53s
Backpacks in Loadout (#6143) Check for merge conflicts #2610: Commit b0ff12b pushed by silicons
November 14, 2023 00:33 26s master
master
November 14, 2023 00:33 26s
Adjusts Alarms on Shuttles (#6131) Check for merge conflicts #2609: Commit ad80b16 pushed by silicons
November 14, 2023 00:33 31s master
master
November 14, 2023 00:33 31s
Subtypes Corporate Crates, Fixes Mapped Biohazard Crate, Renames Adva… Check for merge conflicts #2608: Commit 33cae26 pushed by silicons
November 14, 2023 00:33 45s master
master
November 14, 2023 00:33 45s
Destroys the Universe (#6129) Check for merge conflicts #2607: Commit 80e9a7a pushed by Captain277
November 13, 2023 21:26 36s master
master
November 13, 2023 21:26 36s
Removes old duplicate backpack of holding singularity_act (#6130) Check for merge conflicts #2606: Commit 76fedb4 pushed by Captain277
November 13, 2023 21:26 26s master
master
November 13, 2023 21:26 26s
fixes gpses breaking on flight (#6135) Check for merge conflicts #2605: Commit ea471fa pushed by Captain277
November 13, 2023 21:25 52s master
master
November 13, 2023 21:25 52s
Adds Replika Specific Body Marking (#6137) Check for merge conflicts #2604: Commit f0ef5c0 pushed by silicons
November 13, 2023 08:35 26s master
master
November 13, 2023 08:35 26s
Replika Armor in Loadout (no defense stats) (#6139) Check for merge conflicts #2603: Commit 9db5601 pushed by silicons
November 13, 2023 08:35 30s master
master
November 13, 2023 08:35 30s
Tridot body marking (forehead) (#6132) Check for merge conflicts #2602: Commit 7a22dc7 pushed by silicons
November 13, 2023 08:34 54s master
master
November 13, 2023 08:34 54s
Replikant Apparel, Armor, Leg Markings and 2nd Gen prosthetics. (#6127) Check for merge conflicts #2601: Commit 40d37d6 pushed by silicons
November 12, 2023 01:42 42s master
master
November 12, 2023 01:42 42s
ProTip! You can narrow down the results and go further in time using created:<2023-11-12 or the other filters available.