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

Conflicts:
	code/modules/mob/mob_defines.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/storage.dmi
	maps/tgstation.2.0.8.dmm

2012-04-02 00:37:54 +01:00

..

ATMOSPHERICS

more pipe stuff

2012-03-22 02:33:24 -04:00

datums

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

2012-04-02 00:37:54 +01:00

defines

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

2012-04-02 00:37:54 +01:00

FEA

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

2012-03-30 06:18:37 +01:00

game

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

2012-04-02 00:37:54 +01:00

js

…

modules

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

2012-04-02 00:37:54 +01:00

unused

TG: Apparently organs are being worked on.

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

WorkInProgress

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

2012-04-02 00:37:54 +01:00

ZAS

Fixed a runtime error related to the group_multiplier of an air mixture being 0

2012-03-29 23:45:48 +03:00

names.dm

…

setup.dm

Merged in Erthilo's stuff.

2012-03-29 21:11:17 -07:00

stylesheet.dm

Final commit of the examine/damage overhaul.

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