Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 ...

# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

2018-02-23 21:55:42 -05:00

..

assistance

Slimes should no longer /list you.

2018-02-20 01:58:49 -06:00

devices

Fixes 'varient'

2018-01-08 16:42:20 -05:00

spells

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

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

catalog.dm

Technomancer changes

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

clothing.dm

Late September Sync (#579)

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

core_obj.dm

Tweaks instability

2017-09-11 11:46:35 -04:00

equipment.dm

Makes Technomancer use modifiers, fixes a few bugs

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

instability.dm

Fixes Borg Lighting Conflicts

2017-09-15 21:21:27 -04:00

presets.dm

…

spell_objs_helpers.dm

work

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

spell_objs.dm

Fixes some goofs

2018-02-17 01:19:57 -06:00

technomancer.dm

Polaris Sync October 9th (#633)

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