Skip to content

Actions: cmss13-devs/cmss13-pve

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
9 workflow run results
9 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Config framework for new map, plus hyper early map Check for merge conflicts #9: Commit e4d4116 pushed by morrowwolf
October 11, 2023 11:24 13s master
master
October 11, 2023 11:24 13s
increases ranks of personnel, makes sure we only get slots we want Check for merge conflicts #8: Commit 07fc1bd pushed by morrowwolf
October 11, 2023 10:08 15s master
master
October 11, 2023 10:08 15s
Xenos ignore non-conscious people, die at -400 now Check for merge conflicts #7: Commit 78396b7 pushed by morrowwolf
October 11, 2023 09:09 16s master
master
October 11, 2023 09:09 16s
99 round mk1 Check for merge conflicts #6: Commit f088681 pushed by morrowwolf
October 11, 2023 08:43 11s master
master
October 11, 2023 08:43 11s
Engi/Con skill buffs, marine gloves insulated Check for merge conflicts #5: Commit fb6e54a pushed by morrowwolf
October 11, 2023 08:43 15s master
master
October 11, 2023 08:43 15s
Cleans up the gamemode Check for merge conflicts #4: Commit cfc9e46 pushed by morrowwolf
October 11, 2023 08:30 12s master
master
October 11, 2023 08:30 12s
Removes a bunch of intel stuff, fixes PROC_REFs Check for merge conflicts #3: Commit baaf06c pushed by morrowwolf
October 11, 2023 08:27 12s master
master
October 11, 2023 08:27 12s
Update README.md Check for merge conflicts #2: Commit db05559 pushed by morrowwolf
October 9, 2023 21:52 11s master
master
October 9, 2023 21:52 11s
Merge remote-tracking branch 'CMSS13/PvE-CM' Check for merge conflicts #1: Commit e021b21 pushed by morrowwolf
October 9, 2023 21:44 Startup failure master
master
October 9, 2023 21:44 Startup failure