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 2a19bdc326b87ad6fe4e815c898bf6a1a6407a33..072fadbc7e5270fac7947d08318e1a56f6e2c66d 100644 (file)
--- 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 (file)
index 0000000..0f0e618
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 (file)
index 0000000..0f0e618
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 34142b73ef3d85a53a7e9bec3449bea280ab03f3..e44c0a9ccac19af4218e5ca7e7f0d74c40a6602a 100644 (file)
--- 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 5b661378ca4a2e9590b44aac4e691e314a9d14f5..9fb5f858364b82f32a56516ca0c81e76de6fd915 100644 (file)
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 d1ca3eb19ce534ef6810b7bebfb0c0cfd5899ff6..828de701a91d2e8f07242f4b8bbf78a8bbe52382 100644 (file)
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 8571824e7cccf74bb0fa9c27460abe9ab3e92225..72d2ad2ec24b38675ace3f7f2c8bf9fbc564542b 100644 (file)
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 11e691d0317e35db97579f0fe7214e7a936ad7ba..3a0646b100e29b43e06c0dcd31d5a2ffab691aa3 100644 (file)
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 d0f9885c9c557d3f1cb2c1d4ed94f2a271f6c595..7627feee6c980fc36e1a1729880ba3d8f94d138a 100644 (file)
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 5ec61e55bb1d365aa756b883d1038f2c26c08681..d9f278e51fbcbd3a95c93e7052afd6084a867eb1 100644 (file)
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 a51302a2537666447aab9729ffd9e99629aed1ba..c3addeff321c86fc50c2b60761672f4091e3819e 100644 (file)
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 8cfdf34281a32ce8dd087a52b77d1284ec461e3c..e37a99946a3cf02803e2fad2e4f0601d28662ae3 100644 (file)
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 9960164562660189b9cd61d1c98240e0ab07a97d..773415a958871d0d81f3b8b303efb68fe3ba4645 100644 (file)
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 55f6617617729415c1532fe9ef712042a9c177a7..ce973541c3f57f223113f82a4c5299014797ecc6 100644 (file)
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 (file)
index 0000000..ac4fd25
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 (file)
index 0000000..ac4fd25
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 932ea0c4829ad4c9c888db4612fa1080fd184181..d4f467b7eb135926c7d6831138383bab8a99fd69 100644 (file)
--- 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 cdad6aaf282a2970b7ff66daf56f7a1fee299a94..9a473ca9f309a506acb94b38da8bd537c636d212 100644 (file)
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 532e4e63acd8c5236d9c2f7f910a3b7d44744ab8..64cde8f096bbd970dc60d14373fd22153a717f3a 100644 (file)
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 b751f308a6a25c0884e8c5f8bd83b64e50b7f121..4f34265eacf38c0834ed518309323f55b6983d49 100644 (file)
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 11e691d0317e35db97579f0fe7214e7a936ad7ba..3a0646b100e29b43e06c0dcd31d5a2ffab691aa3 100644 (file)
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 8d6462c92e22f0817b4e4a119758369f5022933a..5e30952bdd5819c8a4b2454d238f14fcbf01ed0c 100644 (file)
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 a51302a2537666447aab9729ffd9e99629aed1ba..c3addeff321c86fc50c2b60761672f4091e3819e 100644 (file)
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 8cfdf34281a32ce8dd087a52b77d1284ec461e3c..e37a99946a3cf02803e2fad2e4f0601d28662ae3 100644 (file)
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 7545ff0035ab035f67ba083c11411ca94b5b8bcc..57b86dba886a7ebca217234dad9d6d80ecb3e13d 100644 (file)
Binary files a/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png and b/Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png differ