Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 ...

# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme

2018-01-04 22:44:04 -05:00

..

autolathe

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

helper_datums

Polaris sync

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

locations

…

observation

Adds Multi-Z Test Map

2017-03-03 09:40:34 -05:00

outfits

Polaris sync

2017-12-21 04:01:07 -05:00

repositories

Fix runtimes in radiation controller

2017-06-11 20:50:13 -04:00

supplypacks

Update contraband.dm

2017-12-23 15:54:15 -05:00

underwear

Adds a tiedye shirt.

2017-08-23 03:38:48 -04:00

uplink

Makes Syndie Toolboxes Special Again

2017-11-18 08:06:38 -05:00

vending

Vending machines now correctly throw products

2016-12-17 03:30:14 -05:00

wires

Works on New Blob

2017-11-29 22:35:01 -05:00

ai_law_sets.dm

Adds Mining Drones and a fabricator for them. Hooray amending commits, also. (#4413)

2017-12-07 17:32:26 -06:00

ai_laws.dm

…

browser.dm

…

category.dm

…

computerfiles.dm

…

datacore.dm

Brain type is shown on all records

2017-04-22 18:18:31 -07:00

datum.dm

Transformed the machinery processor into an StonedMC subsystem

2017-12-29 15:31:59 -05:00

EPv2.dm

Adds Telecomms Logging to EPv2

2017-01-07 13:21:03 -05:00

ghost_query.dm

Works on New Blob

2017-11-29 22:35:01 -05:00

hierarchy.dm

…

mind.dm

Adds a Trait system (#4048)

2017-10-13 01:17:39 -05:00

mixed.dm

Fixes players not being removed from the manifest immediately when cryoing.

2017-06-15 17:19:52 -04:00

modules.dm

…

mutable_appearance.dm

Works on New Blob

2017-11-29 22:35:01 -05:00

organs.dm

…

progressbar.dm

…

recipe.dm

…

sun.dm

…

weakref.dm

Unify datum var definitions

2017-12-29 14:23:13 -05:00