Tigercat2000 0a66ac4ba5 Merge remote-tracking branch 'upstream/master' into HolidayDatums ...

Conflicts:
	code/__DEFINES/misc.dm

2015-05-16 18:40:54 -07:00

..

carbonpaper.dm

disregard failure. I made a silly.

2014-04-19 16:44:45 -04:00

clipboard.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

fax.dm

Move Fax Panel to Event tab since it's IC info

2015-02-17 15:13:07 -05:00

faxmachine.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

filingcabinet.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

folders.dm

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

handlabeler.dm

…

paper_bundle.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

paper.dm

Change holidays into datums

2015-05-15 20:52:39 -07:00

paperbin.dm

Change holidays into datums

2015-05-15 20:52:39 -07:00

pen.dm

Readd fluff pens, with fluff path removed

2015-05-16 05:40:39 -07:00

photocopier.dm

Photocopier fix

2015-03-16 18:56:51 +01:00

photography.dm

Adds a ditigal camera to the protolathe construction menu.

2015-04-26 10:07:08 +01:00

silicon_photography.dm

Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.

2014-07-31 17:38:14 -04:00

stamps.dm

Exploit Fix

2015-04-29 23:15:03 -04:00