Repede 123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm

2018-07-08 11:38:06 -04:00

..

adminpaper.dm

…

carbonpaper.dm

Fix various syntactic problems

2018-05-16 21:43:18 -07:00

clipboard.dm

…

faxmachine_vr.dm

If you read this you are triple gay

2018-02-28 23:31:36 -05:00

faxmachine.dm

Lore updates (#3430)

2018-04-14 12:58:42 -04:00

filingcabinet.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

folders.dm

…

handlabeler.dm

…

paper_bundle.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

paper.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

paperbin.dm

…

paperplane.dm

Probably fixes #3457 - Paper plane creation weirdness with paper

2018-04-13 11:51:25 -04:00

papershredder.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

pen.dm

Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear

2018-03-28 11:49:10 -07:00

photocopier.dm

…

photography.dm

Basically undo changes

2018-07-03 15:39:58 -04:00

silicon_photography.dm

…

stamps.dm

…