PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/cult/runes.dm

2015-04-08 10:40:38 +02:00

..

carbonpaper.dm

disregard failure. I made a silly.

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

clipboard.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

faxmachine.dm

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

2014-11-20 14:57:35 -05:00

filingcabinet.dm

Fixes medical record cabinet runtime

2015-03-09 03:18:38 -04:00

folders.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

handlabeler.dm

Added labelling for hydro trays.

2015-02-04 10:54:18 +10:30

paper_bundle.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

paper.dm

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

2015-04-08 10:40:38 +02:00

paperbin.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

pen.dm

Lightly boosts the clerical kit.

2015-02-10 20:12:32 +01:00

photocopier.dm

Fixes photocopier runtime

2015-03-09 12:12:31 -04:00

photography.dm

Fixes #8322.

2015-03-01 15:21:15 +01:00

silicon_photography.dm

Fixes #7366.

2014-12-10 21:54:57 +01:00

stamps.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00