Mloc-Argent 65f218ee63 Merge branch 'master' into dev-freeze ...

Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

2013-10-08 22:01:16 +01:00

..

devices

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00

robot

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00

stacks

Fixes for stacks.

2013-09-19 08:34:38 +03:00

weapons

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00

apc_frame.dm

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

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

blueprints.dm

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

bodybag.dm

Pull damage, with harsher damage in crit. Soft crit now at 0 health, you no longer suffocate in softcrit. Being between 0 to -50 health will cause you to go into shock. Below that you pass out and stop breathing. Stasis bags clone damage reduced to stop people dieing in them so much.

2013-08-28 17:38:21 +01:00

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

contraband.dm

Added missing contraband.dm file

2013-01-03 08:20:08 +04:00

crayons.dm

More file structure stuff.

2012-08-26 01:20:02 +00:00

latexballoon.dm

More file structure stuff!

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

shooting_range.dm

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

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

tk_grab.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-06-04 13:47:26 +04:00

toys.dm

Purging the toddler as Lord Mloc commands.

2013-07-13 04:34:09 -07:00

trash.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00