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

..

computer

Updates Tools

2017-08-03 04:49:23 -04:00

machinery

Prepare Atmospherics Machinery for SSatoms (#4501)

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

broken.dm

…

circuitboard.dm

Adds hand sprites to many items in the engineering department

2017-03-29 04:09:33 +01:00

circuitboards_vr.dm

Adds plasma research outpost.

2017-09-29 02:28:43 -04:00

frame.dm

Fixes 'reques console'

2017-11-22 18:25:49 -05:00

mecha.dm

Adds hand sprites to many items in the engineering department

2017-03-29 04:09:33 +01:00

other.dm

Construction Update

2016-03-25 16:02:36 -04:00