LordFowl 471ef657d5 Merge branch 'Aurorastation/development' into Map-Development ...

# Conflicts:
#	code/TriDimension/controller_presets.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/game/objects/structures/signs.dm
#	code/game/turfs/simulated/floor_types.dm
#	code/modules/random_map/mining_distribution.dm
#	code/modules/random_map/random_map.dm
#	code/world.dm
#	icons/obj/barsigns.dmi
#	icons/obj/decals.dmi
#	icons/obj/plants.dmi
#	icons/obj/structures.dmi
#	icons/turf/floors.dmi
#	icons/turf/wall_masks.dmi
#	maps/exodus-2.dmm

2017-01-27 01:57:29 -05:00

..

__defines

Computer manager and more (#1406)

2017-01-20 21:45:53 +02:00

__HELPERS

MISTAKE

2016-11-11 22:10:35 +00:00

_helpers

Adv. Scanner Tweaks & General Fixes (#1573)

2017-01-15 21:37:44 +02:00

_onclick

Gripper, Nymph and Mob size fixes (#1575)

2017-01-15 20:56:15 +02:00

ATMOSPHERICS

Fixes #1564, #1330, #1434 and #1210 (#1621)

2017-01-21 22:53:58 +02:00

controllers

Merge branch 'Aurorastation/development' into Map-Development

2017-01-27 01:57:29 -05:00

datums

Event tweaks, misc changes and fixes pack (#1588)

2017-01-20 19:23:04 +02:00

defines

Merge branch 'Aurorastation/development' into Map-Development

2017-01-27 01:57:29 -05:00

game

Merge branch 'Aurorastation/development' into Map-Development

2017-01-27 01:57:29 -05:00

js

…

modules

Merge branch 'Aurorastation/development' into Map-Development

2017-01-27 01:57:29 -05:00

unit_tests

Vaurca Update Dec2016 (#1289)

2016-12-25 01:11:09 +02:00

ZAS

Merge branch 'Aurorastation/development' into Map-Development

2017-01-27 01:57:29 -05:00

_macros.dm

Computer manager and more (#1406)

2017-01-20 21:45:53 +02:00

global.dm

Adv. Scanner Tweaks & General Fixes (#1573)

2017-01-15 21:37:44 +02:00

hub.dm

…

names.dm

…

stylesheet.dm

Unathi alt language and more fixes (#1299)

2016-12-25 20:51:15 +02:00

world.dm

Re-order world.reboot operations (#1463)

2017-01-08 14:37:10 +02:00