Skip to content

Actions: Foundation-19/Hail-Mary

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
199 workflow runs
199 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

More train small changes (#151) Check for merge conflicts #124: Commit 1393133 pushed by Aurrain
September 19, 2024 21:20 37s master
master
September 19, 2024 21:20 37s
Removes holes in map + Reduce spawns (#214) Check for merge conflicts #123: Commit e954f10 pushed by Aurrain
September 19, 2024 02:26 40s master
master
September 19, 2024 02:26 40s
S.P.E.C.I.A.L "S" and "P" Adjustments + 7.62 Ammo - Fixes Desert Rang… Check for merge conflicts #122: Commit 4e8da82 pushed by Aurrain
September 19, 2024 02:23 39s master
master
September 19, 2024 02:23 39s
Makes the Happyshark donator recipes avaible for everyone (#208) Check for merge conflicts #121: Commit 400e133 pushed by xTrainx
September 8, 2024 02:35 28s master
master
September 8, 2024 02:35 28s
Baltimore Map test (#3) Check for merge conflicts #120: Commit d4cfbc6 pushed by xTrainx
September 8, 2024 02:35 40s master
master
September 8, 2024 02:35 40s
Automatic TGS DMAPI Update (#210) Check for merge conflicts #119: Commit de8f698 pushed by xTrainx
September 7, 2024 01:02 44s master
master
September 7, 2024 01:02 44s
Lets stronger mobs kill people (#205) Check for merge conflicts #118: Commit bab31e1 pushed by xTrainx
September 7, 2024 00:46 32s master
master
September 7, 2024 00:46 32s
Uncomments out the crafting recipes for niche ammo types (#203) Check for merge conflicts #117: Commit d4ddc64 pushed by xTrainx
September 7, 2024 00:46 38s master
master
September 7, 2024 00:46 38s
Tweaks plant+medicine bag item count, adds Bitter barrels, Fixes bott… Check for merge conflicts #116: Commit 106ef45 pushed by xTrainx
September 7, 2024 00:46 26s master
master
September 7, 2024 00:46 26s
Wasteland Flipper Bugfix: Fixes double tile when placing tile on road… Check for merge conflicts #115: Commit b826c62 pushed by xTrainx
September 7, 2024 00:45 25s master
master
September 7, 2024 00:45 25s
Sprite Addition: Stealth Boy + Variants (#75) Check for merge conflicts #114: Commit 1b87b86 pushed by xTrainx
September 7, 2024 00:45 44s master
master
September 7, 2024 00:45 44s
Cleans up Quirk descriptions (#197) Check for merge conflicts #113: Commit 4efbadf pushed by xTrainx
September 3, 2024 01:01 37s master
master
September 3, 2024 01:01 37s
Various Fixes (#195) Check for merge conflicts #112: Commit 88c0ccb pushed by xTrainx
September 3, 2024 00:58 40s master
master
September 3, 2024 00:58 40s
Fixes enclave spawning with incorrect armor (#196) Check for merge conflicts #111: Commit 8c09c6e pushed by xTrainx
September 3, 2024 00:58 41s master
master
September 3, 2024 00:58 41s
mutie rework yaaay (#194) Check for merge conflicts #110: Commit 8afe98f pushed by xTrainx
September 3, 2024 00:48 42s master
master
September 3, 2024 00:48 42s
Removes cargo train in favor of old cargo (#185) Check for merge conflicts #109: Commit 9293259 pushed by xTrainx
September 3, 2024 00:42 37s master
master
September 3, 2024 00:42 37s
adding the ambulance + truck + Jeep + Ballooooooooon (#164) Check for merge conflicts #108: Commit f6742e3 pushed by xTrainx
September 3, 2024 00:29 43s master
master
September 3, 2024 00:29 43s
Wasteland Flipper: Lamp post repair DLC (#146) Check for merge conflicts #107: Commit eb3d7a1 pushed by xTrainx
September 3, 2024 00:16 38s master
master
September 3, 2024 00:16 38s
Automatic TGS DMAPI Update (#206) Check for merge conflicts #106: Commit 4e31122 pushed by Aurrain
August 15, 2024 01:34 42s master
master
August 15, 2024 01:34 42s
Update liver.dm (#207) Check for merge conflicts #105: Commit c945e7d pushed by Aurrain
August 15, 2024 00:48 47s master
master
August 15, 2024 00:48 47s
Edits a bunch of flavor text for reagents (#188) Check for merge conflicts #104: Commit 10290a9 pushed by xTrainx
June 7, 2024 01:25 41s master
master
June 7, 2024 01:25 41s
Adds a random roman name button (#193) Check for merge conflicts #103: Commit ab1d373 pushed by xTrainx
June 7, 2024 01:24 56s master
master
June 7, 2024 01:24 56s
Fixes disconnected player timers not showing (#192) Check for merge conflicts #102: Commit b8d8c6a pushed by xTrainx
June 7, 2024 01:23 47s master
master
June 7, 2024 01:23 47s
Lets staff have funny ghosts (#190) Check for merge conflicts #101: Commit 67d022b pushed by xTrainx
June 7, 2024 01:20 38s master
master
June 7, 2024 01:20 38s
Energy WeaponRebalance (#174) Check for merge conflicts #100: Commit 64dbb09 pushed by xTrainx
June 7, 2024 01:18 41s master
master
June 7, 2024 01:18 41s