Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

__HELPERS

Merge pull request #3599 from Erthilo/master

2013-08-28 05:37:01 -07:00

ATMOSPHERICS

Colouring tempfix.

2013-08-15 10:29:29 +03:00

controllers

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

datums

Added two ears back.

2013-08-27 22:05:27 +01:00

defines

Added a knife harness/duelling knives.

2013-08-08 20:48:54 -07:00

FEA

…

game

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

2013-08-31 17:45:31 +01:00

js

…

modules

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

2013-08-31 17:45:31 +01:00

TriDimension

…

unused

These files have been collapsed into root procs and can be deleted.

2013-08-16 17:48:25 -07:00

WorkInProgress

Added a fax machine to send messages to centcom with.

2013-08-18 14:39:08 -04:00

ZAS

made zburn/firelevel more predictable. Probably won't change much ingame, but it's a start.

2013-08-29 22:06:27 +01:00

global.dm

Nano UI Framework

2013-08-19 22:52:23 +01:00

hub.dm

…

names.dm

…

setup.dm

Added two ears back.

2013-08-27 22:05:27 +01:00

stylesheet.dm

…

world.dm

Made IRCbot's password and host a config option.

2013-08-05 14:07:06 +01:00