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

..

aura

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

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

insert

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

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

modifier

More Technomancer

2017-05-05 19:02:48 -04:00

projectile

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

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

spawner

More Technomancer

2017-05-05 19:02:48 -04:00

summon

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

abjuration.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

apportation.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

aspect_aura.dm

Polaris Sync October 9th (#633)

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

audible_deception.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

blink.dm

Technomancer changes

2016-11-17 20:11:21 -06:00

chroma.dm

September Polaris Sync (#545)

2016-09-11 19:52:40 -04:00

condensation.dm

Removes the datum pool, as it is not performant.

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

control.dm

Added vore capabilies to the new simple_animal system.

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

dispel.dm

More Technomancer

2017-05-05 19:02:48 -04:00

energy_siphon.dm

Lightning spells and bioelectrogenesis will no longer stun outright

2016-11-15 21:49:06 -06:00

flame_tongue.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

gambit.dm

More Technomancer

2017-05-05 19:02:48 -04:00

illusion.dm

Makes Technomancer use modifiers, fixes a few bugs

2017-04-28 16:27:51 -04:00

instability_tap.dm

More Technomancer

2017-05-05 19:02:48 -04:00

mark_recall.dm

Polaris Sync October 9th (#633)

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

mend_organs.dm

More Technomancer

2017-05-05 19:02:48 -04:00

oxygenate.dm

More Technomancer

2017-05-05 19:02:48 -04:00

passwall.dm

Removes the datum pool, as it is not performant.

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

phase_shift.dm

Technomancer changes

2016-11-17 20:11:21 -06:00

radiance.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

reflect.dm

Removes the datum pool, as it is not performant.

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

resurrect.dm

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

shared_burden.dm

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

shield.dm

Merge pull request #3421 from Neerti/5/5/2017_technomancer_changes

2017-05-09 17:54:53 -05:00

targeting_matrix.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

track.dm

Fixes Track spell

2016-10-13 18:27:28 -05:00

warp_strike.dm

Removes the datum pool, as it is not performant.

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