From: Spanky <180730777+spanky-spanky@users.noreply.github.com>
Date: Tue, 30 Sep 2025 21:55:10 +0000 (-0400)
Subject: Hit 'em with the Michaelwave (#40618)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5255f96915b24b86ac332ceaa7cbbe3eb5d4d744;p=space-station-14.git

Hit 'em with the Michaelwave (#40618)

* michaelwave

* Add DamageOnHit to microwaves

* Un-offset the sprite files and add offset component.
---

diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 2a19bdc326..072fadbc7e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -62,6 +62,7 @@
     sprite: Structures/Machines/microwave.rsi
     drawdepth: SmallObjects
     snapCardinals: true
+    offset: "0.0,0.2"
     layers:
     - state: mw0
       map: ["enum.MicrowaveVisualizerLayers.Base"]
@@ -112,6 +113,38 @@
     guides:
     - Chef
     - FoodRecipes
+  - type: Item
+    sprite: Structures/Machines/microwave.rsi
+    size: Ginormous
+  - type: MultiHandedItem
+  - type: MeleeWeapon
+    attackRate: 0.5
+    soundHit:
+      collection: MetalBreak
+    damage:
+      types:
+        Blunt: 25
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 10
+  - type: DamageOnHit
+    damage:
+      types:
+        Blunt: 10
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 50
+  - type: EmitSoundOnLand
+    sound:
+      collection: MetalBreak
+      params:
+        variation: 0.25
+  - type: HeldSpeedModifier
+    walkModifier: 0.7
+    sprintModifier: 0.7
+  - type: DamageExaminable
 
 - type: entity
   id: SyndicateMicrowave
@@ -135,3 +168,24 @@
     providedRecipes:
     - RecipeBaguetteSword
     - RecipeThrowingCroissant
+  - type: Item
+    sprite: Structures/Machines/microwave_syndie.rsi
+    size: Ginormous
+  - type: MeleeWeapon
+    attackRate: 0.75
+    damage:
+      types:
+        Blunt: 30
+        Shock: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 15
+  - type: DamageOnHit
+    damage:
+      types:
+        Blunt: 5
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 25
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/inhand-left.png b/Resources/Textures/Structures/Machines/microwave.rsi/inhand-left.png
new file mode 100644
index 0000000000..0f0e618e3b
Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/inhand-right.png b/Resources/Textures/Structures/Machines/microwave.rsi/inhand-right.png
new file mode 100644
index 0000000000..0f0e618e3b
Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/meta.json b/Resources/Textures/Structures/Machines/microwave.rsi/meta.json
index 34142b73ef..e44c0a9cca 100644
--- a/Resources/Textures/Structures/Machines/microwave.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/microwave.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14",
+    "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14, inhands by BoskiYourk (GitHub)",
     "states": [
         {
             "name": "mw"
@@ -36,6 +36,14 @@
         },
         {
             "name": "mwo"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
         }
       ]
-    }
\ No newline at end of file
+    }
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mw.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw.png
index 5b661378ca..9fb5f85836 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mw.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mw.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
index d1ca3eb19c..828de701a9 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mw0.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
index 8571824e7c..72d2ad2ec2 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png b/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
index 11e691d031..3a0646b100 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
index d0f9885c9c..7627feee6c 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwb.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
index 5ec61e55bb..d9f278e51f 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png
index a51302a253..c3addeff32 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
index 8cfdf34281..e37a99946a 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
index 9960164562..773415a958 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png b/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
index 55f6617617..ce973541c3 100644
Binary files a/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png and b/Resources/Textures/Structures/Machines/microwave.rsi/mwo.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-left.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-left.png
new file mode 100644
index 0000000000..ac4fd25b57
Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-right.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-right.png
new file mode 100644
index 0000000000..ac4fd25b57
Binary files /dev/null and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
index 932ea0c482..d4f467b7eb 100644
--- a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14, modified by Vermidia",
+    "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14, modified by Vermidia, inhands by BoskiYourk (GitHub)",
     "states": [
         {
             "name": "mw"
@@ -30,6 +30,14 @@
         },
         {
             "name": "mwo"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
         }
       ]
-    }
\ No newline at end of file
+    }
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png
index cdad6aaf28..9a473ca9f3 100644
Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png
index 532e4e63ac..64cde8f096 100644
Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png
index b751f308a6..4f34265eac 100644
Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png
index 11e691d031..3a0646b100 100644
Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png
index 8d6462c92e..5e30952bdd 100644
Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png
index a51302a253..c3addeff32 100644
Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody0.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png
index 8cfdf34281..e37a99946a 100644
Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwbloody1.png differ
diff --git a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png
index 7545ff0035..57b86dba88 100644
Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png differ