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

Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-03-06 19:03:18 +10:00

..

area

some new [old] sound effects, turrets make ambient noise occasionally, bit more roundstart music, some more ambient music for areas

2013-02-23 21:48:48 +10:00

gamemodes

removed double announcement for grid checks

2013-03-06 01:31:40 +10:00

jobs

Added extra safety check.

2013-02-27 02:48:49 +01:00

machinery

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

2013-03-06 19:03:18 +10:00

magic

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

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

mecha

Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain.

2013-02-25 19:48:00 -08:00

objects

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

2013-03-06 19:03:18 +10: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

made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM

2013-02-22 20:00:05 +10:00

vehicles

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

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

verbs

fixed ooc runtime, removed random space in adminpms, removed forced disabling of stat tracking >.>

2013-02-25 13:45:13 +10: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 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10: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 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10: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

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

shuttle_engines.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

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

Fixed a compile error.

2012-06-22 14:11:18 -07:00

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