Ravensdale 68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron ...

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-16 21:44:26 -07:00

..

carbonpaper.dm

disregard failure. I made a silly.

2014-04-06 18:29:50 -07:00

clipboard.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

filingcabinet.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

folders.dm

EMERGENCY HREF exploit fix.

2013-12-07 21:26:37 +00:00

handlabeler.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

paper.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 21:44:26 -07:00

paperbin.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into papers

2014-04-05 16:24:56 -07:00

pen.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

photocopier.dm

initial CC paper commit. Will continue work on this.

2014-03-30 16:41:06 -07:00

photography.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

stamps.dm

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00