* Replaced body zone magic strings with defines * merge conflicts
* The names of Surgery Disks now match their type of surgery * Merge pull request #36407 from SailorDave/surgery-disk-names The names of Surgery Disks now match their type of surgery
* Extensive surgery additions * Update role_preferences.dm * Update surgery_step.dm