Merge conflicts, procs instead of macros, mood signals.

2020-05-08 02:12:41 +02:00
parent 91d6faaf21 5e0235bd76
commit 60bdbfaf61
227 changed files with 278636 additions and 999 deletions
@@ -2,3 +2,4 @@
 	name = "Wiring"
 	desc = "How proficient and knowledged you are at wiring beyond laying cables on the floor."
 	competency_thresholds = list(JOB_SKILL_BASIC, JOB_SKILL_EXPERT, JOB_SKILL_MASTER)
+	skill_flags = SKILL_USE_MOOD|SKILL_TRAIN_MOOD|SKILL_USE_TOOL|SKILL_TRAINING_TOOL