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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	config/custom_items.txt

2016-12-07 12:22:48 -05:00

..

ammunition

Polaris Sync October 9th (#633)

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

guns

Nerfed hyperzine, added more languages to borgs understanding, boosted the ERT borg's gun, added new dogborg, fixed xenomaid borg so it is selectable, other..

2016-11-27 17:33:53 -05:00

projectile

Makes disabler 1 shot stun

2016-11-28 14:18:06 -05:00

targeting

Fixes #1655

2016-05-24 12:12:26 -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

Polaris Sync October 9th (#633)

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

gun.dm

Polaris Sync October 9th (#633)

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

projectile.dm

Changes the way embedding works

2016-10-11 21:29:49 -05:00