Repede b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm

2018-06-02 18:33:44 -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

…

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

…

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

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

silicon_photography.dm

…

stamps.dm

…