Remove rebase duplicated code.

CleverRaven · Dec 26, 2019 · 272734f · 272734f
1 parent 8ba1340
commit 272734f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/afs_tools.json
@@ -23,21 +23,6 @@
     ],
     "flags": [ "WATCH", "ALARMCLOCK" ]
   },
-  {
-    "id": "afs_atomic_smartphone_flashlight",
-    "copy-from": "afs_atomic_smartphone",
-    "type": "TOOL",
-    "name": "atomic smartphone - Flashlight",
-    "name_plural": "atomic smartphones - Flashlight",
-    "revert_to": "afs_atomic_smartphone",
-    "use_action": {
-      "target": "afs_atomic_smartphone",
-      "msg": "You deactivate the flashlight app.",
-      "menu_text": "Turn off flashlight",
-      "type": "transform"
-    },
-    "flags": [ "WATCH", "ALARMCLOCK", "LIGHT_25" ]
-  },
   {
     "id": "afs_atomic_smartphone_flashlight",
     "copy-from": "afs_atomic_smartphone",

diff --git a/data/mods/Aftershock/mobs/afs_robots.json b/data/mods/Aftershock/mobs/afs_robots.json
@@ -43,7 +43,7 @@
     "species": [ "ROBOT" ],
     "diff": 10,
     "volume": "62500 ml",
-    "weight": 81500,
+    "weight": "81500 g",
     "hp": 200,
     "speed": 100,
     "material": [ "steel" ],