cib 4d00ed6890 Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/defines/mob/mob.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/humanoid/queen.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	maps/tgstation.2.0.8.dmm

2011-12-10 01:11:00 -08:00

..

ATMOSPHERICS

Changed the prison break event to affect the main brig!

2011-10-21 18:02:46 +00:00

datums

Fixed runtime error involving cyborgs and fibers.

2011-12-10 11:27:48 -05:00

defines

Merge pull request #92 from Abi79/master

2011-12-10 12:54:45 -08:00

FEA

Runtime fix: division by zero

2011-10-04 01:58:47 +00:00

game

Fixed runtime error involving cyborgs and fibers.

2011-12-10 11:27:48 -05:00

js

- Added href getter datum. Returns either what you want or null.

2011-10-11 20:24:14 +00:00

modules

Merge branch 'master' of github.com:Baystation12/Baystation12

2011-12-10 01:11:00 -08:00

unused

Commented out more of the fat code, for issue #71.

2011-12-06 19:23:25 +02:00

WorkInProgress

Added detective stuff - fibers.

2011-12-06 07:12:19 -05:00

names.dm

Did a bit of work on assemblies.

2011-09-09 06:15:38 +00:00

setup.dm

Added a new slurring variable, and set it up in the right places

2011-12-10 14:25:49 +02:00

stylesheet.dm

…