Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 ...

# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

2018-02-23 21:55:42 -05:00

..

adminpaper.dm

I before E (#4287)

2017-11-19 03:00:14 -06:00

carbonpaper.dm

…

clipboard.dm

…

faxmachine_vr.dm

…

faxmachine.dm

Polaris sync

2017-12-21 04:01:07 -05: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

Replaces most of the gender macros. (#4681)

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

paper.dm

Crashed Medical Shuttle PoI (#4863)

2018-02-19 13:48:30 -06:00

paperbin.dm

work

2017-09-04 21:52:47 -04:00

paperplane.dm

Squashed commits together. Better desc for plane

2017-10-27 08:42:51 +08:00

papershredder.dm

Replaces most of the gender macros. (#4681)

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

pen.dm

Replaces most of the gender macros. (#4681)

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

photocopier.dm

Updates Tools

2017-08-03 04:49:23 -04:00

photography.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

silicon_photography.dm

…

stamps.dm

Polaris Sync

2017-10-16 22:16:24 -04:00