skull132 d536d9f4aa Merge branch 'fake-master' into development ...

# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm

2017-12-09 00:08:21 +02:00

..

obj

Little is know of its purpose (#3754)

2017-10-27 18:18:31 +03:00

procs

Merge branch 'fake-master' into development

2017-12-09 00:08:21 +02:00

gases.dm

makes N2O an oxidizer. (#3569)

2017-10-07 12:42:49 +02:00

obj.dm

clean up some legacy code (#3211)

2017-08-02 19:53:23 +03:00