Cael_Aislinn 7f05c6fdb3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

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

2013-01-23 01:02:27 +10:00

..

grenades

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

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

implants

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

melee

Grammar fixes for item-suicides.

2013-01-17 02:52:57 +00:00

storage

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

tanks

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

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

AI_modules.dm

Issue #1818 - Freeform Module broken again

2012-11-10 16:53:39 +00:00

cards_ids.dm

money! re-added atms, created account system / accounts database, whole bunch of options for moving money around, some tweaks to spacecash and icons

2013-01-22 17:56:34 +10:00

cigs_lighters.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

clown_items.dm

…

cosmetics.dm

…

dice.dm

You can carve out books with a pair of wirecutters or a kitchen knife to create a handy hiding place.

2012-11-15 20:15:49 +00:00

dna_injector.dm

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

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

explosives.dm

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

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

extinguisher.dm

…

flamethrower.dm

- Changed the min/max damage of plasma to be less deadly.

2013-01-21 03:42:21 +00:00

game_kit.dm

…

gift_wrappaper.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

handcuffs.dm

Another whack at the defines folder:

2013-01-01 01:25:02 +00:00

hydroponics.dm

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

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

kitchen.dm

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

2013-01-23 00:48:07 +10:00

manuals.dm

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

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

mop.dm

…

paint.dm

…

paiwire.dm

…

power_cells.dm

Grammar fixes for item-suicides.

2013-01-17 02:52:57 +00:00

RCD.dm

Another whack at the defines folder:

2013-01-01 01:25:02 +00:00

RSF.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

scrolls.dm

Some improvement to the teleport scroll and spell code. It unbuckles the user now.

2013-01-17 06:22:29 +00:00

shields.dm

Another whack at the defines folder:

2013-01-01 01:25:02 +00:00

stunbaton.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

surgery_limbattachment.dm

Ported limb selection.

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

surgery_tools.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

swords_axes_etc.dm

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

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

syndie.dm

…

table_rack_parts.dm

Fixes issue 954.

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

teleportation.dm

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

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

tools.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

twohanded.dm

…

weaponry.dm

Grammar fixes for item-suicides.

2013-01-17 02:52:57 +00:00

wires.dm

…