Tigercat2000 d5ae124a92 Merge remote-tracking branch 'upstream/master' into bay_equipping ...

Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi

2016-06-13 20:11:29 -07:00

..

job

Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again

2016-06-08 22:49:10 -04:00

job_objectives

Makes ripley objective more clear

2016-03-09 20:52:30 -08:00

access.dm

Traders Event (#4016)

2016-06-11 12:47:20 -04:00

job_controller.dm

TWEAK METADATA UNFINISHED

2016-05-15 20:03:29 -07:00

job_objective.dm

Scoreboard refactor, move job objectives to scoreboard

2015-10-05 15:12:25 -07:00

jobs.dm

Made HoP show up in supply too, with QM a third color

2016-01-29 15:03:26 -05:00

whitelist.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00