mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-30 03:22:41 +00:00
12b25bf487
# Conflicts: # .github/workflows/ci_suite.yml # _maps/skyrat/automapper/templates/metastation/metastation_armory.dmm # _maps/skyrat/lazy_templates/reebe.dmm # code/datums/quirks/negative_quirks/negative_quirks.dm # code/datums/quirks/neutral_quirks/neutral_quirks.dm # code/game/objects/items/robot/robot_upgrades.dm # code/modules/mining/equipment/kinetic_crusher.dm # code/modules/surgery/revival.dm # code/modules/uplink/uplink_items/device_tools.dm # modular_skyrat/modules/company_imports/code/armament_datums/bolt_nanotrasen_firearms.dm # modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm # modular_skyrat/modules/company_imports/code/armament_datums/nri_military_surplus.dm # modular_skyrat/modules/company_imports/code/armament_datums/put_a_donk_on_it.dm # modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm # modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm # modular_skyrat/modules/player_ranks/code/subsystem/player_ranks.dm