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

2012-04-07 22:29:13 +01:00

..

ATMOSPHERICS

more pipe stuff

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

datums

Merge pull request #796 from SkyMarshal/Airlocks

2012-04-06 09:59:14 -07:00

defines

Adds a variety of cool belt bags. Fixes chemist jumpsuit world icon.

2012-04-07 19:46:49 +01:00

FEA

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

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

game

Adds objects: office chairs, feathery pen, glass and normal research airlocks, showers, styrofoam cups. Adds clothes: Fez, cheerleader outfits, captain mal uniform, hazmat suits, wedding dress, AI bliss icon. New icons for captain, head of security, security, and warden's lockers.

2012-04-07 09:58:54 +01:00

js

…

modules

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

2012-04-07 22:29:13 +01:00

unused

TG: Apparently organs are being worked on.

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

WorkInProgress

Merge pull request #796 from SkyMarshal/Airlocks

2012-04-06 09:59:14 -07: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