skull132 7dc02be204 Merge branch 'master' into development ...

# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm

2017-11-11 20:57:28 +02:00

..

carbonpaper.dm

…

clipboard.dm

More tweaks (#2889)

2017-07-01 23:09:10 +03:00

faxmachine.dm

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

filingcabinet.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

folders.dm

[MAP] Several major remaps, and additions #3 (#3465)

2017-09-20 16:42:02 +02:00

handlabeler.dm

Adds more in hand sprites for certain items (#3392)

2017-09-08 13:14:52 -05:00

paper_bundle.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

paper.dm

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

paperbin.dm

…

papershredder.dm

Bug fixes (#3807)

2017-11-05 16:20:51 +02:00

pen.dm

Implement signatures (#2098)

2017-05-27 12:39:22 +03:00

photocopier.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

photography.dm

…

silicon_photography.dm

Replaces unused span classes (#3539)

2017-10-04 19:23:20 +02:00

stamps.dm

…