Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

2017-05-16 00:26:32 -04:00

..

ammunition

Adds hollowpoint rounds, for bears and such

2017-04-03 18:27:19 -05:00

guns

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

projectile

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

targeting

Aiming at someone is now logged

2017-04-14 03:40:03 -04:00

ammunition.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

dnalocking.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

effects.dm

Tweaks the Vox weapons

2017-04-01 22:41:46 -05:00

gun.dm

Merge pull request #3377 from LorenLuke/PointBlankAim

2017-04-29 10:42:22 -05:00

projectile.dm

Makes Technomancer use modifiers, fixes a few bugs

2017-04-28 16:27:51 -04:00