Markolie 1f243ec4f0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2 ...

# Conflicts:
#	code/_globalvars/lists/objects.dm

2016-12-31 17:54:06 +01:00

..

carbonpaper.dm

Mass replace

2016-07-07 19:34:02 -07:00

clipboard.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

fax.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

faxmachine.dm

Pick up that paper

2016-12-29 21:46:20 -05:00

filingcabinet.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

folders.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

frames.dm

Plastic Explosives Update

2016-07-13 22:04:23 -04:00

handlabeler.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

paper_bundle.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

paper.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2

2016-12-23 19:04:35 +01:00

paperbin.dm

Implements Fire System

2016-07-29 13:24:09 -04:00

pen.dm

add_logs() un-fuckery

2016-08-29 17:27:56 -04:00

photocopier.dm

Pick up that paper

2016-12-29 21:46:20 -05:00

photography.dm

Merge pull request #5806 from Markolie/cameraconsoleupdate

2016-12-29 01:18:21 -08:00

silicon_photography.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

stamps.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00