phil235 78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger ...

Conflicts:
	code/modules/events/ninja.dm

2015-03-15 12:30:27 +01:00

..

clipboard.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

filingcabinet.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

folders.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

handlabeler.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

paper.dm

fixes args

2015-03-07 21:23:01 -05:00

paperbin.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

pen.dm

Fixes #7877 Sleepypen bug. Pen only injected 50 of the 55 units.

2015-02-22 12:14:14 -05:00

photocopier.dm

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

2015-03-15 12:30:27 +01:00

photography.dm

Makes the message when you're attacked slightly bigger for better visibility."

2015-03-12 23:15:54 +01:00

stamps.dm

framework for a future "suicide hotline" job

2015-02-01 19:44:54 -05:00