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

CleverRaven · Jan 28, 2020 · 52a3f40 · 52a3f40
2 parents d146613 + a28eeb9
commit 52a3f40
Show file tree

Hide file tree

Showing 51 changed files with 1,443 additions and 1,225 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,14 +4,14 @@ about: Suggest an idea for this project
 
 ---
 
-**Is your feature request related to a problem? Please describe.**  
+# Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**  
+# Describe the solution you'd like
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**  
+# Describe alternatives you've considered
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**  
+# Additional context
 Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature request here.
diff --git a/data/json/game_balance.json b/data/json/game_balance.json
@@ -125,13 +125,6 @@
     "stype": "bool",
     "value": false
   },
-  {
-    "type": "EXTERNAL_OPTION",
-    "name": "SLEEP_DEPRIVATION",
-    "info": "Enables sleep deprivation mechanics. If true, stimulants will only help you so far, and you might have to enforce proper sleep hygiene for a while.",
-    "stype": "bool",
-    "value": true
-  },
   {
     "type": "EXTERNAL_OPTION",
     "name": "CBM_SLOTS_ENABLED",

diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -54,11 +54,6 @@
     "id": "PICKAXE",
     "name": "Dig through rock"
   },
-  {
-    "type": "item_action",
-    "id": "MELATONIN_TABLET",
-    "name": "Take a melatonin tablet"
-  },
   {
     "type": "item_action",
     "id": "PACK_CBM",