mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-03-29 08:26:16 +01:00
# Conflicts: # code/game/machinery/computer/shuttle.dm # code/game/machinery/doors/firedoor.dm # code/game/objects/items/weapons/weaponry.dm # code/modules/admin/admin_attack_log.dm # code/modules/admin/admin_verbs.dm