mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-26 17:11:52 +00:00
Conflicts: _maps/map_files/tgstation.2.1.2.dmm (The map was deleted) code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison. Went with my solution.)