mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-28 03:01:37 +00:00
49b26c4eba
* Reworks and nerfs WTs * Removes some duplicate comments * Makes WT ammo box's normal sized items because I forgot to at first * Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once * Sanity checks work properly now * Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt * Update code/__HELPERS/mob_helpers.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/__HELPERS/mob_helpers.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Magazines fit in security webbings * I forgot a comma * Apply suggestions from code review Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Applying various reviewer suggestions * Applies various suggestions * removes moving_do_after now that its a param * Apply suggestions from code review Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * solves the merge conflict hopefully * step one of trying to fix conflict again * step two hopefully fixes conflict * Delete ammo.dmi * Merge branch 'master' into wt-rework * Apply suggestions from code review Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Applying various reviewer suggestions * Revert "Applying various reviewer suggestions" This reverts commit7081e9aa2b. * Revert "Apply suggestions from code review" This reverts commit96dab4f8b8. * Revert "Merge branch 'master' into wt-rework" This reverts commit6906a67654. * Merge branch 'master' into wt-rework * please god work * Update code/modules/projectiles/ammunition.dm * Update code/modules/projectiles/ammunition/magazines.dm --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Co-authored-by: Farie82 <farie82@users.noreply.github.com>