Cael_Aislinn f7fcfa2a6f Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649) ...

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

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

2012-09-08 14:22:44 +10:00

..

grenades

-Added maintenance cameras. These are cameras which are located in maintenance, not only that but they have a 66% chance of not spawning. Leading to random blind spots in maintenance.

2012-09-07 09:33:10 +00:00

implants

Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

2012-08-24 21:55:58 +10:00

secstorage

Merge tgstation13 r4570 into bs12_with_tgport

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

storage

Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)

2012-09-04 22:23:50 +10:00

tanks

Single tank bombs.

2012-09-07 13:39:13 +00:00

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

Bedsheets.dm

More file structure stuff!

2012-08-26 03:32:58 +00:00

cards_ids.dm

File structure again.

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

cigs_lighters.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

clown_items.dm

File structure again.

2012-08-26 05:20:27 +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

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

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

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

extinguisher.dm

Changed the AI's intercoms around a bit.

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

flamethrower.dm

File structure again.

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

game_kit.dm

…

gift_wrappaper.dm

Merge tgstation13 r4570 into bs12_with_tgport

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

handcuffs.dm

More file structure stuff!

2012-08-26 03:32:58 +00:00

hydroponics.dm

Added an attack sound to:

2012-08-29 16:04:23 +00:00

kitchen.dm

Added an attack sound to:

2012-08-29 16:04:23 +00: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

Standardised reagent colour mixing a little bit. Fixes issue 785.

2012-08-16 18:33:34 +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

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

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

More file structure stuff!

2012-08-26 03:32:58 +00:00

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

surgery_limbattachment.dm

Partially fixed the double definition of BROKEN, renamed organ definitions

2012-07-13 23:42:05 +03:00

surgery_tools.dm

File structure again.

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

swords_axes_etc.dm

File structure again.

2012-08-26 05:20:27 +00: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

File structure again.

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

teleportation.dm

Merge tgstation13 r4570 into bs12_with_tgport

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

tools.dm

File structure again.

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

trashbag.dm

More file structure stuff!

2012-08-26 03:32:58 +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