Chinsky 3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev ...

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm

2014-10-20 04:52:45 +04:00

..

blob

…

carbon

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

2014-10-20 04:52:45 +04:00

silicon

Merge pull request #6790 from mwerezak/robot-radio

2014-10-20 03:53:10 +04:00

simple_animal

Fixes #6732

2014-10-16 13:48:26 +10:30

damage_procs.dm

Fixes human armor value for full body effects not being weighted by body part

2014-08-22 01:12:07 -04:00

living_defense.dm

Fixes #6119

2014-09-01 22:41:15 +09:30

living_defines.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

living_powers.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

living.dm

Bunch of xeno fixes, details in PR.

2014-10-13 17:32:13 +10:30

login.dm

…

logout.dm

…

say.dm

Allows properly keyed headsets to broadcast in robot talk and/or hivemind

2014-10-01 21:39:02 -04:00