Erthilo 3312490691 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

2013-05-29 11:22:40 +01:00

..

area

Security wing remap.

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

gamemodes

Allows players to return to lobby if job prefernces unavailable

2013-05-26 18:18:41 -07:00

jobs

Merge with BEF

2013-05-26 19:23:27 -07:00

machinery

Fix for crew monitoring consoles turning spriteless when destroyed.

2013-05-29 13:42:03 +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

Gave nuke agents magboots.

2013-05-28 21:34:26 -07: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

…

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

Airlock and APC changes.

2013-05-23 16:43:29 +02:00

communications.dm

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

2013-05-24 05:23:36 -04:00

dna.dm

Fixes UI being reset randomly on irradiating in Genetic Scanners.

2013-05-25 22:10:14 +01: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

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

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