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

SuddenEyePuncture · Jun 6, 2021 · 91d4626 · 91d4626
2 parents 9855e30 + b03c725
commit 91d4626
Show file tree

Hide file tree

Showing 16 changed files with 3,861 additions and 3,727 deletions.
diff --git a/data/json/materials.json b/data/json/materials.json
@@ -1379,6 +1379,22 @@
       { "fuel": 1, "smoke": 4, "burn": 0.3 }
     ]
   },
+  {
+    "type": "material",
+    "id": "slime",
+    "name": "slime",
+    "density": 1,
+    "bash_resist": 0,
+    "cut_resist": 0,
+    "bullet_resist": 0,
+    "acid_resist": 0,
+    "fire_resist": 0,
+    "elec_resist": 0,
+    "chip_resist": 0,
+    "dmg_adj": [ "scratched", "cut", "cracked", "shattered" ],
+    "bash_dmg_verb": "dented",
+    "cut_dmg_verb": "gouged"
+  },
   {
     "type": "material",
     "id": "steel",

diff --git a/data/json/monsters/slimes.json b/data/json/monsters/slimes.json
@@ -12,6 +12,7 @@
     "weight": "81500 g",
     "hp": 80,
     "speed": 70,
+    "material": [ "slime" ],
     "symbol": "O",
     "color": "dark_gray",
     "phase": "LIQUID",
@@ -42,6 +43,7 @@
     "weight": "200 kg",
     "hp": 400,
     "speed": 50,
+    "material": [ "slime" ],
     "symbol": "O",
     "color": "black_green",
     "phase": "LIQUID",
@@ -70,6 +72,7 @@
     "weight": "120 kg",
     "hp": 160,
     "speed": 90,
+    "material": [ "slime" ],
     "symbol": "O",
     "color": "light_gray",
     "phase": "LIQUID",
@@ -102,6 +105,7 @@
     "weight": "40750 g",
     "hp": 40,
     "speed": 50,
+    "material": [ "slime" ],
     "symbol": "o",
     "color": "dark_gray",
     "phase": "LIQUID",
@@ -131,6 +135,7 @@
     "weight": "120 kg",
     "hp": 200,
     "speed": 40,
+    "material": [ "slime" ],
     "symbol": "O",
     "color": "light_gray",
     "phase": "LIQUID",
@@ -158,6 +163,7 @@
     "weight": "81500 g",
     "hp": 40,
     "speed": 100,
+    "material": [ "slime" ],
     "symbol": "O",
     "color": "light_green",
     "phase": "LIQUID",

diff --git a/gfx/Cuteclysm/backdrop.png b/gfx/Cuteclysm/backdrop.png
diff --git a/gfx/Cuteclysm/backdropoffset.png b/gfx/Cuteclysm/backdropoffset.png
diff --git a/gfx/Cuteclysm/creatures.png b/gfx/Cuteclysm/creatures.png
diff --git a/gfx/Cuteclysm/expandedcreatures.png b/gfx/Cuteclysm/expandedcreatures.png
diff --git a/gfx/Cuteclysm/fields.png b/gfx/Cuteclysm/fields.png
diff --git a/gfx/Cuteclysm/fillerItems.png b/gfx/Cuteclysm/fillerItems.png
diff --git a/gfx/Cuteclysm/fillerVehicles.png b/gfx/Cuteclysm/fillerVehicles.png
diff --git a/gfx/Cuteclysm/hugebackdrop.png b/gfx/Cuteclysm/hugebackdrop.png
diff --git a/gfx/Cuteclysm/items.png b/gfx/Cuteclysm/items.png
diff --git a/gfx/Cuteclysm/tallbackdrop.png b/gfx/Cuteclysm/tallbackdrop.png
diff --git a/gfx/Cuteclysm/tallexpandedcreatures.png b/gfx/Cuteclysm/tallexpandedcreatures.png