Ren Erthilo ebebfaabb3 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/modules/mob/mob_defines.dm

2012-04-04 20:19:23 +01:00

..

blob

Some merge fixes, changed Malf laws to regular AI ones, changes for the AI and Cyborgs hints, and an actual fix for implanting rev heads.

2012-03-28 03:45:36 +01:00

carbon

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

2012-04-04 20:19:23 +01:00

silicon

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

2012-04-04 20:19:23 +01:00

damage_procs.dm

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

2012-04-04 20:19:23 +01:00

living_defense.dm

Final commit of the examine/damage overhaul.

2012-03-29 20:44:10 -07:00

living.dm

Merging SkyMarshal's stuff.

2012-03-30 16:26:04 +01:00

say.dm

TG: brainloss is now only referenced via procs. r2874

2012-03-26 23:20:45 +01:00