Leshana 5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26 ...

# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png

2017-05-26 15:29:46 -04:00

..

animate.dm

Added vore capabilies to the new simple_animal system.

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

beams_vr.dm

Adds the 'Hunter' Capture Gun

2017-04-02 19:25:27 -04:00

beams.dm

More toys kikiki

2017-01-25 22:20:52 -06:00

bullets_vr.dm

Properly Done the .357 flash rounds

2017-01-26 15:53:43 -03:00

bullets.dm

Typo fix

2017-05-01 22:43:59 -05:00

change.dm

First commit of manual port of BS12

2016-05-29 00:56:11 +01:00

energy_vr.dm

Security non-lethal balance

2017-02-13 15:49:35 +00:00

energy.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00

force.dm

…

special.dm

Adds Gene Targetting mode to Floral Somatoray

2017-05-03 13:33:58 +01:00