Purpose 63dfd411aa Resolved merge conflicts... I hope.

2018-10-06 16:01:34 +01:00

..

job

Merge pull request #9295 from AffectedArc07/barber-shoes

2018-08-05 18:28:59 -07:00

job_objectives

Port Shuttle to StonedMC

2018-09-02 22:22:33 +08:00

access.dm

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

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

job_controller.dm

Merge branch 'master' into Refactors-beds-stools-chairs

2018-09-29 15:36:27 +01:00

job_exp.dm

willing player checks, SST tidy-up/parity/refactor, 'font' removals

2017-12-30 14:21:08 -08:00

job_objective.dm

Their

2018-05-25 18:34:24 -07:00

job_scaling.dm

retval

2018-05-08 20:14:58 -07:00

jobs.dm

new approach: 10h playtime req, extra access

2017-12-22 16:22:47 -08:00

whitelist.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00