mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-25 08:51:41 +00:00
* lawsets update * Revert "lawsets update" This reverts commita68ddcb9ee. * Lawsets update * Remove quotes on ai module names * fix map file * Fix coding style * Update hippocratic per review Co-authored-by: Sean Williams <06sean@gmail.com> * Update hippocratic per review Co-authored-by: Sean Williams <06sean@gmail.com> * Update hippocratic per review Co-authored-by: Sean Williams <06sean@gmail.com> * Fix merge conflict * Update code/game/objects/items/weapons/AI_modules.dm Co-authored-by: dearmochi <shenesis@gmail.com> * Add a pilot seat to the ERT shuttle * Revert "Add a pilot seat to the ERT shuttle" This reverts commit676bfa7d03. * Update MetaStation.dmm * deconflict * Update code/game/objects/items/weapons/AI_modules.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: Sean Williams <06sean@gmail.com> Co-authored-by: dearmochi <shenesis@gmail.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>