Mark van Alphen 09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm

2019-04-18 03:15:52 +02:00

..

ammunition

Added Syndicate base and ported over turf decals

2019-03-31 20:26:02 +02:00

guns

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-04-04 22:04:55 +02:00

projectile

plasma cutter changes

2019-04-05 18:56:20 +01:00

ammunition.dm

Refactors reloading and adds new gun sounds to ballistics

2018-12-02 03:20:05 -05:00

firing.dm

Fixes the point blank shooting not working on tiles with multiple people

2018-09-28 12:51:28 +02:00

gun_attachments.dm

Moved silencers, gave them their own folder

2018-11-19 09:52:25 +01:00

gun.dm

Refactored pickup code and fixed the bug

2019-03-18 16:42:44 +01:00

projectile.dm

Merge pull request #10283 from Ty-Omaha/reflector-blob

2018-11-24 08:28:37 +08:00