Mark van Alphen 14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix ...

# Conflicts:
#	code/game/objects/effects/step_triggers.dm

2019-08-09 23:38:49 +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 ruinsport

2019-07-15 20:30:54 +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

…

gun_attachments.dm

…

gun.dm

Refactored pickup code and fixed the bug

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

projectile.dm

Portal fixes - adds oldloc to Crossed()

2019-07-15 20:16:17 +02:00