PsiOmega 0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	.travis.yml

2015-09-13 10:52:01 +02:00

..

bar.dm

Makes beer and ale bottles into actual bottles, adjusts bottle smashing

2015-08-13 18:37:13 -04:00

cargo.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

engineering.dm

Accessories update.

2015-02-08 12:35:50 +03:00

freezer.dm

Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.

2015-04-06 18:40:11 -04:00

guncabinet.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

hydroponics.dm

Converted over hatchets and scythes.

2015-05-17 00:15:46 +09:30

medical.dm

Cleans up access and map artifacts

2015-05-15 15:36:48 +02:00

personal.dm

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

2015-09-13 10:44:06 +02:00

scientist.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

secure_closets.dm

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

2015-09-13 10:44:06 +02:00

security.dm

Resprites, renames, and repaths the detective uniforms.

2015-08-22 19:43:28 -05:00