inhands for Syndicate Things (and thief beacon) (#37682)

* initial

* splitting this b

* thief bacon 1 handed

* why is test fail

* dont fail please

* "requires"

* evil tests

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 33095938dafec4fb4909b2c38ec42345f2efe428..c3875e2f82788be34c9c37b572bfd76e9720aec8 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2311,6 +2311,7 @@
         Brute: 5
   - type: Item
     size: Normal
+    sprite: Mobs/Animals/grenadepenguin.rsi
   - type: OnUseTimerTrigger
     delay: 10
     beepSound:

diff --git a/Resources/Prototypes/Entities/Objects/Power/powersink.yml b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
index 5d1043f08c44fa111bb550b2ece32427876ab32f..fac564392aabdf0b5cce672af7c063d7ab502624 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Power/powersink.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: PowerSink
   parent: [BaseMachine, BaseSyndicateContraband]
   name: power sink

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index a9474cedeaf09baa4f7fc3f9dcb0f90e445e36f5..27a6188584df353fd9e64881d4ac88d6c9b4ab4c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -11,7 +11,8 @@
       - state: icon
         map: ["base"]
     - type: Item
-      sprite: Objects/Weapons/Bombs/hot_potato.rsi
+      sprite: Objects/Specific/Hydroponics/potato.rsi
+      heldPrefix: produce
       size: Small
     - type: AmbientSound
       enabled: false

diff --git a/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..ac907a4
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..28c621d
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/meta.json b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/meta.json
index 93c4f877cf9279c02fd969b788141973348e190d..0572044d6fc59c08b136a01701c4466036ce5131 100644 (file)
--- a/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/grenadepenguin.rsi/meta.json
@@ -1,21 +1,65 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by EmoGarbage404",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by EmoGarbage404, inhands by mubururu_ (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "penguin",
-      "directions": 4
-    },
-    {
-      "name": "dead"
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "penguin",
+            "directions": 4
+        },
+        {
+            "name": "dead"
+        }
+    ]
 }

diff --git a/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..7083944
Binary files /dev/null and b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..7083944
Binary files /dev/null and b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json
index 2347b239a1f95c2e5b8a9b9e9ed348ad3200f2bd..41a0e45b9e5ee564cb92ed4386400b1457f07d73 100644 (file)
--- a/Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json
@@ -1,20 +1,65 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi, inhands by mubururu_ (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+
+    ]
 }

diff --git a/Resources/Textures/Objects/Power/powersink.rsi/inhand-left.png b/Resources/Textures/Objects/Power/powersink.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..6bb372c
Binary files /dev/null and b/Resources/Textures/Objects/Power/powersink.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Power/powersink.rsi/inhand-right.png b/Resources/Textures/Objects/Power/powersink.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..6bb372c
Binary files /dev/null and b/Resources/Textures/Objects/Power/powersink.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Power/powersink.rsi/meta.json b/Resources/Textures/Objects/Power/powersink.rsi/meta.json
index b4bc0a63f1480e9adc466ec885909e21f69c9a51..f15e188a177ce92d021b958d52fe72a90f425049 100644 (file)
--- a/Resources/Textures/Objects/Power/powersink.rsi/meta.json
+++ b/Resources/Textures/Objects/Power/powersink.rsi/meta.json
@@ -1,14 +1,23 @@
 {
-  "version": 1,
-  "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Drawn by Ubaser.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "powersink"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Drawn by Ubaser. inhands by mubururu_ (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "powersink"
+        }
+    ]
 }

diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png
index 43ead68bb252215e76ecb1793dad137c86d9637a..fa6333e0b7e57ffac24f3b4035e2c9dbad1d3feb 100644 (file)
Binary files a/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png and b/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png differ

diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..7e65f81
Binary files /dev/null and b/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..248d4a3
Binary files /dev/null and b/Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json b/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json
index ba7e003575e8f82dbcaa4f9cdb273442e76f25d2..68e94c69643b7f6a1426fa63ffd880fd6c1124a0 100644 (file)
--- a/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json
@@ -1,32 +1,41 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "folded_extraction"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd, folded sprite modified by mubururu_, inhands by mubururu_ (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "extraction_point",
-      "delays": [
-        [
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "extraction_point_light",
-      "delays": [
-        [
-          0.5,
-          0.5
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+            "name": "folded_extraction"
+        },
+        {
+            "name": "extraction_point",
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "extraction_point_light",
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+
+    ]
+}