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

..

collectable.dm

More attempts at string limit string reduction.

2013-08-31 20:13:03 +01:00

hardhat.dm

Refactors code to work with BYOND 500.

2013-09-22 12:39:48 +01:00

helmet.dm

New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations.

2013-06-04 22:41:23 -05:00

jobs.dm

Praying this works

2013-08-13 18:57:08 -04:00

misc_special.dm

Refactors code to work with BYOND 500.

2013-09-22 12:39:48 +01:00

misc.dm

New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations.

2013-06-04 22:41:23 -05:00

soft_caps.dm

Refactors code to work with BYOND 500.

2013-09-22 12:39:48 +01:00