Repede c13f73848c Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	vorestation.dme

2018-02-28 22:06:46 -05:00

..

ammunition

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-01-24 19:52:12 -05:00

guns

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-24 22:51:59 -05:00

projectile

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16

2018-02-17 00:35:29 -05:00

targeting

Can't aim at invisible things

2017-10-23 12:11:11 -05:00

ammunition.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01: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

POLARIS: Fix mode_name on guns always being null

2018-02-22 20:03:54 -05:00

projectile.dm

Test Projectiles can pass through things other projectiles are capable of, and unanchored structures.

2018-02-23 21:27:41 -08:00