Leshana 7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 ...

# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme

2018-02-17 00:35:29 -05:00

..

aura

Pol sync part 2

2017-10-27 15:30:51 -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

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

projectile

Polaris sync

2017-08-06 19:07:17 -04:00

spawner

Web Shuttle Update

2018-01-14 14:03:58 -05: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

Weapon sound improvements from TG, take 2 (#3772)

2017-09-09 15:40:26 -04:00

blink.dm

work

2017-11-26 12:08:05 -05:00

chroma.dm

September Polaris Sync (#545)

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

condensation.dm

Adds the enchancement_desc

2017-09-20 13:10:06 -05:00

control.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16

2018-02-17 00:35:29 -05:00

dispel.dm

More Technomancer

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

energy_siphon.dm

Technomancer Golem Tweaks & Simple Animal Health "Refactor"

2017-09-30 22:24:42 -04:00

flame_tongue.dm

Additional types which need Destroy to return qdel hints (and other Destroy fixes)

2017-12-30 16:02:27 -05:00

gambit.dm

More Technomancer

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

illusion.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

instability_tap.dm

More Technomancer

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

mark_recall.dm

work

2017-11-26 12:08:05 -05:00

mend_organs.dm

More Technomancer

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

oxygenate.dm

Adds more technomancer icons

2017-07-26 17:07:19 -05:00

passwall.dm

work

2017-11-26 12:08:05 -05:00

phase_shift.dm

Additional types which need Destroy to return qdel hints (and other Destroy fixes)

2017-12-30 16:02:27 -05:00

radiance.dm

Additional types which need Destroy to return qdel hints (and other Destroy fixes)

2017-12-30 16:02:27 -05:00

reflect.dm

Technomancer Golem Tweaks & Simple Animal Health "Refactor"

2017-09-30 22:24:42 -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

Technomancer Golem Tweaks & Simple Animal Health "Refactor"

2017-09-30 22:24:42 -04:00

targeting_matrix.dm

Late September Sync (#579)

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

track.dm

Technomancer Golem Tweaks & Simple Animal Health "Refactor"

2017-09-30 22:24:42 -04:00

warp_strike.dm

Removes the datum pool, as it is not performant.

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