Merge branch 'arumoon-server' into mr0maks-server

Workbench-Team · Jul 6, 2023 · 14627f4 · 14627f4
2 parents 998b5a9 + 528e6b0
commit 14627f4
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 3 deletions.
diff --git a/Resources/Changelog/ChangelogAruMoon.yml b/Resources/Changelog/ChangelogAruMoon.yml
@@ -674,3 +674,21 @@ Entries:
     type: Add
   id: 59
   time: '2023-07-05T10:55:52.0000000+00:00'
+- author: MilenVolf
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043D\u0430 \u043C\u043E\u043B\
+      \u0435\u0439 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044E\u0442 \u0436\u0438\
+      \u0434\u043A\u043E\u0441\u0442\u0438: \u043E\u043D\u0438 \u043C\u043E\u0433\u0443\
+      \u0442 \u0431\u044B\u0442\u044C \u043F\u043E\u0442\u0443\u0448\u0435\u043D\u044B\
+      , \u0432\u043E\u0441\u043F\u043B\u0430\u043C\u0435\u043D\u0435\u043D\u044B,\
+      \ \u0440\u0430\u0437\u044A\u0435\u0434\u0435\u043D\u044B  \u0436\u0438\u0434\
+      \u043A\u043E\u0441\u0442\u044F\u043C\u0438."
+    type: Fix
+  - message: "\u041D\u0430 \u043C\u043E\u043B\u044F\u0445 \u0442\u0435\u043F\u0435\
+      \u0440\u044C \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\
+      \u044F \u043C\u0430\u0441\u043A\u0430 \u043E\u0442 \u043A\u0440\u0435\u043C\u043E\
+      \u0432\u043E\u0433\u043E \u043F\u0438\u0440\u043E\u0433\u0430! \u0425\u043E\u043D\
+      \u043A!"
+    type: Add
+  id: 60
+  time: '2023-07-06T04:42:29.0000000+00:00'
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -105,11 +105,20 @@
       - map: [ "head" ]
       - map: [ "pocket1" ]
       - map: [ "pocket2" ]
+      - map: [ "clownedon" ] # Dynamically generated
+        sprite: "Effects/creampie.rsi"
+        state: "creampie_moth"
+        visible: false
   - type: Reactive
     groups:
-      Medicine: [ Ingestion, Touch, Injection ]
-      Botanical: [ Ingestion, Touch, Injection ]
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+      Acidic: [Touch, Ingestion]
     reactions:
+    - reagents: [Water, SpaceCleaner]
+      methods: [Touch]
+      effects:
+      - !type:WashCreamPieReaction
     - reagents: [ PestKiller, PlantBGone ]
       methods: [ Touch, Ingestion, Injection ]
       effects:

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_moth.png b/Resources/Textures/Effects/creampie.rsi/creampie_moth.png
diff --git a/Resources/Textures/Effects/creampie.rsi/meta.json b/Resources/Textures/Effects/creampie.rsi/meta.json
@@ -1 +1,80 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0", "states": [{"name": "creampie_ai"}, {"name": "creampie_corgi", "directions": 4}, {"name": "creampie_drone", "directions": 4}, {"name": "creampie_engborg", "directions": 4}, {"name": "creampie_hardsuit", "directions": 4}, {"name": "creampie_helmet", "directions": 4}, {"name": "creampie_human", "directions": 4}, {"name": "creampie_janborg", "directions": 4}, {"name": "creampie_lizard", "directions": 4}, {"name": "creampie_medborg", "directions": 4}, {"name": "creampie_monkey", "directions": 4}, {"name": "creampie_secborg", "directions": 4}, {"name": "creampie_standborg", "directions": 4}, {"name": "creampie_xeno_crit"}, {"name": "creampie_xeno_dead"}, {"name": "creampie_xeno_sleep", "directions": 4}, {"name": "creampie_xenomorph", "directions": 4}]}
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "creampie_ai"
+    },
+    {
+      "name": "creampie_corgi",
+      "directions": 4
+    },
+    {
+      "name": "creampie_drone",
+      "directions": 4
+    },
+    {
+      "name": "creampie_engborg",
+      "directions": 4
+    },
+    {
+      "name": "creampie_hardsuit",
+      "directions": 4
+    },
+    {
+      "name": "creampie_helmet",
+      "directions": 4
+    },
+    {
+      "name": "creampie_human",
+      "directions": 4
+    },
+    {
+      "name": "creampie_janborg",
+      "directions": 4
+    },
+    {
+      "name": "creampie_lizard",
+      "directions": 4
+    },
+    {
+      "name": "creampie_moth",
+      "directions": 4
+    },
+    {
+      "name": "creampie_medborg",
+      "directions": 4
+    },
+    {
+      "name": "creampie_monkey",
+      "directions": 4
+    },
+    {
+      "name": "creampie_secborg",
+      "directions": 4
+    },
+    {
+      "name": "creampie_standborg",
+      "directions": 4
+    },
+    {
+      "name": "creampie_xeno_crit"
+    },
+    {
+      "name": "creampie_xeno_dead"
+    },
+    {
+      "name": "creampie_xeno_sleep",
+      "directions": 4
+    },
+    {
+      "name": "creampie_xenomorph",
+      "directions": 4
+    }
+  ]
+}