Ren Erthilo c33a00a1b2 Merge branch 'master' of git://github.com/Baystation12/Baystation12

2012-04-11 20:49:14 +01:00

..

ATMOSPHERICS

Reverts ZAS

2012-04-10 17:38:44 +01:00

datums

Merge pull request #819 from Erthilo/TGUpdates

2012-04-11 11:36:41 -07:00

defines

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

2012-04-11 20:49:14 +01:00

FEA

Reverts ZAS

2012-04-10 17:38:44 +01:00

game

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

2012-04-11 20:49:14 +01:00

js

…

modules

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

2012-04-11 20:49:14 +01:00

unused

TG: Apparently organs are being worked on.

2012-03-26 23:08:29 +01:00

WorkInProgress

Fixed organ based damage. Added a variable to hold the children organs of an organ, to simplify damage spread and droppage. Fixed DNA proc stuff for monkey transforms. Removed Bartender's closet o' armor.

2012-04-10 22:32:24 -07:00

ZAS

Unreverts ZAS fix.

2012-04-11 18:32:32 +01:00

names.dm

…

setup.dm

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

2012-04-11 20:49:14 +01:00

stylesheet.dm

Final commit of the examine/damage overhaul.

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