]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Moths get insect blood (#23671)
authorUbaser <134914314+UbaserB@users.noreply.github.com>
Wed, 10 Jan 2024 11:42:20 +0000 (22:42 +1100)
committerGitHub <noreply@github.com>
Wed, 10 Jan 2024 11:42:20 +0000 (03:42 -0800)
* ya

* mothroach

* update

* fix

* fixe

* add

Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/biological.ftl
Resources/Locale/en-US/reagents/meta/physical-desc.ftl
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Prototypes/Entities/Mobs/Species/moth.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Reagents/biological.yml

index 10e7d96528257906e050a8c44497a679be4b0a11..58e6fc7bf2a546ff7c16382e83d3e327910e4f56 100644 (file)
@@ -46,6 +46,7 @@ flavor-base-spaceshroom = mysterious
 flavor-base-clean = clean
 flavor-base-alkaline = alkaline
 flavor-base-holy = holy
+flavor-base-horrible = horrible
 
 # lmao
 flavor-base-terrible = terrible
index 2efb3eba4cc52f14eff256d09063d591e02bb17d..9078397a73c05667dcd5ea232cbcbf8e8c3f055c 100644 (file)
@@ -1,6 +1,9 @@
 reagent-name-blood = blood
 reagent-desc-blood = I hope this is ketchup.
 
+reagent-name-insect-blood = insect blood
+reagent-desc-insect-blood = Okay, this is really gross. It almost looks.. alive?
+
 reagent-name-slime = slime
 reagent-desc-slime = You thought this was gradient blood at first, but you were mistaken.
 
index d720aab3a5c567e122a6153577fb6df97edfed07..8d55e592f87e6ddf28173f4fbab6299a45839c32 100644 (file)
@@ -94,3 +94,4 @@ reagent-physical-desc-fluffy = fluffy
 reagent-physical-desc-alkaline = alkaline
 reagent-physical-desc-reflective = reflective
 reagent-physical-desc-holy = holy
+reagent-physical-desc-slimy = slimy
index 6fa51f21403ab3b79d2a573b98285318d20cda68..7ce9313e35058ddf346edf5932b62cff8229db1b 100644 (file)
         Base: cockroach
       Dead:
         Base: cockroach_dead
+  - type: Bloodstream
+    bloodReagent: InsectBlood
+    bloodMaxVolume: 20
   - type: Food
   - type: Hunger
     baseDecayRate: 0.25
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Cockroach
-  - type: Bloodstream
-    bloodReagent: Slime
-    bloodMaxVolume: 20
   - type: Tag
     tags:
     - Trash
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Moth
+  - type: Bloodstream
+    bloodReagent: InsectBlood
   - type: Respirator
     damage:
       types:
index 32105112f6068c330fc2ed8d8897bb6c22eafbb6..2d4f9b109fe51465d195d5511a7e06aed97377e8 100644 (file)
     spawned:
     - id: FoodMeat
       amount: 5
+  - type: Bloodstream
+    bloodReagent: InsectBlood
+  - type: DamageVisuals
+    damageOverlayGroups:
+      Brute:
+        sprite: Mobs/Effects/brute_damage.rsi
+        color: "#808A51"
   - type: MothAccent
   - type: Vocal
     sounds:
index 688a859f24c77018930eff4dc2b81588f2eb0c6f..cf836cc273afb15a48cd94951232f93f7bc3afc6 100644 (file)
   id: holy
   flavorType: Base
   description: flavor-base-holy
+
+- type: flavor
+  id: horrible
+  flavorType: Base
+  description: flavor-base-horrible
index a2c68dddb2f6de011bd484a3361bea982f780683..62d2a427881a7140dede8baf0fa0518a59c7b269 100644 (file)
     - !type:PlantAdjustWater
       amount: 0.5
 
+- type: reagent
+  parent: Blood
+  id: InsectBlood
+  name: reagent-name-insect-blood
+  group: Biological
+  desc: reagent-desc-insect-blood
+  flavor: horrible
+  color: "#808A51"
+  recognizable: true
+  physicalDesc: reagent-physical-desc-slimy
+  slippery: false
+
 - type: reagent
   id: Slime
   name: reagent-name-slime