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
995 workflow runs
995 workflow runs

Filter by Event

Loading

Filter by Status

Loading

Filter by Branch

Loading

Filter by Actor

Loading
fixes some ammo issues (#6645) Check for merge conflicts #3047: Commit c0fd997 pushed by TheLordME
August 5, 2024 15:48 43s master
master
August 5, 2024 15:48 43s
projectiles v8 - ammo & magazines (#6637) Check for merge conflicts #3046: Commit 002dda4 pushed by ktoma36
August 4, 2024 19:31 39s master
master
August 4, 2024 19:31 39s
Removes teleporter (including portal and harpoon) failure and recursi… Check for merge conflicts #3045: Commit 8e2d711 pushed by TheLordME
August 3, 2024 15:31 42s master
master
August 3, 2024 15:31 42s
Tweaks to the Burn Engine of Riftmap (#6635) Check for merge conflicts #3044: Commit 60104a6 pushed by TheLordME
August 3, 2024 15:30 40s master
master
August 3, 2024 15:30 40s
adds passive species speed (de)buff depending on light (#6535) Check for merge conflicts #3043: Commit 01efae0 pushed by TheLordME
August 3, 2024 15:28 39s master
master
August 3, 2024 15:28 39s
Resprites most cigarette boxes & Adds two new imported cigarettes. (#… Check for merge conflicts #3042: Commit 234e627 pushed by silicons
August 2, 2024 02:20 42s master
master
August 2, 2024 02:20 42s
inhand interaction refactor (#6633) Check for merge conflicts #3041: Commit 64ec254 pushed by TheLordME
August 1, 2024 17:54 39s master
master
August 1, 2024 17:54 39s
projectiles v8 - rendering system (& some pulse weapon changes) (#6632) Check for merge conflicts #3040: Commit cd40af9 pushed by TheLordME
August 1, 2024 17:46 40s master
master
August 1, 2024 17:46 40s
Backspaced out old dna lock system from guns (#6634) Check for merge conflicts #3039: Commit 0e1d9de pushed by TheLordME
July 31, 2024 17:59 43s master
master
July 31, 2024 17:59 43s
fixes some coats not having a sprite while the hood is up (#6624) Check for merge conflicts #3038: Commit c377ae9 pushed by deathride58
July 31, 2024 14:34 45s master
master
July 31, 2024 14:34 45s
supply: supply pack datums, some reworks (#6599) Check for merge conflicts #3037: Commit 5134116 pushed by deathride58
July 31, 2024 14:28 44s master
master
July 31, 2024 14:28 44s
Revert some IC balance from Virgo (#6619) Check for merge conflicts #3036: Commit 4fd7e01 pushed by deathride58
July 31, 2024 14:27 51s master
master
July 31, 2024 14:27 51s
mech hydraulic clamps & others now work on fighters on all adjacent t… Check for merge conflicts #3035: Commit e06be8f pushed by deathride58
July 31, 2024 14:11 37s master
master
July 31, 2024 14:11 37s
admin stealth mode now works while deadminned (#6630) Check for merge conflicts #3034: Commit edcd2e5 pushed by deathride58
July 31, 2024 14:10 44s master
master
July 31, 2024 14:10 44s
A Pellet Gun! A Recreational rifle for Civilians. (#6628) Check for merge conflicts #3033: Commit e4e31a0 pushed by silicons
July 28, 2024 18:14 47s master
master
July 28, 2024 18:14 47s
fix hybrid resin doors being invisible (#6631) Check for merge conflicts #3032: Commit 896f75f pushed by silicons
July 28, 2024 18:09 54s master
master
July 28, 2024 18:09 54s
Botany things (#6607) Check for merge conflicts #3031: Commit 13220a4 pushed by silicons
July 28, 2024 18:07 37s master
master
July 28, 2024 18:07 37s
fix long hair alt 3 (#6625) Check for merge conflicts #3030: Commit c4d6bc8 pushed by deathride58
July 28, 2024 17:12 42s master
master
July 28, 2024 17:12 42s
Random Assortment of Atlas Fixes (#6621) Check for merge conflicts #3029: Commit f7e8ca3 pushed by silicons
July 28, 2024 17:09 39s master
master
July 28, 2024 17:09 39s
MC: subsystem time dilation tracking, scheduling tweaks (#6601) Check for merge conflicts #3028: Commit c007c1a pushed by TheLordME
July 28, 2024 16:31 37s master
master
July 28, 2024 16:31 37s
Use Node 20 (#6604) Check for merge conflicts #3027: Commit 8dba008 pushed by silicons
July 28, 2024 15:45 26s master
master
July 28, 2024 15:45 26s
Electronic Clothing now displays on action bar. (#6620) Check for merge conflicts #3026: Commit 4063362 pushed by silicons
July 28, 2024 15:45 41s master
master
July 28, 2024 15:45 41s
Ore Silo door accessible by Science :3 (#6626) Check for merge conflicts #3025: Commit 9ace3f6 pushed by silicons
July 28, 2024 15:44 25s master
master
July 28, 2024 15:44 25s
A variety of circuit fucky wuckys fixes. (#6623) Check for merge conflicts #3024: Commit 90418b2 pushed by silicons
July 28, 2024 15:44 31s master
master
July 28, 2024 15:44 31s
Automatic TGS DMAPI Update (#6622) Check for merge conflicts #3023: Commit 6eea834 pushed by silicons
July 28, 2024 15:44 1m 5s master
master
July 28, 2024 15:44 1m 5s