Giacomand 44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff ...

Resolved Conflicts:
	code/modules/projectiles/projectile.dm

2013-12-18 18:27:22 +00:00

..

clipboard.dm

* Adds checks in the paperwork module topics. Fixing the exploit that would allow you to teleport anything.

2013-07-31 15:41:27 +01:00

filingcabinet.dm

Adds telekinesis to click code. Fixes issue #1202, #1129, #247.

2013-09-17 18:19:09 -04:00

folders.dm

* Adds checks in the paperwork module topics. Fixing the exploit that would allow you to teleport anything.

2013-07-31 15:41:27 +01:00

handlabeler.dm

Bugfixen and minor changes. Fixes #136.

2013-09-17 18:19:14 -04:00

paper.dm

Map Update

2013-06-27 08:31:56 -06:00

paperbin.dm

Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.

2013-11-16 22:15:50 +01:00

pen.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff

2013-12-18 18:27:22 +00:00

photocopier.dm

Added some checks on the photocopier after the sleeps to avoid runtimes and made a new var "busy" to avoid exploits that ignored the wait times.

2013-12-16 22:08:10 -03:00

photography.dm

Removes unnecessary commented stuff

2013-10-01 23:55:36 -05:00

stamps.dm

Bedsheets can be worn, details in PR. Fixed merge conflicts hopefully.

2013-10-12 20:46:54 -04:00