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

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

2013-05-22 21:35:50 +04:00

..

area

Security wing remap.

2013-05-10 16:05:23 +04:00

gamemodes

Merge branch 'master' into bleeding-edge-freeze

2013-05-22 16:51:41 +04:00

jobs

NOW IT COMPILES.

2013-05-21 18:08:28 +04:00

machinery

Small fixes, updated changelog.

2013-05-21 23:12:47 -07:00

magic

Non-animated runes aren't being cached, probably a bug.

2013-02-19 23:40:06 -05:00

mecha

fixed #2737

2013-05-08 15:13:28 +04:00

objects

Renamed bruise pack back to gauze.

2013-05-22 14:05:53 +04:00

structure

cleaned up a bunch of away missions, made only the peaceful-ish ones spawn, added my jungle map and susu's research labs map

2013-01-11 14:52:43 +10:00

turfs

Added wallrot event.

2013-05-18 21:55:02 +02:00

vehicles

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

verbs

Removed non-antag chars suicide verb.

2013-03-11 00:38:40 +04:00

asteroid.dm

Removed the old style asteroid turfs.

2012-11-18 14:01:01 +00:00

atoms_movable.dm

Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up.

2013-01-20 10:45:20 +00:00

atoms.dm

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

2013-01-31 14:26:58 -08:00

communications.dm

You can now make a single camera use multiple networks.

2013-01-22 01:24:09 +00:00

dna.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

hud.dm

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

2013-01-31 14:26:58 -08:00

json.dm

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

- Fixes issue 985. false walls are now called 'wall' instead of 'falsewall', which made them obvious.

2012-10-02 21:40:36 +00:00

socket_talk.dm

…

sound.dm

compile fixes and cleanup

2013-01-07 02:36:52 +10:00

supplyshuttle.dm

added "back" button to go back to last viewed menu for cargo bay computers

2013-03-06 18:45:38 +10:00