Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 ...

# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#

2018-01-09 14:40:09 -05:00

..

antagonist

Removes the mosin-nagant, moves the sprites

2017-11-22 01:14:14 -06:00

area

Redoes the small cruiser

2018-01-02 03:17:48 -05:00

dna

Allows xenochimeras to choose icon base

2017-12-02 16:04:20 -05:00

gamemodes

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

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

jobs

Readd clown/mime job constants

2017-12-26 23:35:50 -05:00

machinery

Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09

2018-01-09 14:40:09 -05:00

magic

…

mecha

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

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

objects

Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09

2018-01-09 14:40:09 -05:00

turfs

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

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

vehicles

…

verbs

Polaris sync

2017-11-17 19:27:03 -05:00

atoms_movable.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob

2017-11-29 22:43:05 -05:00

atoms.dm

Prepare Atmospherics Machinery for SSatoms (#4501)

2018-01-06 10:52:56 -06:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Polaris sync

2017-11-17 19:27:03 -05:00

supplyshuttle.dm

Added supply shuttle export reports

2018-01-08 20:28:47 -05:00

trader_visit.dm

…