PJB3005 8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

..

beanie.dm

fixing stuff about atom_colours.

2016-10-21 01:30:42 +02:00

collectable.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

hardhat.dm

hey that should be everything except making it compile.

2017-01-17 22:08:27 +01:00

helmet.dm

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

jobs.dm

These things also belong in a museum (#22139)

2016-12-15 13:40:30 +13:00

misc_special.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into borghats

2016-12-16 09:50:10 -06:00

misc.dm

Removes two instances of nonlatin characters in name/desc text (#22659)

2017-01-03 13:52:05 -05:00

soft_caps.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00