Leshana 6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync ...

# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme

2017-04-01 19:19:42 -04:00

..

ammunition

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

guns

Polaris Merge Sync

2017-03-26 20:12:34 -04:00

projectile

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

targeting

Lock-on time is now 2.5 seconds.

2017-02-11 20:05:22 -06: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

Fixes a few more Vox Toy things

2017-01-26 16:25:28 -06:00

gun.dm

Device Cell QOL

2017-03-29 13:58:35 -05:00

projectile.dm

Implements the vacuum traversal part of the plasmastun

2017-01-15 17:42:05 -06:00