Cael_Aislinn 01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

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

2012-10-21 01:25:04 +10:00

..

grenades

Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands.

2012-09-24 17:56:49 +01:00

implants

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

secstorage

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

storage

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-10-21 01:25:04 +10:00

tanks

fix for internals spawning empty

2012-09-22 22:46:02 +10:00

AI_modules.dm

Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport

2012-10-09 23:07:41 +10:00

cards_ids.dm

File structure again.

2012-08-26 05:20:27 +00:00

cigs_lighters.dm

God dammit, fix.

2012-10-15 16:48:13 +04:00

clown_items.dm

File structure again.

2012-08-26 05:20:27 +00:00

cosmetics.dm

Fixes issue 955. (Signalers don't update bomb overlays)

2012-09-23 15:31:01 +00:00

dice.dm

Some assembly fixes and tidying up. Plus, improved infrared emitters, with new sprites by Pewtershmitz!

2012-08-26 22:44:04 +00:00

dna_injector.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

explosives.dm

Fixed runtime in C4 code

2012-10-19 14:31:54 +04:00

extinguisher.dm

Changed the AI's intercoms around a bit.

2012-08-26 04:16:37 +00:00

flamethrower.dm

Fixes issue 921.

2012-09-16 01:48:57 +00:00

game_kit.dm

…

gift_wrappaper.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

handcuffs.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

hydroponics.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

kitchen.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

manuals.dm

Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

2012-08-23 16:20:40 +01:00

mop.dm

Fixes issue 950. (tele-mopping of floors)

2012-09-23 14:14:22 +00:00

mousetraps.dm

Another small chunk of reorganizing objects.

2012-08-22 21:55:46 +00:00

paint.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

paiwire.dm

…

photography.dm

File structure again.

2012-08-26 05:20:27 +00:00

RCD.dm

The RCD code is less ugly now.

2012-10-02 00:35:00 +00:00

RSF.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

scrolls.dm

The wizard's teleport scroll now only works if the wizard actually has it. Fixes issue 997.

2012-10-11 23:07:34 +00:00

stunbaton.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

surgery_limbattachment.dm

Ported limb selection.

2012-10-17 20:08:34 +02:00

surgery_tools.dm

Commiting for the night, in case KGB steals my laptop.

2012-10-14 02:15:23 +04:00

swords_axes_etc.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

syndie.dm

Anti-meta update. Renames and re-icons a bunch of syndicate items to reduce meta from names and examine messages.

2012-06-07 19:54:37 +01:00

table_rack_parts.dm

Fixes issue 954.

2012-10-05 21:17:04 +00:00

teleportation.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

tools.dm

Buffed fuel tank explosions.

2012-10-18 15:40:55 +04:00

trashbag.dm

Updated trashbag code a teeny tiny bit. Mostly just changing it to use proper text styles.

2012-10-14 02:01:54 +00:00

twohanded.dm

File structure again.

2012-08-26 05:20:27 +00:00

wires.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00