Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 ...

# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm

2018-04-15 14:19:36 -04: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

…

clothing.dm

…

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

Constructs 2.0 - Living Stone (#5040)

2018-04-04 23:45:00 -07:00

technomancer.dm

…