PsiOmega 3e9f33136a Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm

2015-03-05 09:20:20 +01:00

..

Cleanable

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-05 09:20:20 +01:00

posters

Poster fixes

2014-12-07 22:30:08 -05:00

cleanable.dm

Bugfix: Actually implement cleanbot targeting.

2013-12-30 21:59:20 -06:00

contraband.dm

Fixes #7598

2015-01-01 15:43:28 -05:00

crayon.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

misc.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

remains.dm

Added plant controller.

2015-02-05 15:53:20 +10:30

warning_stripes.dm

…