Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

…into migrate-dig-activities

.clang-tidy

@@ -52,6 +52,7 @@ readability-*,\
 -readability-magic-numbers,\
 -readability-named-parameter,\
 -readability-redundant-control-flow,\
+-clang-analyzer-optin.performance.Padding,\
 "
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(src|test|tools).*'

data/json/achievements.json

@@ -12,13 +12,63 @@
     "time_constraint": { "since": "game_start", "is": "<=", "target": "1 minute" },
     "requirements": [ { "event_statistic": "num_avatar_kills", "is": ">=", "target": 1 } ]
   },
+  {
+    "id": "achievement_kill_10_monsters",
+    "type": "achievement",
+    "name": "Decamate",
+    "requirements": [ { "event_statistic": "num_avatar_kills", "is": ">=", "target": 10 } ]
+  },
+  {
+    "id": "achievement_kill_100_monsters",
+    "type": "achievement",
+    "name": "Centinel",
+    "hidden_by": [ "achievement_kill_10_monsters" ],
+    "requirements": [ { "event_statistic": "num_avatar_kills", "is": ">=", "target": 100 } ]
+  },
   {
     "id": "achievement_survive_one_day",
     "type": "achievement",
     "name": "The first day of the rest of their unlives",
+    "description": "Survive for a day and find a safe place to sleep",
     "time_constraint": { "since": "game_start", "is": ">=", "target": "1 day" },
     "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
   },
+  {
+    "id": "achievement_survive_7_days",
+    "type": "achievement",
+    "name": "Thank God it's Friday",
+    "description": "Survive for a week",
+    "hidden_by": [ "achievement_survive_one_day" ],
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "7 days" },
+    "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
+  },
+  {
+    "id": "achievement_survive_28_days",
+    "type": "achievement",
+    "name": "28 days later",
+    "description": "Survive for a month",
+    "hidden_by": [ "achievement_survive_7_days" ],
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "28 days" },
+    "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
+  },
+  {
+    "id": "achievement_survive_91_days",
+    "type": "achievement",
+    "name": "A time to every purpose under heaven",
+    "description": "Survive for a season",
+    "hidden_by": [ "achievement_survive_28_days" ],
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "91 days" },
+    "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
+  },
+  {
+    "id": "achievement_survive_365_days",
+    "type": "achievement",
+    "name": "Brighter days ahead?",
+    "description": "Survive for a year",
+    "hidden_by": [ "achievement_survive_91_days" ],
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "365 days" },
+    "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
+  },
   {
     "id": "achievement_marathon",
     "type": "achievement",

data/json/flags.json

@@ -687,6 +687,12 @@
     "context": [ "SPELL" ],
     "//": "pain altering spells can't be resisted (like with the deadened trait)"
   },
+  {
+    "id": "WITH_CONTAINER",
+    "type": "json_flag",
+    "context": [ "SPELL" ],
+    "//": "items spawned by spells are put in their containers."
+  },
   {
     "id": "NON_THRESH",
     "type": "json_flag",

data/json/item_actions.json

@@ -989,11 +989,6 @@
     "id": "ammobelt",
     "name": { "str": "Reload" }
   },
-  {
-    "type": "item_action",
-    "id": "bandolier",
-    "name": { "str": "Store/unload ammo" }
-  },
   {
     "type": "item_action",
     "id": "consume_drug",