Mark van Alphen f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme

2019-04-10 21:54:54 +02:00

..

carbonpaper.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

clipboard.dm

Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted

2018-12-01 00:13:21 +00:00

contract.dm

Suicide Refactor

2019-03-27 22:54:26 -04:00

fax.dm

Use of the flexible macro

2018-08-16 20:04:53 +02:00

faxmachine.dm

KasparoVy Change (It didn't take the first time... ?)

2019-04-03 00:46:43 -05:00

filingcabinet.dm

Devil game mode

2019-01-13 12:00:49 +01:00

folders.dm

Added Syndicate base and ported over turf decals

2019-03-31 20:26:02 +02:00

frames.dm

Casing correction 1

2018-12-17 00:07:37 -05:00

handlabeler.dm

Merge remote-tracking branch 'upstream/master' into camera-damage-refactor

2018-07-15 16:31:50 -04:00

paper_bundle.dm

Resolve some issues that the compiler doesn't spot

2019-03-29 16:21:15 +01:00

paper.dm

Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature

2019-03-24 17:50:07 +08:00

paperbin.dm

[Goonchem] Reagent Temperature

2019-03-18 20:06:15 -04:00

paperplane.dm

Bad renault

2018-10-27 16:27:31 +02:00

pen.dm

Suicide Refactor

2019-03-27 22:54:26 -04:00

photocopier.dm

updated var names and joke message

2018-12-14 03:21:10 +00:00

photography.dm

Casing correction 1

2018-12-17 00:07:37 -05:00

silicon_photography.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

stamps.dm

Suicide Refactor

2019-03-27 22:54:26 -04:00