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

# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt

2017-10-29 18:14:56 -04:00

..

ammunition

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

2017-10-29 18:14:56 -04:00

guns

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

2017-10-29 18:14:56 -04:00

projectile

Polaris sync

2017-10-27 15:30:24 -04: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 sync

2017-10-27 15:30:24 -04:00

projectile.dm

Incendiary >= 2 projectile fixes. (#4127)

2017-10-22 00:26:33 -05:00