Chinsky bb26c5a7cb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm

2013-06-12 23:11:28 +04:00

..

__HELPERS

Runtime fixes, tweaks.

2013-06-04 16:25:41 +04:00

ATMOSPHERICS

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

controllers

Added a configuration option that allows putting the .rsc on external servers.

2013-06-11 21:28:59 +02:00

datums

Added the ability to give traitors all objectives.

2013-06-09 04:47:10 -04:00

defines

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

2013-06-12 11:41:08 -07:00

FEA

…

game

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff

2013-06-12 23:11:28 +04:00

js

…

modules

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff

2013-06-12 23:11:28 +04:00

TriDimension

…

unused

…

WorkInProgress

Fixed a runtime error where one thing would sometimes try to handle an empty list. Some chance that will still make a jungle map fail to work right, though.

2013-06-11 03:18:03 -04:00

ZAS

God, I am not awake.

2013-06-10 19:40:39 -07:00

global.dm

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

hub.dm

…

names.dm

…

setup.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-06-05 18:39:43 -05:00

stylesheet.dm

Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.

2013-06-05 17:35:38 +09:30

world.dm

Commented out end-round noises. Should actually work this time.

2013-05-29 13:44:59 -04:00